rpms/shadow-utils/FC-6 shadow-4.0.17-aOption.patch, NONE, 1.1 shadow-utils.spec, 1.85, 1.86

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/shadow-utils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv989

Modified Files:
	shadow-utils.spec 
Added Files:
	shadow-4.0.17-aOption.patch 
Log Message:
fix "-a" option. Bug was introduced by upstream.


shadow-4.0.17-aOption.patch:
 man/usermod.8 |    4 ++--
 src/usermod.c |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE shadow-4.0.17-aOption.patch ---
--- shadow-4.0.17/man/usermod.8.aOption	2006-11-01 09:49:21.000000000 +0100
+++ shadow-4.0.17/man/usermod.8	2006-11-01 09:53:24.000000000 +0100
@@ -26,8 +26,8 @@
 \fBusermod\fR
 command are:
 .TP 3n
-\fB\-a\fR, \fB\-\-append\fR \fIGROUP\fR
-Add the user to the supplemental group.
+\fB\-a\fR, \fB\-\-append\fR 
+Add the user to the supplemental group(s). Use only with \fB\-G\fR option.
 .TP 3n
 \fB\-c\fR, \fB\-\-comment\fR \fICOMMENT\fR
 The new value of the user's password file comment field. It is normally modified using the
--- shadow-4.0.17/src/usermod.c.aOption	2006-11-01 09:48:31.000000000 +0100
+++ shadow-4.0.17/src/usermod.c	2006-11-01 09:48:31.000000000 +0100
@@ -282,7 +282,8 @@
 	fprintf (stderr, _("Usage: usermod [options] LOGIN\n"
 			   "\n"
 			   "Options:\n"
-			   "  -a, --append GROUP		append the user to the supplemental GROUP\n"
+			   "  -a, --append			append the user to the supplemental GROUPS\n"
+			   "				(use only with -G)\n"
 			   "  -c, --comment COMMENT		new value of the GECOS field\n"
 			   "  -d, --home HOME_DIR		new home directory for the user account\n"
 			   "  -e, --expiredate EXPIRE_DATE	set account expiration date to EXPIRE_DATE\n"
@@ -930,7 +931,7 @@
 			{NULL, 0, NULL, '\0'}
 		};
 		while ((c =
-			getopt_long (argc, argv, "a:c:d:e:f:g:G:hl:Lmop:s:u:U",
+			getopt_long (argc, argv, "ac:d:e:f:g:G:hl:Lmop:s:u:U",
 				     long_options, NULL)) != -1) {
 			switch (c) {
 			case 'a':


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/FC-6/shadow-utils.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- shadow-utils.spec	25 Oct 2006 14:28:13 -0000	1.85
+++ shadow-utils.spec	1 Nov 2006 10:06:05 -0000	1.86
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.17
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -21,6 +21,7 @@
 Patch6: shadow-4.0.17-UID_GID.patch
 Patch7: shadow-4.0.17-notInheritFd.patch
 Patch8: shadow-4.0.17-exitValues.patch
+Patch9: shadow-4.0.17-aOption.patch
 
 License: BSD
 Group: System Environment/Base
@@ -59,6 +60,7 @@
 %patch7 -p1 -b .notInheritFd
 
 %patch8 -p1 -b .exitValues
+%patch9 -p1 -b .aOption
 
 rm po/*.gmo
 rm po/stamp-po
@@ -213,6 +215,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Wed Nov 01 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-8
+- fix "-a" option. Bug was introduced by upstream.
+
 * Wed Oct 25 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.17-7
 - add dist-tag