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

Christian Perrier bubulle at costa.debian.org
Tue Aug 1 17:14:47 UTC 2006 

Author: bubulle
Date: 2006-08-01 17:14:46 +0000 (Tue, 01 Aug 2006)
New Revision: 1059

Removed:
   trunk/debian/patches/301_usermod_fix_-a
Modified:
   trunk/debian/changelog
   trunk/debian/patches/402-clarify_usermod_usage
   trunk/debian/patches/504_undef_USE_PAM.nolibpam
   trunk/debian/patches/series
Log:
Prepare for 4.0.18:
-refresh patches
-remove patch 301
-close the relevant bugs for translations fixed in upstream


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-31 22:33:10 UTC (rev 1058)
+++ trunk/debian/changelog	2006-08-01 17:14:46 UTC (rev 1059)
@@ -1,6 +1,12 @@
-shadow (1:4.0.17-3) UNRELEASED; urgency=low
+shadow (1:4.0.18-1) unstable; urgency=low
 
   * The "Selles sur Cher" release
+  * New upstream version. This closes the following bugs:
+    - Fix the usermod's -a option. It should not take an
+      argument, -a it uses the -G argument. Closes: #380645
+    - Galician translation. Closes: #378793
+    - Basque translation. Closes: #378794
+    - Russian translation. Closes: #378911
   * Debian packaging fixes:
     - login.defs: do not mention GETPASS_ASTERISKS since it is no more used.
       Thanks to Mike Frysinger for noticing it.
@@ -9,9 +15,6 @@
     - Add Nicolas FRANCOIS to the Uploaders.
     - Remove the NEWS entry for version 1:4.0.17-1. It was meant to warn
       testing's users and is not meant for Etch users.
-  * 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. Closes: #380645
   * Debconf translation updates:
     - Japanese translation updated. Closes: #379954
 

Deleted: trunk/debian/patches/301_usermod_fix_-a
===================================================================
--- trunk/debian/patches/301_usermod_fix_-a	2006-07-31 22:33:10 UTC (rev 1058)
+++ trunk/debian/patches/301_usermod_fix_-a	2006-08-01 17:14:46 UTC (rev 1059)
@@ -1,39 +0,0 @@
-Goal: Fix the usermod's -a option. It should not take an argument, -a it
-      uses the -G argument.
-Fixes: #380645
-
-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/402-clarify_usermod_usage
===================================================================
--- trunk/debian/patches/402-clarify_usermod_usage	2006-07-31 22:33:10 UTC (rev 1058)
+++ trunk/debian/patches/402-clarify_usermod_usage	2006-08-01 17:14:46 UTC (rev 1059)
@@ -6,19 +6,20 @@
 
 Status wrt upstream: forwarded but not applied yet
 
-Index: shadow-4.0.17/src/usermod.c
+Index: shadow-4.0.18/src/usermod.c
 ===================================================================
---- shadow-4.0.17.orig/src/usermod.c	2006-07-11 20:55:57.000000000 +0200
-+++ shadow-4.0.17/src/usermod.c	2006-07-11 20:59:23.000000000 +0200
-@@ -277,7 +277,6 @@
+--- shadow-4.0.18.orig/src/usermod.c	2006-08-01 18:54:38.135561779 +0200
++++ shadow-4.0.18/src/usermod.c	2006-08-01 19:04:00.091623007 +0200
+@@ -279,8 +279,6 @@
  	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"
-@@ -285,6 +284,9 @@
+@@ -288,6 +286,9 @@
  			   "				to INACTIVE\n"
  			   "  -g, --gid GROUP		force use GROUP as new primary group\n"
  			   "  -G, --groups GROUPS		new list of supplementary GROUPS\n"

Modified: trunk/debian/patches/504_undef_USE_PAM.nolibpam
===================================================================
--- trunk/debian/patches/504_undef_USE_PAM.nolibpam	2006-07-31 22:33:10 UTC (rev 1058)
+++ trunk/debian/patches/504_undef_USE_PAM.nolibpam	2006-08-01 17:14:46 UTC (rev 1059)
@@ -1,8 +1,8 @@
-Index: shadow-4.0.16/src/Makefile.am
+Index: shadow-4.0.18/src/Makefile.am
 ===================================================================
---- shadow-4.0.16.orig/src/Makefile.am	2006-05-31 23:24:49.895951584 +0700
-+++ shadow-4.0.16/src/Makefile.am	2006-05-31 23:24:52.308584808 +0700
-@@ -53,16 +53,16 @@
+--- shadow-4.0.18.orig/src/Makefile.am	2006-08-01 18:54:35.979549802 +0200
++++ shadow-4.0.18/src/Makefile.am	2006-08-01 18:57:16.624502646 +0200
+@@ -54,17 +54,17 @@
  		 $(top_builddir)/lib/libshadow.la
  AM_CPPFLAGS    = -DLOCALEDIR=\"$(datadir)/locale\"
  
@@ -18,14 +18,16 @@
  gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
 -groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 -groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+-groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
 -groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 +groupadd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
 +groupdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
++groupmems_LDADD = $(LDADD) $(LIBSELINUX)
 +groupmod_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
  grpck_LDADD    = $(LDADD) $(LIBSELINUX)
  grpconv_LDADD  = $(LDADD) $(LIBSELINUX)
  grpunconv_LDADD = $(LDADD) $(LIBSELINUX)
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,7 @@
  	login_nopam.c
  login_LDADD    = $(LDADD) $(LIBPAM) $(LIBAUDIT)
  newgrp_LDADD   = $(LDADD) $(LIBPAM) $(LIBAUDIT)
@@ -34,7 +36,7 @@
  nologin_LDADD  =
  passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX)
  pwck_LDADD     = $(LDADD) $(LIBSELINUX)
-@@ -81,9 +81,9 @@
+@@ -83,9 +83,9 @@
  	su.c \
  	suauth.c
  su_LDADD       = $(LDADD) $(LIBPAM)

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-07-31 22:33:10 UTC (rev 1058)
+++ trunk/debian/patches/series	2006-08-01 17:14:46 UTC (rev 1059)
@@ -37,4 +37,4 @@
 508_nologin_in_usr_sbin
 495_salt_stack_smash
 496_login_init_session
-301_usermod_fix_-a
+

More information about the Pkg-shadow-commits mailing list