[Pkg-shadow-commits] r691 - trunk/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2005-12-03 15:44:11 +0000 (Sat, 03 Dec 2005)
New Revision: 691

Added:
   trunk/debian/patches/542_useradd-O_option
Removed:
   trunk/debian/patches/442_useradd-O_option
Modified:
   trunk/debian/patches/series
Log:
Moved to 5xx series as this is a Debian-specific patch


Deleted: trunk/debian/patches/442_useradd-O_option
===================================================================
--- trunk/debian/patches/442_useradd-O_option	2005-12-03 15:42:07 UTC (rev 690)
+++ trunk/debian/patches/442_useradd-O_option	2005-12-03 15:44:11 UTC (rev 691)
@@ -1,41 +0,0 @@
-Goal: accepts the -O flag for backward compatibility. (was used by adduser?)
-
-Note: useradd.8 needs to be regenerated.
-
-Index: shadow-cvs/man/useradd.8.xml
-===================================================================
---- shadow-cvs.orig/man/useradd.8.xml	2005-10-06 02:48:22.000000000 +0300
-+++ shadow-cvs/man/useradd.8.xml	2005-10-06 02:48:57.000000000 +0300
-@@ -201,6 +201,11 @@
- 	    <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
- 	    doesn't work yet.
- 	  </para>
-+          <para>
-+            For the compatibility with previous Debian's
-+            <command>useradd</command>, the <option>-O</option> option is
-+            also supported.
-+          </para>
- 	</listitem>
-       </varlistentry>
-       <varlistentry>
-Index: shadow-cvs/src/useradd.c
-===================================================================
---- shadow-cvs.orig/src/useradd.c	2005-10-06 02:48:22.000000000 +0300
-+++ shadow-cvs/src/useradd.c	2005-10-06 02:48:57.000000000 +0300
-@@ -949,7 +949,7 @@
- 			{NULL, 0, NULL, '\0'}
- 		};
- 		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:s:u:",
- 				     long_options, NULL)) != -1) {
- 			switch (c) {
- 			case 'b':
-@@ -1068,6 +1068,7 @@
- 				kflg++;
- 				break;
- 			case 'K':
-+			case 'O': /* compatibility with previous Debian useradd */
- 				/*
- 				 * override login.defs defaults (-K name=value)
- 				 * example: -K UID_MIN=100 -K UID_MAX=499

Copied: trunk/debian/patches/542_useradd-O_option (from rev 672, trunk/debian/patches/442_useradd-O_option)
===================================================================
--- trunk/debian/patches/442_useradd-O_option	2005-12-01 19:34:36 UTC (rev 672)
+++ trunk/debian/patches/542_useradd-O_option	2005-12-03 15:44:11 UTC (rev 691)
@@ -0,0 +1,44 @@
+Goal: accepts the -O flag for backward compatibility. (was used by adduser?)
+
+Note: useradd.8 needs to be regenerated.
+
+Status wrt upstream: not included as this is just specific 
+                     backward compatibility for Debian
+
+Index: shadow-cvs/man/useradd.8.xml
+===================================================================
+--- shadow-cvs.orig/man/useradd.8.xml	2005-10-06 02:48:22.000000000 +0300
++++ shadow-cvs/man/useradd.8.xml	2005-10-06 02:48:57.000000000 +0300
+@@ -201,6 +201,11 @@
+ 	    <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
+ 	    doesn't work yet.
+ 	  </para>
++          <para>
++            For the compatibility with previous Debian's
++            <command>useradd</command>, the <option>-O</option> option is
++            also supported.
++          </para>
+ 	</listitem>
+       </varlistentry>
+       <varlistentry>
+Index: shadow-cvs/src/useradd.c
+===================================================================
+--- shadow-cvs.orig/src/useradd.c	2005-10-06 02:48:22.000000000 +0300
++++ shadow-cvs/src/useradd.c	2005-10-06 02:48:57.000000000 +0300
+@@ -949,7 +949,7 @@
+ 			{NULL, 0, NULL, '\0'}
+ 		};
+ 		while ((c =
+-			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
++			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:s:u:",
+ 				     long_options, NULL)) != -1) {
+ 			switch (c) {
+ 			case 'b':
+@@ -1068,6 +1068,7 @@
+ 				kflg++;
+ 				break;
+ 			case 'K':
++			case 'O': /* compatibility with previous Debian useradd */
+ 				/*
+ 				 * override login.defs defaults (-K name=value)
+ 				 * example: -K UID_MIN=100 -K UID_MAX=499

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-12-03 15:42:07 UTC (rev 690)
+++ trunk/debian/patches/series	2005-12-03 15:44:11 UTC (rev 691)
@@ -42,7 +42,7 @@
 324_pwck.8_quiet_option
 426_grpck_group-gshadow_members_consistency
 327_chage_expiry_0
-442_useradd-O_option
+542_useradd-O_option
 345_su_password_expired
 347_missing_login.defs_variables
 448_enable_man