[Pkg-shadow-commits] r1053 - in trunk/debian: . patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-07-16 19:59:25 +0000 (Sun, 16 Jul 2006)
New Revision: 1053

Added:
   trunk/debian/patches/301_usermod_fix_-a
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Fix the usermod's -a option. It should not take an argument, -a it uses
the -G argument. This is already fixed in upstream's CVS repository.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-16 09:46:37 UTC (rev 1052)
+++ trunk/debian/changelog	2006-07-16 19:59:25 UTC (rev 1053)
@@ -4,6 +4,9 @@
   * Debian packaging fixes:
     - login.defs: do not mention GETPASS_ASTERISKS since it is no more used.
       Thanks to Mike Frysinger for noticing it.
+  * Upstream bugs or fixes fixed in upstream releases or CVS:
+    - 301_usermod_fix_-a: Fix the usermod's -a option. It should not take an
+      argument, -a it uses the -G argument.
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 16 Jul 2006 11:41:24 +0200
 

Added: trunk/debian/patches/301_usermod_fix_-a
===================================================================
--- trunk/debian/patches/301_usermod_fix_-a	2006-07-16 09:46:37 UTC (rev 1052)
+++ trunk/debian/patches/301_usermod_fix_-a	2006-07-16 19:59:25 UTC (rev 1053)
@@ -0,0 +1,38 @@
+Goal: Fix the usermod's -a option. It should not take an argument, -a it
+      uses the -G argument.
+
+Author: Greg Schafer <gschafer at zip.com.au>
+
+Status wrt upstream: Committed upstream after 4.0.17.
+
+Index: shadow-4.0.17/man/usermod.8.xml
+===================================================================
+--- shadow-4.0.17.orig/man/usermod.8.xml	2006-07-16 17:11:58.000000000 +0200
++++ shadow-4.0.17/man/usermod.8.xml	2006-07-16 17:16:29.000000000 +0200
+@@ -39,11 +39,11 @@
+       <varlistentry>
+ 	<term>
+ 	  <option>-a</option>, <option>--append</option>
+-	  <replaceable>GROUP</replaceable>
+ 	</term>
+ 	<listitem>
+ 	  <para>
+-	    Add the user to the supplemental group.
++	    Add the user to the supplemental group(s). Use only with
++	    <option>-G</option> option.
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
+Index: shadow-4.0.17/src/usermod.c
+===================================================================
+--- shadow-4.0.17.orig/src/usermod.c	2006-07-16 17:11:52.000000000 +0200
++++ shadow-4.0.17/src/usermod.c	2006-07-16 17:14:30.000000000 +0200
+@@ -925,7 +925,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':

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-07-16 09:46:37 UTC (rev 1052)
+++ trunk/debian/patches/series	2006-07-16 19:59:25 UTC (rev 1053)
@@ -37,3 +37,4 @@
 508_nologin_in_usr_sbin
 495_salt_stack_smash
 496_login_init_session
+301_usermod_fix_-a