[packages/mock] our useradd doesn't have -n option

glen glen at pld-linux.org
Sat Jun 14 17:12:22 CEST 2014


commit 76533e2721833b1b99563de36b0a6355b9fbcb7f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jun 14 18:11:50 2014 +0300

    our useradd doesn't have -n option
    
    -n seems to be legacy version of -N, but we don't have -N either
    https://bugzilla.redhat.com/show_bug.cgi?id=495734

 config.patch | 11 +++++++++++
 mock.spec    |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/mock.spec b/mock.spec
index 3cb7e28..6ab3aa6 100644
--- a/mock.spec
+++ b/mock.spec
@@ -4,12 +4,13 @@
 Summary:	Builds packages inside chroots
 Name:		mock
 Version:	1.1.38
-Release:	0.5
+Release:	0.6
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	https://git.fedorahosted.org/cgit/mock.git/snapshot/%{name}-%{version}.tar.xz
 # Source0-md5:	dc3d5c4ed6657d158a30d949f7baac88
 Patch0:		no-srpm-header.patch
+Patch1:		config.patch
 URL:		https://fedoraproject.org/wiki/Projects/Mock
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -65,6 +66,7 @@ bash-completion for Mock.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # keep for reference to build pld files
 install -d sample-configs
diff --git a/config.patch b/config.patch
new file mode 100644
index 0000000..a865a05
--- /dev/null
+++ b/config.patch
@@ -0,0 +1,11 @@
+--- mock-1.1.38/./etc/mock/site-defaults.cfg~	2014-06-14 18:08:15.000000000 +0300
++++ mock-1.1.38/./etc/mock/site-defaults.cfg	2014-06-14 18:08:17.563620992 +0300
+@@ -153,7 +153,7 @@
+ #   auth  sufficient pam_succeed_if.so user ingroup mock use_uid quiet
+ # config_opts['chrootgid'] = grp.getgrnam("mock")[2]
+ 
+-# config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s -n %(user)s' # Fedora/RedHat
++config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
+ #
+ # Security related
+ # config_opts['no_root_shells'] = False
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mock.git/commitdiff/76533e2721833b1b99563de36b0a6355b9fbcb7f



More information about the pld-cvs-commit mailing list