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

[Christian Perrier]

Author: bubulle
Date: 2006-02-14 13:26:29 +0000 (Tue, 14 Feb 2006)
New Revision: 863

Modified:
   trunk/debian/changelog
   trunk/debian/patches/466_useradd_-r_LSB
   trunk/debian/patches/series
Log:
Add the 466_useradd_-r-LSB patch. We apply it even if upstream doesn't like
it because we want LSB compliance


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-10 19:09:28 UTC (rev 862)
+++ trunk/debian/changelog	2006-02-14 13:26:29 UTC (rev 863)
@@ -1,8 +1,11 @@
 shadow (1:4.0.14-7) UNRELEASED; urgency=low
 
   * The "Carré d'Aurillac" release (let's stay in Cantal)
+  * Upstream bugs or fixes not already fixed in upstream releases or CVS:
+    - 467_useradd_-r_LSB: add a "-r" option for adding system users
+      for LSB compatibility. Closes: #333706
 
- -- Christian Perrier <bubulle at debian.org>  Fri, 10 Feb 2006 20:08:19 +0100
+ -- Christian Perrier <bubulle at debian.org>  Tue, 14 Feb 2006 14:21:43 +0100
 
 shadow (1:4.0.14-6) unstable; urgency=low
 

Modified: trunk/debian/patches/466_useradd_-r_LSB
===================================================================
--- trunk/debian/patches/466_useradd_-r_LSB	2006-02-10 19:09:28 UTC (rev 862)
+++ trunk/debian/patches/466_useradd_-r_LSB	2006-02-14 13:26:29 UTC (rev 863)
@@ -2,16 +2,15 @@
 
 Fixes: #333706
 
-Status wrt upstream: Forwarded but not applied yet.
+Status wrt upstream: Forwarded but not applied yet. Not sure that upstream
+                     is really ready to apply it. We apply it anyway because 
+                     LSB compliance is important for Debian
 
-This patch is still incomplete ad "--system" works as expected while
-"-" does ot
-
-Index: shadow-4.0.13/src/useradd.c
+Index: shadow-4.0.14/src/useradd.c
 ===================================================================
---- shadow-4.0.13.orig/src/useradd.c	2005-10-27 14:28:27.288423968 +0200
-+++ shadow-4.0.13/src/useradd.c	2005-10-27 18:57:02.880152256 +0200
-@@ -128,6 +128,7 @@
+--- shadow-4.0.14.orig/src/useradd.c	2006-02-14 13:51:51.330033243 +0100
++++ shadow-4.0.14/src/useradd.c	2006-02-14 13:52:04.908279473 +0100
+@@ -127,6 +127,7 @@
      mflg = 0,			/* create user's home directory if it doesn't exist */
      nflg = 0,			/* create a group having the same name as the user */
      oflg = 0,			/* permit non-unique user ID to be specified with -u */
@@ -19,7 +18,7 @@
      sflg = 0,			/* shell program for new account */
      uflg = 0;			/* specify user ID for new account */
  
-@@ -640,6 +641,7 @@
+@@ -633,6 +634,7 @@
  			   "				(non-unique) UID\n"
  			   "  -p, --password PASSWORD	use encrypted password for the new user\n"
  			   "				account\n"
@@ -27,7 +26,7 @@
  			   "  -s, --shell SHELL		the login shell for the new user account\n"
  			   "  -u, --uid UID			force use the UID for the new user account\n"));
  	exit (E_USAGE);
-@@ -687,11 +689,19 @@
+@@ -680,11 +682,19 @@
  	spent->sp_namp = (char *) user_name;
  	spent->sp_pwdp = (char *) user_pass;
  	spent->sp_lstchg = time ((time_t *) 0) / SCALE;
@@ -52,7 +51,7 @@
  	spent->sp_flag = -1;
  }
  
-@@ -838,8 +848,13 @@
+@@ -832,8 +842,13 @@
  	const struct passwd *pwd;
  	uid_t uid_min, uid_max;
  
@@ -68,7 +67,7 @@
  
  	/*
  	 * Start with some UID value if the user didn't provide us with
-@@ -944,12 +959,13 @@
+@@ -1012,12 +1027,13 @@
  			{"create-home", no_argument, NULL, 'm'},
  			{"non-unique", no_argument, NULL, 'o'},
  			{"password", required_argument, NULL, 'p'},
@@ -79,11 +78,11 @@
  		};
  		while ((c =
 -			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:s:u:",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:r:s:u:",
++			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:mMop:rs:u:",
  				     long_options, NULL)) != -1) {
  			switch (c) {
  			case 'b':
-@@ -1103,6 +1119,9 @@
+@@ -1171,6 +1187,9 @@
  				}
  				user_pass = optarg;
  				break;
@@ -93,7 +92,7 @@
  			case 's':
  				if (!VALID (optarg)
  				    || (optarg[0]
-@@ -1386,23 +1405,25 @@
+@@ -1556,23 +1575,25 @@
   */
  static void create_home (void)
  {

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-02-10 19:09:28 UTC (rev 862)
+++ trunk/debian/patches/series	2006-02-14 13:26:29 UTC (rev 863)
@@ -28,14 +28,10 @@
 454_userdel_no_MAIL_FILE
 501_commonio_group_shadow
 459_better_document_useradd_-d
-# All these below need more investigation and advice from Tomasz
-# kept here during bubulle's holidays..:-)
 461_keep_sticky_bit_for_dirs
-# 462 got the blessing of Nicolas
 462_warn_to_edit_shadow
 463_login_delay_obeys_to_PAM
-#466_useradd_-r_LSB
-#End of holiday patches
+466_useradd_-r_LSB
 466_fflush-prompt
 468_duplicate_passwd_struct_before_usage
 302_fix_generated_man_pages