From ae7558930b3813a8d81b8d6a7b0342413a42f200 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Sun, 14 Jan 2007 13:25:14 +0000 Subject: [PATCH] fix append option in usermod (#222540) --- shadow-4.0.18.1-appendOption.patch | 11 +++++++++++ shadow-utils.spec | 21 +++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 shadow-4.0.18.1-appendOption.patch diff --git a/shadow-4.0.18.1-appendOption.patch b/shadow-4.0.18.1-appendOption.patch new file mode 100644 index 0000000..f5d8985 --- /dev/null +++ b/shadow-4.0.18.1-appendOption.patch @@ -0,0 +1,11 @@ +--- shadow-4.0.18.1/src/usermod.c.appendOption 2007-01-14 14:04:29.000000000 +0100 ++++ shadow-4.0.18.1/src/usermod.c 2007-01-14 14:05:04.000000000 +0100 +@@ -905,7 +905,7 @@ + */ + int c; + static struct option long_options[] = { +- {"append", required_argument, NULL, 'a'}, ++ {"append", no_argument, NULL, 'a'}, + {"comment", required_argument, NULL, 'c'}, + {"home", required_argument, NULL, 'd'}, + {"expiredate", required_argument, NULL, 'e'}, diff --git a/shadow-utils.spec b/shadow-utils.spec index ea4214f..5d06039 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -2,10 +2,10 @@ %define WITH_SELINUX 1 %endif -Summary: Utilities for managing accounts and shadow password files +Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.18.1 -Release: 8%{?dist} +Release: 7%{?dist} Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -24,7 +24,7 @@ Patch8: shadow-4.0.17-auditLogging.patch Patch9: shadow-4.0.18.1-gid.patch Patch10: shadow-4.0.18.1-overflow.patch Patch11: shadow-4.0.17-useradd.patch - +Patch12: shadow-4.0.18.1-appendOption.patch License: BSD Group: System Environment/Base BuildRequires: autoconf, automake, libtool, gettext-devel @@ -33,6 +33,7 @@ BuildRequires: audit-libs-devel >= 1.0.10 Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: libselinux >= 1.25.2-1 Requires: audit-libs >= 1.0.10 +Obsoletes: adduser %description The shadow-utils package includes the necessary programs for @@ -64,6 +65,7 @@ cp %{SOURCE3} lib/nscd.c %patch9 -p1 -b .gid %patch10 -p1 -b .overflow %patch11 -p1 -b .useradd +%patch12 -p1 -b .appendOption rm po/*.gmo rm po/stamp-po @@ -96,8 +98,7 @@ install -c -m 0600 %{SOURCE2} $RPM_BUILD_ROOT/etc/default/useradd ln -s useradd $RPM_BUILD_ROOT%{_sbindir}/adduser -#ln -s %{_mandir}/man8/useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8 -ln -s useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8 +ln -s %{_mandir}/man8/useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8 for subdir in $RPM_BUILD_ROOT/%{_mandir}/{??,??_??,??_??.*}/man* ; do test -d $subdir && test -e $subdir/useradd.8 && echo ".so man8/useradd.8" > $subdir/adduser.8 done @@ -162,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT %doc NEWS doc/HOWTO README %dir /etc/default %attr(0644,root,root) %config(noreplace) /etc/login.defs -%attr(0600,root,root) %config(noreplace) /etc/default/useradd +%attr(0600,root,root) %config /etc/default/useradd %{_bindir}/sg %{_bindir}/chage %{_bindir}/faillog @@ -219,12 +220,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/man8/faillog.8* %changelog -* Thu Dec 21 2006 Dan Walsh 2:4.0.18.1-8 -- Fix execution and creation of Home Directories under SELinux -- Resolves: rhbz#217441 - -* Thu Dec 14 2006 Peter Vrabec 2:4.0.18.1-7 -- fix rpmlint issues +* Sun Jan 14 2007 Peter Vrabec 2:4.0.18.1-7 +- fix append option in usermod (#222540). * Wed Dec 06 2006 Peter Vrabec 2:4.0.18.1-6 - use MD5 encryption by default (#218629).