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

Christian Perrier bubulle at costa.debian.org
Sun Sep 17 10:21:46 UTC 2006


Author: bubulle
Date: 2006-09-17 10:21:45 +0000 (Sun, 17 Sep 2006)
New Revision: 1113

Modified:
   trunk/debian/patches/008_login_log_failure_in_FTMP
   trunk/debian/patches/008_su_get_PAM_username
   trunk/debian/patches/008_su_no_sanitize_env
   trunk/debian/patches/101_ja
   trunk/debian/patches/102_de-fix-sorry
   trunk/debian/patches/401_cppw_src.dpatch
   trunk/debian/patches/402-clarify_usermod_usage
   trunk/debian/patches/403_fix_PATH-MAX_hurd
   trunk/debian/patches/428_grpck_add_prune_option
   trunk/debian/patches/429_login_FAILLOG_ENAB
   trunk/debian/patches/431_su_uid_0_not_root
   trunk/debian/patches/433_shadow.5-typo_312430
   trunk/debian/patches/434_login_stop_checking_args_after--
   trunk/debian/patches/438_su_GNU_origin
   trunk/debian/patches/451_login_PATH
   trunk/debian/patches/454_userdel_no_MAIL_FILE
   trunk/debian/patches/462_warn_to_edit_shadow
   trunk/debian/patches/463_login_delay_obeys_to_PAM
   trunk/debian/patches/466_fflush-prompt
   trunk/debian/patches/467_useradd_-r_LSB
   trunk/debian/patches/468_duplicate_passwd_struct_before_usage
   trunk/debian/patches/479_chowntty_debug
   trunk/debian/patches/480_getopt_args_reorder
   trunk/debian/patches/483_su_fakelogin_wrong_arg0
   trunk/debian/patches/487_passwd_chauthtok_failed_message
   trunk/debian/patches/491_configure.in_friendly_selinux_detection
   trunk/debian/patches/495_salt_stack_smash
   trunk/debian/patches/496_login_init_session
   trunk/debian/patches/497_non_numerical_identifier
   trunk/debian/patches/498_man_nonpam_undefined
   trunk/debian/patches/499_gettext-0.15
   trunk/debian/patches/501_commonio_group_shadow
   trunk/debian/patches/503_shadowconfig.8
   trunk/debian/patches/504_undef_USE_PAM.dpatch
   trunk/debian/patches/504_undef_USE_PAM.nolibpam
   trunk/debian/patches/506_relaxed_usernames
   trunk/debian/patches/507_32char_grnames.dpatch
   trunk/debian/patches/508_nologin_in_usr_sbin
   trunk/debian/patches/523_su_arguments_are_concatenated
   trunk/debian/patches/523_su_arguments_are_no_more_concatenated_by_default
   trunk/debian/patches/542_useradd-O_option
   trunk/debian/patches/592_manpages_typos
Log:
Refresh all patches with regard to 4.0.18.1 sources


Modified: trunk/debian/patches/008_login_log_failure_in_FTMP
===================================================================
--- trunk/debian/patches/008_login_log_failure_in_FTMP	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/008_login_log_failure_in_FTMP	2006-09-17 10:21:45 UTC (rev 1113)
@@ -4,10 +4,10 @@
  * I'm not sure login should add an entry in the FTMP file when PAM is used.
    (but nothing in /etc/login.defs indicates that the failure is not logged)
 
-Index: shadow-4.0.16/src/login.c
+Index: shadow-4.0.18.1/src/login.c
 ===================================================================
---- shadow-4.0.16.orig/src/login.c	2006-05-31 23:24:44.967700792 +0700
-+++ shadow-4.0.16/src/login.c	2006-05-31 23:24:45.922555632 +0700
+--- shadow-4.0.18.1.orig/src/login.c	2006-09-17 12:17:54.336008314 +0200
++++ shadow-4.0.18.1/src/login.c	2006-09-17 12:17:54.972013371 +0200
 @@ -716,6 +716,20 @@
  #endif				/* WITH_AUDIT */
  
@@ -29,10 +29,10 @@
  
  			  /* Let's give it another go around */
  			  pam_set_item(pamh,PAM_USER,NULL);
-Index: shadow-4.0.16/lib/getdef.c
+Index: shadow-4.0.18.1/lib/getdef.c
 ===================================================================
---- shadow-4.0.16.orig/lib/getdef.c	2006-05-31 23:23:56.692039808 +0700
-+++ shadow-4.0.16/lib/getdef.c	2006-05-31 23:24:45.926555024 +0700
+--- shadow-4.0.18.1.orig/lib/getdef.c	2006-06-24 15:17:18.000000000 +0200
++++ shadow-4.0.18.1/lib/getdef.c	2006-09-17 12:17:54.992013530 +0200
 @@ -57,6 +57,7 @@
  	{"ERASECHAR", NULL},
  	{"FAIL_DELAY", NULL},

Modified: trunk/debian/patches/008_su_get_PAM_username
===================================================================
--- trunk/debian/patches/008_su_get_PAM_username	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/008_su_get_PAM_username	2006-09-17 10:21:45 UTC (rev 1113)
@@ -5,10 +5,10 @@
    I don't know what this patch is used for. IMO, the user name is
    already known before calling pam_get_item(pamh, PAM_USER, ...)
 
-Index: shadow-4.0.16/src/su.c
+Index: shadow-4.0.18.1/src/su.c
 ===================================================================
---- shadow-4.0.16.orig/src/su.c	2006-05-31 23:24:41.253265472 +0700
-+++ shadow-4.0.16/src/su.c	2006-05-31 23:24:42.561066656 +0700
+--- shadow-4.0.18.1.orig/src/su.c	2006-09-17 12:17:52.483993589 +0200
++++ shadow-4.0.18.1/src/su.c	2006-09-17 12:17:53.099998487 +0200
 @@ -287,6 +287,7 @@
  	struct passwd *pw = 0;
  	char **envp = environ;
@@ -16,8 +16,8 @@
 +	char *tmp_name;
  
  #ifdef USE_PAM
- 	int ret;
-@@ -651,6 +652,14 @@
+ 	char **envcp;
+@@ -652,6 +653,14 @@
  			su_failure (tty);
  		}
  	}

Modified: trunk/debian/patches/008_su_no_sanitize_env
===================================================================
--- trunk/debian/patches/008_su_no_sanitize_env	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/008_su_no_sanitize_env	2006-09-17 10:21:45 UTC (rev 1113)
@@ -1,8 +1,8 @@
-Index: shadow-4.0.16/src/su.c
+Index: shadow-4.0.18.1/src/su.c
 ===================================================================
---- shadow-4.0.16.orig/src/su.c	2006-05-31 23:24:39.945464288 +0700
-+++ shadow-4.0.16/src/su.c	2006-05-31 23:24:41.253265472 +0700
-@@ -303,7 +303,7 @@
+--- shadow-4.0.18.1.orig/src/su.c	2006-09-17 12:17:47.383953038 +0200
++++ shadow-4.0.18.1/src/su.c	2006-09-17 12:17:52.483993589 +0200
+@@ -304,7 +304,7 @@
  #endif
  #endif				/* !USE_PAM */
  

Modified: trunk/debian/patches/101_ja
===================================================================
--- trunk/debian/patches/101_ja	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/101_ja	2006-09-17 10:21:45 UTC (rev 1113)
@@ -6,8 +6,8 @@
 
 Index: shadow-4.0.18.1/po/ja.po
 ===================================================================
---- shadow-4.0.18.1.orig/po/ja.po	2006-08-25 11:55:59.350030591 +0200
-+++ shadow-4.0.18.1/po/ja.po	2006-08-25 11:57:29.914766695 +0200
+--- shadow-4.0.18.1.orig/po/ja.po	2006-07-26 22:32:45.000000000 +0200
++++ shadow-4.0.18.1/po/ja.po	2006-09-17 12:18:16.644185683 +0200
 @@ -1,14 +1,15 @@
  # Shadow utils japanese message catalog
  # Copyright (C) YEAR Free Software Foundation, Inc.

Modified: trunk/debian/patches/102_de-fix-sorry
===================================================================
--- trunk/debian/patches/102_de-fix-sorry	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/102_de-fix-sorry	2006-09-17 10:21:45 UTC (rev 1113)
@@ -7,8 +7,8 @@
 
 Index: shadow-4.0.18.1/po/de.po
 ===================================================================
---- shadow-4.0.18.1.orig/po/de.po	2006-08-26 22:26:16.673199743 +0200
-+++ shadow-4.0.18.1/po/de.po	2006-08-26 22:26:30.205302965 +0200
+--- shadow-4.0.18.1.orig/po/de.po	2006-07-26 22:31:43.000000000 +0200
++++ shadow-4.0.18.1/po/de.po	2006-09-17 12:18:19.448207978 +0200
 @@ -1204,7 +1204,7 @@
  msgstr "Unbekannte GID: %lu\n"
  

Modified: trunk/debian/patches/401_cppw_src.dpatch
===================================================================
--- trunk/debian/patches/401_cppw_src.dpatch	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/401_cppw_src.dpatch	2006-09-17 10:21:45 UTC (rev 1113)
@@ -5,10 +5,10 @@
 ## DP: Add cppw / cpgr
 
 @DPATCH@
-Index: shadow-4.0.16/src/cppw.c
+Index: shadow-4.0.18.1/src/cppw.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.16/src/cppw.c	2006-05-31 23:24:49.894951736 +0700
++++ shadow-4.0.18.1/src/cppw.c	2006-09-17 12:17:57.524033662 +0200
 @@ -0,0 +1,200 @@
 +/*
 +  cppw, cpgr  copy with locking given file over the password or group file
@@ -210,19 +210,19 @@
 +
 +  return 0;
 +}
-Index: shadow-4.0.16/src/Makefile.am
+Index: shadow-4.0.18.1/src/Makefile.am
 ===================================================================
---- shadow-4.0.16.orig/src/Makefile.am	2006-05-31 23:23:55.364241664 +0700
-+++ shadow-4.0.16/src/Makefile.am	2006-05-31 23:24:49.895951584 +0700
-@@ -23,6 +23,7 @@
- bin_PROGRAMS   = groups login su
+--- shadow-4.0.18.1.orig/src/Makefile.am	2006-07-18 18:52:23.000000000 +0200
++++ shadow-4.0.18.1/src/Makefile.am	2006-09-17 12:17:57.524033662 +0200
+@@ -24,6 +24,7 @@
+ sbin_PROGRAMS  = nologin
  ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
  usbin_PROGRAMS = \
 +	cppw \
  	chgpasswd \
  	chpasswd \
  	groupadd \
-@@ -57,6 +58,7 @@
+@@ -58,6 +59,7 @@
  chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
  chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX)
  chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
@@ -230,11 +230,11 @@
  gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
  groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
  groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
-Index: shadow-4.0.16/po/POTFILES.in
+Index: shadow-4.0.18.1/po/POTFILES.in
 ===================================================================
---- shadow-4.0.16.orig/po/POTFILES.in	2006-05-31 23:23:55.412234368 +0700
-+++ shadow-4.0.16/po/POTFILES.in	2006-05-31 23:24:49.896951432 +0700
-@@ -62,6 +62,7 @@
+--- shadow-4.0.18.1.orig/po/POTFILES.in	2006-07-18 18:56:36.000000000 +0200
++++ shadow-4.0.18.1/po/POTFILES.in	2006-09-17 12:17:57.524033662 +0200
+@@ -61,6 +61,7 @@
  src/chgpasswd.c
  src/chpasswd.c
  src/chsh.c

Modified: trunk/debian/patches/402-clarify_usermod_usage
===================================================================
--- trunk/debian/patches/402-clarify_usermod_usage	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/402-clarify_usermod_usage	2006-09-17 10:21:45 UTC (rev 1113)
@@ -6,10 +6,10 @@
 
 Status wrt upstream: forwarded but not applied yet
 
-Index: shadow-4.0.18/src/usermod.c
+Index: shadow-4.0.18.1/src/usermod.c
 ===================================================================
---- 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
+--- shadow-4.0.18.1.orig/src/usermod.c	2006-09-17 12:17:58.256039482 +0200
++++ shadow-4.0.18.1/src/usermod.c	2006-09-17 12:18:11.400143989 +0200
 @@ -279,8 +279,6 @@
  	fprintf (stderr, _("Usage: usermod [options] LOGIN\n"
  			   "\n"

Modified: trunk/debian/patches/403_fix_PATH-MAX_hurd
===================================================================
--- trunk/debian/patches/403_fix_PATH-MAX_hurd	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/403_fix_PATH-MAX_hurd	2006-09-17 10:21:45 UTC (rev 1113)
@@ -6,10 +6,10 @@
 
 Status wrt upstream: should be forwarded
 
-Index: shadow-4.0.16/lib/commonio.c
+Index: shadow-4.0.18.1/lib/commonio.c
 ===================================================================
---- shadow-4.0.16.orig/lib/commonio.c	2006-06-10 15:28:25.914736344 +0200
-+++ shadow-4.0.16/lib/commonio.c	2006-06-10 15:28:53.717509680 +0200
+--- shadow-4.0.18.1.orig/lib/commonio.c	2006-09-17 12:18:03.020077360 +0200
++++ shadow-4.0.18.1/lib/commonio.c	2006-09-17 12:18:12.680154166 +0200
 @@ -47,20 +47,34 @@
  int lrename (const char *old, const char *new)
  {

Modified: trunk/debian/patches/428_grpck_add_prune_option
===================================================================
--- trunk/debian/patches/428_grpck_add_prune_option	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/428_grpck_add_prune_option	2006-09-17 10:21:45 UTC (rev 1113)
@@ -5,10 +5,10 @@
 
 Status wrt upstream: It could certainly be submitted to upstream.
 
-Index: shadow-4.0.16/src/grpck.c
+Index: shadow-4.0.18.1/src/grpck.c
 ===================================================================
---- shadow-4.0.16.orig/src/grpck.c	2006-05-31 23:23:57.333942224 +0700
-+++ shadow-4.0.16/src/grpck.c	2006-05-31 23:24:43.861868904 +0700
+--- shadow-4.0.18.1.orig/src/grpck.c	2006-05-07 19:44:39.000000000 +0200
++++ shadow-4.0.18.1/src/grpck.c	2006-09-17 12:17:53.712003353 +0200
 @@ -139,6 +139,7 @@
  	int errors = 0;
  	int changed = 0;

Modified: trunk/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- trunk/debian/patches/429_login_FAILLOG_ENAB	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/429_login_FAILLOG_ENAB	2006-09-17 10:21:45 UTC (rev 1113)
@@ -7,10 +7,10 @@
 Note: It could be removed if pam_tally could report the number of failures
       preceding a successful login.
 
-Index: shadow-4.0.16/src/login.c
+Index: shadow-4.0.18.1/src/login.c
 ===================================================================
---- shadow-4.0.16.orig/src/login.c	2006-05-31 23:24:45.922555632 +0700
-+++ shadow-4.0.16/src/login.c	2006-05-31 23:24:46.988393600 +0700
+--- shadow-4.0.18.1.orig/src/login.c	2006-09-17 12:17:54.972013371 +0200
++++ shadow-4.0.18.1/src/login.c	2006-09-17 12:17:55.628018587 +0200
 @@ -130,11 +130,11 @@
  static void setup_tty (void);
  static void check_flags (int, char *const *);
@@ -57,7 +57,7 @@
  			  if (getdef_str("FTMP_FILE") != NULL) {
  #if HAVE_UTMPX_H
  			    failent = utxent;
-@@ -1077,6 +1088,7 @@
+@@ -1075,6 +1086,7 @@
  		 */
  #ifndef USE_PAM
  		motd ();	/* print the message of the day */
@@ -65,7 +65,7 @@
  		if (getdef_bool ("FAILLOG_ENAB")
  		    && faillog.fail_cnt != 0) {
  			failprint (&faillog);
-@@ -1090,6 +1102,7 @@
+@@ -1088,6 +1100,7 @@
  					 username, (int) faillog.fail_cnt));
  			}
  		}
@@ -73,10 +73,10 @@
  		if (getdef_bool ("LASTLOG_ENAB")
  		    && lastlog.ll_time != 0) {
  			time_t ll_time = lastlog.ll_time;
-Index: shadow-4.0.16/lib/getdef.c
+Index: shadow-4.0.18.1/lib/getdef.c
 ===================================================================
---- shadow-4.0.16.orig/lib/getdef.c	2006-05-31 23:24:45.926555024 +0700
-+++ shadow-4.0.16/lib/getdef.c	2006-05-31 23:24:46.990393296 +0700
+--- shadow-4.0.18.1.orig/lib/getdef.c	2006-09-17 12:17:54.992013530 +0200
++++ shadow-4.0.18.1/lib/getdef.c	2006-09-17 12:17:55.628018587 +0200
 @@ -56,6 +56,7 @@
  	{"ENV_SUPATH", NULL},
  	{"ERASECHAR", NULL},

Modified: trunk/debian/patches/431_su_uid_0_not_root
===================================================================
--- trunk/debian/patches/431_su_uid_0_not_root	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/431_su_uid_0_not_root	2006-09-17 10:21:45 UTC (rev 1113)
@@ -6,11 +6,11 @@
                      upstream (multiple uid 0 accounts).
 http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2005-June/001287.html
 
-Index: shadow-4.0.16/src/su.c
+Index: shadow-4.0.18.1/src/su.c
 ===================================================================
---- shadow-4.0.16.orig/src/su.c	2006-05-31 23:23:58.079828832 +0700
-+++ shadow-4.0.16/src/su.c	2006-05-31 23:24:39.945464288 +0700
-@@ -426,7 +426,14 @@
+--- shadow-4.0.18.1.orig/src/su.c	2006-08-01 12:30:02.000000000 +0200
++++ shadow-4.0.18.1/src/su.c	2006-09-17 12:17:47.383953038 +0200
+@@ -427,7 +427,14 @@
  			optind++;
  	}
  	if (!name[0])		/* use default user ID */

Modified: trunk/debian/patches/433_shadow.5-typo_312430
===================================================================
--- trunk/debian/patches/433_shadow.5-typo_312430	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/433_shadow.5-typo_312430	2006-09-17 10:21:45 UTC (rev 1113)
@@ -3,10 +3,10 @@
 
 Status wrt upstream: Forwarded but not applied yet
 
-Index: shadow-4.0.16/man/shadow.5.xml
+Index: shadow-4.0.18.1/man/shadow.5.xml
 ===================================================================
---- shadow-4.0.16.orig/man/shadow.5.xml	2006-05-31 23:23:55.624202144 +0700
-+++ shadow-4.0.16/man/shadow.5.xml	2006-05-31 23:24:48.946095984 +0700
+--- shadow-4.0.18.1.orig/man/shadow.5.xml	2006-07-24 07:48:36.000000000 +0200
++++ shadow-4.0.18.1/man/shadow.5.xml	2006-09-17 12:17:56.912028796 +0200
 @@ -50,7 +50,7 @@
  
      <para>

Modified: trunk/debian/patches/434_login_stop_checking_args_after--
===================================================================
--- trunk/debian/patches/434_login_stop_checking_args_after--	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/434_login_stop_checking_args_after--	2006-09-17 10:21:45 UTC (rev 1113)
@@ -5,10 +5,10 @@
                      Upstream comment: "Better will be rewrite login
                      for use getopt_long()."
 
-Index: shadow-4.0.16/src/login.c
+Index: shadow-4.0.18.1/src/login.c
 ===================================================================
---- shadow-4.0.16.orig/src/login.c	2006-05-31 23:23:57.010991320 +0700
-+++ shadow-4.0.16/src/login.c	2006-05-31 23:24:44.967700792 +0700
+--- shadow-4.0.18.1.orig/src/login.c	2006-07-10 06:11:32.000000000 +0200
++++ shadow-4.0.18.1/src/login.c	2006-09-17 12:17:54.336008314 +0200
 @@ -253,6 +253,8 @@
  	for (arg = 1; arg < argc; arg++) {
  		if (argv[arg][0] == '-' && strlen (argv[arg]) > 2)

Modified: trunk/debian/patches/438_su_GNU_origin
===================================================================
--- trunk/debian/patches/438_su_GNU_origin	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/438_su_GNU_origin	2006-09-17 10:21:45 UTC (rev 1113)
@@ -4,10 +4,10 @@
 Status wrt upstream: It must be forwarded upstream.
                      Upstream also uses some bits from the GNU shellutils.
 
-Index: shadow-4.0.16/src/su.c
+Index: shadow-4.0.18.1/src/su.c
 ===================================================================
---- shadow-4.0.16.orig/src/su.c	2006-05-31 23:24:42.561066656 +0700
-+++ shadow-4.0.16/src/su.c	2006-05-31 23:24:47.992240992 +0700
+--- shadow-4.0.18.1.orig/src/su.c	2006-09-17 12:17:53.099998487 +0200
++++ shadow-4.0.18.1/src/su.c	2006-09-17 12:17:56.308023993 +0200
 @@ -26,6 +26,24 @@
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.

Modified: trunk/debian/patches/451_login_PATH
===================================================================
--- trunk/debian/patches/451_login_PATH	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/451_login_PATH	2006-09-17 10:21:45 UTC (rev 1113)
@@ -4,10 +4,10 @@
 
 Status wrt upstream:
 
-Index: shadow-4.0.16/libmisc/setupenv.c
+Index: shadow-4.0.18.1/libmisc/setupenv.c
 ===================================================================
---- shadow-4.0.16.orig/libmisc/setupenv.c	2006-05-13 01:13:10.000000000 +0200
-+++ shadow-4.0.16/libmisc/setupenv.c	2006-05-31 22:46:07.000000000 +0200
+--- shadow-4.0.18.1.orig/libmisc/setupenv.c	2006-05-13 01:13:10.000000000 +0200
++++ shadow-4.0.18.1/libmisc/setupenv.c	2006-09-17 12:18:01.768067405 +0200
 @@ -186,8 +186,8 @@
  {
  #ifndef USE_PAM

Modified: trunk/debian/patches/454_userdel_no_MAIL_FILE
===================================================================
--- trunk/debian/patches/454_userdel_no_MAIL_FILE	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/454_userdel_no_MAIL_FILE	2006-09-17 10:21:45 UTC (rev 1113)
@@ -6,11 +6,11 @@
 Note: usermod should be checked also. Maybe MAIL_FILE can be removed from
       login.defs
 
-Index: shadow-4.0.16/src/userdel.c
+Index: shadow-4.0.18.1/src/userdel.c
 ===================================================================
---- shadow-4.0.16.orig/src/userdel.c	2006-05-31 23:24:50.959789856 +0700
-+++ shadow-4.0.16/src/userdel.c	2006-05-31 23:24:57.190842592 +0700
-@@ -553,7 +553,7 @@
+--- shadow-4.0.18.1.orig/src/userdel.c	2006-09-17 12:17:58.256039482 +0200
++++ shadow-4.0.18.1/src/userdel.c	2006-09-17 12:18:02.408072494 +0200
+@@ -550,7 +550,7 @@
  
  	maildir = getdef_str ("MAIL_DIR");
  #ifdef MAIL_SPOOL_DIR

Modified: trunk/debian/patches/462_warn_to_edit_shadow
===================================================================
--- trunk/debian/patches/462_warn_to_edit_shadow	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/462_warn_to_edit_shadow	2006-09-17 10:21:45 UTC (rev 1113)
@@ -5,10 +5,10 @@
 
 Status wrt upstream: Forwarded but not applied yet
 
-Index: shadow-4.0.16/src/vipw.c
+Index: shadow-4.0.18.1/src/vipw.c
 ===================================================================
---- shadow-4.0.16.orig/src/vipw.c	2006-05-31 23:23:52.349699944 +0700
-+++ shadow-4.0.16/src/vipw.c	2006-05-31 23:24:59.095553032 +0700
+--- shadow-4.0.18.1.orig/src/vipw.c	2006-06-20 22:00:04.000000000 +0200
++++ shadow-4.0.18.1/src/vipw.c	2006-09-17 12:18:03.644082321 +0200
 @@ -41,6 +41,12 @@
  #include "pwio.h"
  #include "sgroupio.h"
@@ -22,7 +22,7 @@
  /*
   * Global variables
   */
-@@ -284,17 +290,39 @@
+@@ -285,17 +291,39 @@
  	}
  
  	if (do_vipw) {

Modified: trunk/debian/patches/463_login_delay_obeys_to_PAM
===================================================================
--- trunk/debian/patches/463_login_delay_obeys_to_PAM	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/463_login_delay_obeys_to_PAM	2006-09-17 10:21:45 UTC (rev 1113)
@@ -7,10 +7,10 @@
 
 Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs
 
-Index: shadow-4.0.16/src/login.c
+Index: shadow-4.0.18.1/src/login.c
 ===================================================================
---- shadow-4.0.16.orig/src/login.c	2006-05-31 23:24:46.988393600 +0700
-+++ shadow-4.0.16/src/login.c	2006-05-31 23:25:00.053407416 +0700
+--- shadow-4.0.18.1.orig/src/login.c	2006-09-17 12:17:55.628018587 +0200
++++ shadow-4.0.18.1/src/login.c	2006-09-17 12:18:04.272087315 +0200
 @@ -331,7 +331,6 @@
  	char ptime[80];
  #endif
@@ -63,7 +63,7 @@
  
  			  retcode = pam_authenticate (pamh, 0);
  
-@@ -936,13 +928,16 @@
+@@ -934,13 +926,16 @@
  		if (pwent.pw_passwd[0] == '\0')
  			pw_auth ("!", username, reason, (char *) 0);
  
@@ -80,10 +80,10 @@
  
  		puts (_("Login incorrect"));
  
-Index: shadow-4.0.16/lib/getdef.c
+Index: shadow-4.0.18.1/lib/getdef.c
 ===================================================================
---- shadow-4.0.16.orig/lib/getdef.c	2006-05-31 23:24:46.990393296 +0700
-+++ shadow-4.0.16/lib/getdef.c	2006-05-31 23:25:00.054407264 +0700
+--- shadow-4.0.18.1.orig/lib/getdef.c	2006-09-17 12:17:58.260039514 +0200
++++ shadow-4.0.18.1/lib/getdef.c	2006-09-17 12:18:04.276087346 +0200
 @@ -55,7 +55,6 @@
  	{"ENV_PATH", NULL},
  	{"ENV_SUPATH", NULL},
@@ -92,7 +92,7 @@
  	{"FAILLOG_ENAB", NULL},
  	{"FAKE_SHELL", NULL},
  	{"FTMP_FILE", NULL},
-@@ -89,6 +88,7 @@
+@@ -92,6 +91,7 @@
  	{"ENV_HZ", NULL},
  	{"ENVIRON_FILE", NULL},
  	{"ENV_TZ", NULL},

Modified: trunk/debian/patches/466_fflush-prompt
===================================================================
--- trunk/debian/patches/466_fflush-prompt	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/466_fflush-prompt	2006-09-17 10:21:45 UTC (rev 1113)
@@ -3,10 +3,10 @@
 
 Status wrt upstream: may appear in 4.0.14
       
-Index: shadow-4.0.16/libmisc/Makefile.am
+Index: shadow-4.0.18.1/libmisc/Makefile.am
 ===================================================================
---- shadow-4.0.16.orig/libmisc/Makefile.am	2006-05-31 23:23:51.481831880 +0700
-+++ shadow-4.0.16/libmisc/Makefile.am	2006-05-31 23:25:02.028107216 +0700
+--- shadow-4.0.18.1.orig/libmisc/Makefile.am	2005-09-05 18:21:37.000000000 +0200
++++ shadow-4.0.18.1/libmisc/Makefile.am	2006-09-17 12:18:05.616098001 +0200
 @@ -49,4 +49,5 @@
  	ulimit.c \
  	utmp.c \
@@ -14,10 +14,10 @@
 -	xmalloc.c
 +	xmalloc.c \
 +	yesno.c
-Index: shadow-4.0.16/libmisc/fields.c
+Index: shadow-4.0.18.1/libmisc/fields.c
 ===================================================================
---- shadow-4.0.16.orig/libmisc/fields.c	2006-05-31 23:23:51.522825648 +0700
-+++ shadow-4.0.16/libmisc/fields.c	2006-05-31 23:25:02.030106912 +0700
+--- shadow-4.0.18.1.orig/libmisc/fields.c	2005-08-31 19:24:57.000000000 +0200
++++ shadow-4.0.18.1/libmisc/fields.c	2006-09-17 12:18:05.620098032 +0200
 @@ -71,6 +71,7 @@
  		maxsize = sizeof (newf);
  
@@ -26,10 +26,10 @@
  	if (fgets (newf, maxsize, stdin) != newf)
  		return;
  
-Index: shadow-4.0.16/libmisc/yesno.c
+Index: shadow-4.0.18.1/libmisc/yesno.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.16/libmisc/yesno.c	2006-05-31 23:25:02.030106912 +0700
++++ shadow-4.0.18.1/libmisc/yesno.c	2006-09-17 12:18:05.620098032 +0200
 @@ -0,0 +1,41 @@
 +/*
 + * Common code for yes/no prompting
@@ -72,10 +72,10 @@
 +
 +	return 0;
 +}
-Index: shadow-4.0.16/src/grpck.c
+Index: shadow-4.0.18.1/src/grpck.c
 ===================================================================
---- shadow-4.0.16.orig/src/grpck.c	2006-05-31 23:24:43.861868904 +0700
-+++ shadow-4.0.16/src/grpck.c	2006-05-31 23:25:02.033106456 +0700
+--- shadow-4.0.18.1.orig/src/grpck.c	2006-09-17 12:17:53.712003353 +0200
++++ shadow-4.0.18.1/src/grpck.c	2006-09-17 12:18:05.620098032 +0200
 @@ -50,6 +50,8 @@
  extern struct commonio_entry *__sgr_get_head (void);
  #endif
@@ -205,10 +205,10 @@
  				continue;
  
  			SYSLOG ((LOG_INFO,
-Index: shadow-4.0.16/src/pwck.c
+Index: shadow-4.0.18.1/src/pwck.c
 ===================================================================
---- shadow-4.0.16.orig/src/pwck.c	2006-05-31 23:23:51.641807560 +0700
-+++ shadow-4.0.16/src/pwck.c	2006-05-31 23:25:02.035106152 +0700
+--- shadow-4.0.18.1.orig/src/pwck.c	2006-05-07 19:44:39.000000000 +0200
++++ shadow-4.0.18.1/src/pwck.c	2006-09-17 12:18:05.624098064 +0200
 @@ -49,6 +49,8 @@
  extern void __spw_del_entry (const struct commonio_entry *);
  extern struct commonio_entry *__spw_get_head (void);

Modified: trunk/debian/patches/467_useradd_-r_LSB
===================================================================
--- trunk/debian/patches/467_useradd_-r_LSB	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/467_useradd_-r_LSB	2006-09-17 10:21:45 UTC (rev 1113)
@@ -6,10 +6,10 @@
                      is really ready to apply it. We apply it anyway because 
                      LSB compliance is important for Debian
 
-Index: shadow-4.0.16/src/useradd.c
+Index: shadow-4.0.18.1/src/useradd.c
 ===================================================================
---- shadow-4.0.16.orig/src/useradd.c	2006-05-31 23:24:55.230140664 +0700
-+++ shadow-4.0.16/src/useradd.c	2006-05-31 23:25:01.062254048 +0700
+--- shadow-4.0.18.1.orig/src/useradd.c	2006-09-17 12:18:01.140062412 +0200
++++ shadow-4.0.18.1/src/useradd.c	2006-09-17 12:18:05.004093135 +0200
 @@ -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 */
@@ -18,15 +18,15 @@
      sflg = 0,			/* shell program for new account */
      uflg = 0;			/* specify user ID for new account */
  
-@@ -633,6 +634,7 @@
+@@ -638,6 +639,7 @@
  			   "				(non-unique) UID\n"
  			   "  -p, --password PASSWORD	use encrypted password for the new user\n"
  			   "				account\n"
 +			   "  -r, --system			create a system account\n"
  			   "  -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);
-@@ -680,11 +682,19 @@
+ 			   "  -u, --uid UID			force use the UID for the new user account\n"
+ 			   "\n"));
+@@ -686,11 +688,19 @@
  	spent->sp_namp = (char *) user_name;
  	spent->sp_pwdp = (char *) user_pass;
  	spent->sp_lstchg = time ((time_t *) 0) / SCALE;
@@ -51,7 +51,7 @@
  	spent->sp_flag = -1;
  }
  
-@@ -832,8 +842,13 @@
+@@ -838,8 +848,13 @@
  	const struct passwd *pwd;
  	uid_t uid_min, uid_max;
  
@@ -67,7 +67,7 @@
  
  	/*
  	 * Start with some UID value if the user didn't provide us with
-@@ -1012,12 +1027,13 @@
+@@ -1018,12 +1033,13 @@
  			{"create-home", no_argument, NULL, 'm'},
  			{"non-unique", no_argument, NULL, 'o'},
  			{"password", required_argument, NULL, 'p'},
@@ -82,7 +82,7 @@
  				     long_options, NULL)) != -1) {
  			switch (c) {
  			case 'b':
-@@ -1171,6 +1187,9 @@
+@@ -1177,6 +1193,9 @@
  				}
  				user_pass = optarg;
  				break;
@@ -92,7 +92,7 @@
  			case 's':
  				if (!VALID (optarg)
  				    || (optarg[0]
-@@ -1558,24 +1577,27 @@
+@@ -1569,24 +1588,27 @@
   */
  static void create_home (void)
  {

Modified: trunk/debian/patches/468_duplicate_passwd_struct_before_usage
===================================================================
--- trunk/debian/patches/468_duplicate_passwd_struct_before_usage	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/468_duplicate_passwd_struct_before_usage	2006-09-17 10:21:45 UTC (rev 1113)
@@ -27,10 +27,10 @@
 
 Status wrt upstream: 
 
-Index: shadow-4.0.16/src/chfn.c
+Index: shadow-4.0.18.1/src/chfn.c
 ===================================================================
---- shadow-4.0.16.orig/src/chfn.c	2006-05-31 23:23:51.141883560 +0700
-+++ shadow-4.0.16/src/chfn.c	2006-05-31 23:25:03.169933632 +0700
+--- shadow-4.0.18.1.orig/src/chfn.c	2006-05-07 19:44:39.000000000 +0200
++++ shadow-4.0.18.1/src/chfn.c	2006-09-17 12:18:06.364103948 +0200
 @@ -334,6 +334,11 @@
  		}
  		user = xstrdup (pw->pw_name);
@@ -43,11 +43,11 @@
  
  #ifdef	USE_NIS
  	/*
-Index: shadow-4.0.16/src/chsh.c
+Index: shadow-4.0.18.1/src/chsh.c
 ===================================================================
---- shadow-4.0.16.orig/src/chsh.c	2006-05-31 23:23:51.198874896 +0700
-+++ shadow-4.0.16/src/chsh.c	2006-05-31 23:25:03.171933328 +0700
-@@ -246,6 +246,11 @@
+--- shadow-4.0.18.1.orig/src/chsh.c	2006-07-13 23:26:35.000000000 +0200
++++ shadow-4.0.18.1/src/chsh.c	2006-09-17 12:18:06.368103980 +0200
+@@ -265,6 +265,11 @@
  		}
  		user = xstrdup (pw->pw_name);
  	}

Modified: trunk/debian/patches/479_chowntty_debug
===================================================================
--- trunk/debian/patches/479_chowntty_debug	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/479_chowntty_debug	2006-09-17 10:21:45 UTC (rev 1113)
@@ -13,10 +13,10 @@
 is_my_tty() which is failing for a reason yet unknown (I suspect
 corruption of utmp file).
 
-Index: shadow-4.0.16/libmisc/chowntty.c
+Index: shadow-4.0.18.1/libmisc/chowntty.c
 ===================================================================
---- shadow-4.0.16.orig/libmisc/chowntty.c	2006-05-31 23:23:49.779090736 +0700
-+++ shadow-4.0.16/libmisc/chowntty.c	2006-05-31 23:25:06.165478240 +0700
+--- shadow-4.0.18.1.orig/libmisc/chowntty.c	2005-08-31 19:24:57.000000000 +0200
++++ shadow-4.0.18.1/libmisc/chowntty.c	2006-09-17 12:18:08.256118991 +0200
 @@ -40,6 +40,7 @@
  #include "defines.h"
  #include <pwd.h>

Modified: trunk/debian/patches/480_getopt_args_reorder
===================================================================
--- trunk/debian/patches/480_getopt_args_reorder	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/480_getopt_args_reorder	2006-09-17 10:21:45 UTC (rev 1113)
@@ -15,11 +15,11 @@
 case (a -- would have to be added for all the su -c "command"
 invocations).
 
-Index: shadow-4.0.16/src/su.c
+Index: shadow-4.0.18.1/src/su.c
 ===================================================================
---- shadow-4.0.16.orig/src/su.c	2006-05-31 23:25:05.180627960 +0700
-+++ shadow-4.0.16/src/su.c	2006-05-31 23:25:07.146329128 +0700
-@@ -373,19 +373,9 @@
+--- shadow-4.0.18.1.orig/src/su.c	2006-09-17 12:18:07.616113902 +0200
++++ shadow-4.0.18.1/src/su.c	2006-09-17 12:18:08.884123984 +0200
+@@ -374,19 +374,9 @@
  		};
  
  		while ((c =
@@ -40,7 +40,7 @@
  			case 'c':
  				command = optarg;
  				break;
-@@ -407,10 +397,9 @@
+@@ -408,10 +398,9 @@
  				shellstr = optarg;
  				break;
  			default:

Modified: trunk/debian/patches/483_su_fakelogin_wrong_arg0
===================================================================
--- trunk/debian/patches/483_su_fakelogin_wrong_arg0	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/483_su_fakelogin_wrong_arg0	2006-09-17 10:21:45 UTC (rev 1113)
@@ -2,11 +2,11 @@
 
 Status wrt upstream: not reported yet
 
-Index: shadow-4.0.16/src/su.c
+Index: shadow-4.0.18.1/src/su.c
 ===================================================================
---- shadow-4.0.16.orig/src/su.c	2006-05-31 23:25:07.146329128 +0700
-+++ shadow-4.0.16/src/su.c	2006-05-31 23:25:08.102183816 +0700
-@@ -918,7 +918,7 @@
+--- shadow-4.0.18.1.orig/src/su.c	2006-09-17 12:18:08.884123984 +0200
++++ shadow-4.0.18.1/src/su.c	2006-09-17 12:18:09.492128818 +0200
+@@ -916,7 +916,7 @@
  		 * Use the shell and create an argv
  		 * with the rest of the command line included.
  		 */

Modified: trunk/debian/patches/487_passwd_chauthtok_failed_message
===================================================================
--- trunk/debian/patches/487_passwd_chauthtok_failed_message	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/487_passwd_chauthtok_failed_message	2006-09-17 10:21:45 UTC (rev 1113)
@@ -6,10 +6,10 @@
 
 Status wrt upstream: not forwarded yet
 
-Index: shadow-4.0.16/libmisc/pam_pass.c
+Index: shadow-4.0.18.1/libmisc/pam_pass.c
 ===================================================================
---- shadow-4.0.16.orig/libmisc/pam_pass.c	2006-05-31 23:23:47.848384248 +0700
-+++ shadow-4.0.16/libmisc/pam_pass.c	2006-05-31 23:25:11.939600440 +0700
+--- shadow-4.0.18.1.orig/libmisc/pam_pass.c	2005-10-19 17:21:07.000000000 +0200
++++ shadow-4.0.18.1/libmisc/pam_pass.c	2006-09-17 12:18:12.028148982 +0200
 @@ -38,6 +38,7 @@
  	ret = pam_chauthtok (pamh, flags);
  	if (ret != PAM_SUCCESS) {

Modified: trunk/debian/patches/491_configure.in_friendly_selinux_detection
===================================================================
--- trunk/debian/patches/491_configure.in_friendly_selinux_detection	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/491_configure.in_friendly_selinux_detection	2006-09-17 10:21:45 UTC (rev 1113)
@@ -7,10 +7,10 @@
 
 Status wrt upstream: reported by Mike, not applied yet
 
-Index: shadow-4.0.17/configure.in
+Index: shadow-4.0.18.1/configure.in
 ===================================================================
---- shadow-4.0.17.orig/configure.in	2006-06-25 14:27:52.000000000 +0200
-+++ shadow-4.0.17/configure.in	2006-07-11 22:07:03.000000000 +0200
+--- shadow-4.0.18.1.orig/configure.in	2006-08-03 12:17:21.000000000 +0200
++++ shadow-4.0.18.1/configure.in	2006-09-17 12:18:10.116133780 +0200
 @@ -220,7 +220,7 @@
  	[with_libpam=$withval], [with_libpam=yes])
  AC_ARG_WITH(selinux,

Modified: trunk/debian/patches/495_salt_stack_smash
===================================================================
--- trunk/debian/patches/495_salt_stack_smash	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/495_salt_stack_smash	2006-09-17 10:21:45 UTC (rev 1113)
@@ -8,10 +8,10 @@
 
 Status wrt upstream: reported, not applied yet
 
-Index: shadow-4.0.17/libmisc/salt.c
+Index: shadow-4.0.18.1/libmisc/salt.c
 ===================================================================
---- shadow-4.0.17.orig/libmisc/salt.c	2006-07-14 09:25:51.386230790 +0200
-+++ shadow-4.0.17/libmisc/salt.c	2006-07-14 09:25:52.746241896 +0200
+--- shadow-4.0.18.1.orig/libmisc/salt.c	2006-09-17 12:17:58.260039514 +0200
++++ shadow-4.0.18.1/libmisc/salt.c	2006-09-17 12:18:13.948164248 +0200
 @@ -25,11 +25,13 @@
  {
  	struct timeval tv;
@@ -37,10 +37,10 @@
  
  	return result;
  }
-Index: shadow-4.0.17/src/chgpasswd.c
+Index: shadow-4.0.18.1/src/chgpasswd.c
 ===================================================================
---- shadow-4.0.17.orig/src/chgpasswd.c	2006-07-14 09:25:51.334230366 +0200
-+++ shadow-4.0.17/src/chgpasswd.c	2006-07-14 09:25:52.746241896 +0200
+--- shadow-4.0.18.1.orig/src/chgpasswd.c	2006-09-17 12:17:58.260039514 +0200
++++ shadow-4.0.18.1/src/chgpasswd.c	2006-09-17 12:18:13.952164280 +0200
 @@ -244,10 +244,16 @@
  		newpwd = cp;
  		if (!eflg) {
@@ -61,10 +61,10 @@
  			} else
  				cp = pw_encrypt (newpwd, crypt_make_salt ());
  		}
-Index: shadow-4.0.17/src/chpasswd.c
+Index: shadow-4.0.18.1/src/chpasswd.c
 ===================================================================
---- shadow-4.0.17.orig/src/chpasswd.c	2006-07-14 09:25:51.206229320 +0200
-+++ shadow-4.0.17/src/chpasswd.c	2006-07-14 09:25:52.750241929 +0200
+--- shadow-4.0.18.1.orig/src/chpasswd.c	2006-09-17 12:17:58.228039259 +0200
++++ shadow-4.0.18.1/src/chpasswd.c	2006-09-17 12:18:13.972164439 +0200
 @@ -240,10 +240,16 @@
  		newpwd = cp;
  		if (!eflg) {

Modified: trunk/debian/patches/496_login_init_session
===================================================================
--- trunk/debian/patches/496_login_init_session	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/496_login_init_session	2006-09-17 10:21:45 UTC (rev 1113)
@@ -8,10 +8,10 @@
 
 Status wrt upstream: reported, not applied yet
 
-Index: shadow-4.0.17/src/login.c
+Index: shadow-4.0.18.1/src/login.c
 ===================================================================
---- shadow-4.0.17.orig/src/login.c	2006-07-14 09:25:51.806234220 +0200
-+++ shadow-4.0.17/src/login.c	2006-07-14 09:31:59.645240541 +0200
+--- shadow-4.0.18.1.orig/src/login.c	2006-09-17 12:18:04.272087315 +0200
++++ shadow-4.0.18.1/src/login.c	2006-09-17 12:18:14.632169686 +0200
 @@ -41,6 +41,7 @@
  #include <signal.h>
  #include <stdio.h>
@@ -33,10 +33,10 @@
  
  	/* We call set_groups() above because this clobbers pam_groups.so */
  #ifndef USE_PAM
-Index: shadow-4.0.17/src/sulogin.c
+Index: shadow-4.0.18.1/src/sulogin.c
 ===================================================================
---- shadow-4.0.17.orig/src/sulogin.c	2006-05-13 01:13:10.000000000 +0200
-+++ shadow-4.0.17/src/sulogin.c	2006-07-14 09:31:59.669240742 +0200
+--- shadow-4.0.18.1.orig/src/sulogin.c	2006-05-13 01:13:10.000000000 +0200
++++ shadow-4.0.18.1/src/sulogin.c	2006-09-17 12:18:14.632169686 +0200
 @@ -35,6 +35,7 @@
  #include <pwd.h>
  #include <signal.h>

Modified: trunk/debian/patches/497_non_numerical_identifier
===================================================================
--- trunk/debian/patches/497_non_numerical_identifier	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/497_non_numerical_identifier	2006-09-17 10:21:45 UTC (rev 1113)
@@ -7,8 +7,8 @@
 
 Index: shadow-4.0.18.1/src/useradd.c
 ===================================================================
---- shadow-4.0.18.1.orig/src/useradd.c	2006-08-04 19:13:34.000000000 +0200
-+++ shadow-4.0.18.1/src/useradd.c	2006-08-04 19:13:35.000000000 +0200
+--- shadow-4.0.18.1.orig/src/useradd.c	2006-09-17 12:18:05.004093135 +0200
++++ shadow-4.0.18.1/src/useradd.c	2006-09-17 12:18:15.280174838 +0200
 @@ -206,11 +206,8 @@
  	char *errptr;
  
@@ -25,8 +25,8 @@
  
 Index: shadow-4.0.18.1/src/usermod.c
 ===================================================================
---- shadow-4.0.18.1.orig/src/usermod.c	2006-08-04 19:13:41.000000000 +0200
-+++ shadow-4.0.18.1/src/usermod.c	2006-08-04 19:14:17.000000000 +0200
+--- shadow-4.0.18.1.orig/src/usermod.c	2006-09-17 12:18:11.400143989 +0200
++++ shadow-4.0.18.1/src/usermod.c	2006-09-17 12:18:15.284174870 +0200
 @@ -167,11 +167,8 @@
  	char *errptr;
  

Modified: trunk/debian/patches/498_man_nonpam_undefined
===================================================================
--- trunk/debian/patches/498_man_nonpam_undefined	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/498_man_nonpam_undefined	2006-09-17 10:21:45 UTC (rev 1113)
@@ -9,7 +9,7 @@
 Index: shadow-4.0.18.1/man/sv/Makefile.am
 ===================================================================
 --- shadow-4.0.18.1.orig/man/sv/Makefile.am	2006-08-03 12:13:27.000000000 +0200
-+++ shadow-4.0.18.1/man/sv/Makefile.am	2006-08-04 19:22:37.000000000 +0200
++++ shadow-4.0.18.1/man/sv/Makefile.am	2006-09-17 12:18:15.972180340 +0200
 @@ -54,4 +54,4 @@
  
  EXTRA_DIST = \
@@ -18,8 +18,8 @@
 +	$(man_nopam)
 Index: shadow-4.0.18.1/man/it/Makefile.am
 ===================================================================
---- shadow-4.0.18.1.orig/man/it/Makefile.am	2006-08-04 19:26:20.000000000 +0200
-+++ shadow-4.0.18.1/man/it/Makefile.am	2006-08-04 19:26:26.000000000 +0200
+--- shadow-4.0.18.1.orig/man/it/Makefile.am	2006-08-03 12:11:59.000000000 +0200
++++ shadow-4.0.18.1/man/it/Makefile.am	2006-09-17 12:18:15.972180340 +0200
 @@ -46,5 +46,5 @@
                          
  EXTRA_DIST = \
@@ -29,9 +29,9 @@
  	id.1
 Index: shadow-4.0.18.1/man/it/Makefile.in
 ===================================================================
---- shadow-4.0.18.1.orig/man/it/Makefile.in	2006-08-04 19:24:40.000000000 +0200
-+++ shadow-4.0.18.1/man/it/Makefile.in	2006-08-04 19:24:53.000000000 +0200
-@@ -215,7 +215,7 @@
+--- shadow-4.0.18.1.orig/man/it/Makefile.in	2006-08-03 12:25:12.000000000 +0200
++++ shadow-4.0.18.1/man/it/Makefile.in	2006-09-17 12:18:15.976180372 +0200
+@@ -205,7 +205,7 @@
  
  EXTRA_DIST = \
  	$(man_MANS) \
@@ -39,4 +39,4 @@
 +	$(man_nopam) \
  	id.1
  
- subdir = man/it
+ all: all-am

Modified: trunk/debian/patches/499_gettext-0.15
===================================================================
--- trunk/debian/patches/499_gettext-0.15	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/499_gettext-0.15	2006-09-17 10:21:45 UTC (rev 1113)
@@ -7,8 +7,8 @@
 
 Index: shadow-4.0.18.1/po/Makefile.in.in
 ===================================================================
---- shadow-4.0.18.1.orig/po/Makefile.in.in	2006-08-25 17:43:49.000000000 +0200
-+++ shadow-4.0.18.1/po/Makefile.in.in	2006-08-25 17:44:12.000000000 +0200
+--- shadow-4.0.18.1.orig/po/Makefile.in.in	2006-06-12 02:35:49.000000000 +0200
++++ shadow-4.0.18.1/po/Makefile.in.in	2006-09-17 12:18:17.300190899 +0200
 @@ -26,7 +26,7 @@
  
  INSTALL = @INSTALL@

Modified: trunk/debian/patches/501_commonio_group_shadow
===================================================================
--- trunk/debian/patches/501_commonio_group_shadow	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/501_commonio_group_shadow	2006-09-17 10:21:45 UTC (rev 1113)
@@ -2,10 +2,10 @@
 
 Fixes: #166793
 
-Index: shadow-4.0.16/lib/commonio.c
+Index: shadow-4.0.18.1/lib/commonio.c
 ===================================================================
---- shadow-4.0.16.orig/lib/commonio.c	2006-05-31 23:23:52.578665136 +0700
-+++ shadow-4.0.16/lib/commonio.c	2006-05-31 23:24:58.140698192 +0700
+--- shadow-4.0.18.1.orig/lib/commonio.c	2006-06-08 15:36:11.000000000 +0200
++++ shadow-4.0.18.1/lib/commonio.c	2006-09-17 12:18:03.020077360 +0200
 @@ -13,6 +13,7 @@
  #include <stdio.h>
  #include <signal.h>

Modified: trunk/debian/patches/503_shadowconfig.8
===================================================================
--- trunk/debian/patches/503_shadowconfig.8	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/503_shadowconfig.8	2006-09-17 10:21:45 UTC (rev 1113)
@@ -3,10 +3,10 @@
 Status wrt upstream: The shadowconfig utility is debian specific.
                      It's man page also (but it used to be distributed)
 
-Index: shadow-4.0.16/man/shadowconfig.8
+Index: shadow-4.0.18.1/man/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.16/man/shadowconfig.8	2006-05-31 23:24:38.052752024 +0700
++++ shadow-4.0.18.1/man/shadowconfig.8	2006-09-17 12:17:46.003942066 +0200
 @@ -0,0 +1,41 @@
 +.\"Generated by db2man.xsl. Don't modify this, modify the source.
 +.de Sh \" Subsection
@@ -49,10 +49,10 @@
 +.PP
 +Note that turning shadow passwords off and on again will lose all password aging information\&.
 +
-Index: shadow-4.0.16/man/shadowconfig.8.xml
+Index: shadow-4.0.18.1/man/shadowconfig.8.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.16/man/shadowconfig.8.xml	2006-05-31 23:24:38.054751720 +0700
++++ shadow-4.0.18.1/man/shadowconfig.8.xml	2006-09-17 12:17:46.007942098 +0200
 @@ -0,0 +1,52 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -106,10 +106,10 @@
 +    </para>
 +  </refsect1>
 +</refentry>
-Index: shadow-4.0.16/man/fr/shadowconfig.8
+Index: shadow-4.0.18.1/man/fr/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.16/man/fr/shadowconfig.8	2006-05-31 23:24:38.056751416 +0700
++++ shadow-4.0.18.1/man/fr/shadowconfig.8	2006-09-17 12:17:46.079942670 +0200
 @@ -0,0 +1,26 @@
 +.\" This file was generated with po4a. Translate the source file.
 +.\"
@@ -137,10 +137,10 @@
 +.SH TRADUCTION
 +Nicolas FRANÇOIS, 2004.
 +Veuillez signaler toute erreur à <\fIdebian\-l10\-french at lists.debian.org\fR>.
-Index: shadow-4.0.16/man/ja/shadowconfig.8
+Index: shadow-4.0.18.1/man/ja/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.16/man/ja/shadowconfig.8	2006-05-31 23:24:38.057751264 +0700
++++ shadow-4.0.18.1/man/ja/shadowconfig.8	2006-09-17 12:17:46.079942670 +0200
 @@ -0,0 +1,25 @@
 +.\"     all right reserved,
 +.\" Translated Tue Oct 30 11:59:11 JST 2001
@@ -167,10 +167,10 @@
 +
 +.I /usr/share/doc/passwd/README.debian.gz
 +には shadow パスワードとそれに関する特徴の簡単な紹介が書かれている。
-Index: shadow-4.0.16/man/pl/shadowconfig.8
+Index: shadow-4.0.18.1/man/pl/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.16/man/pl/shadowconfig.8	2006-05-31 23:24:38.059750960 +0700
++++ shadow-4.0.18.1/man/pl/shadowconfig.8	2006-09-17 12:17:46.083942702 +0200
 @@ -0,0 +1,27 @@
 +.\" $Id: shadowconfig.8,v 1.3 2001/08/23 23:10:51 kloczek Exp $
 +.\" {PTM/WK/1999-09-14}

Modified: trunk/debian/patches/504_undef_USE_PAM.dpatch
===================================================================
--- trunk/debian/patches/504_undef_USE_PAM.dpatch	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/504_undef_USE_PAM.dpatch	2006-09-17 10:21:45 UTC (rev 1113)
@@ -2,22 +2,22 @@
       newusers, useradd, userdel, usermod, chgpasswd (keep them low-level)
 Fixes: #283961, #162181, #162199, #162228, #369806.
 
-Index: shadow-4.0.17/src/chage.c
+Index: shadow-4.0.18.1/src/chage.c
 ===================================================================
---- shadow-4.0.17.orig/src/chage.c	2006-06-25 16:12:38.000000000 +0200
-+++ shadow-4.0.17/src/chage.c	2006-07-11 22:25:06.000000000 +0200
+--- shadow-4.0.18.1.orig/src/chage.c	2006-07-19 18:38:57.000000000 +0200
++++ shadow-4.0.18.1/src/chage.c	2006-09-17 12:17:58.228039259 +0200
 @@ -28,6 +28,7 @@
   */
  
  #include <config.h>
 +#undef USE_PAM
  
- #ident "$Id: chage.c,v 1.72 2006/06/20 20:00:04 kloczek Exp $"
+ #ident "$Id: chage.c,v 1.73 2006/07/11 13:15:41 kloczek Exp $"
  
-Index: shadow-4.0.17/src/chpasswd.c
+Index: shadow-4.0.18.1/src/chpasswd.c
 ===================================================================
---- shadow-4.0.17.orig/src/chpasswd.c	2006-06-24 12:18:55.000000000 +0200
-+++ shadow-4.0.17/src/chpasswd.c	2006-07-11 22:25:06.000000000 +0200
+--- shadow-4.0.18.1.orig/src/chpasswd.c	2006-06-24 12:18:55.000000000 +0200
++++ shadow-4.0.18.1/src/chpasswd.c	2006-09-17 12:17:58.228039259 +0200
 @@ -28,6 +28,7 @@
   */
  
@@ -26,22 +26,22 @@
  
  #ident "$Id: chpasswd.c,v 1.37 2006/06/24 10:18:55 kloczek Exp $"
  
-Index: shadow-4.0.17/src/groupadd.c
+Index: shadow-4.0.18.1/src/groupadd.c
 ===================================================================
---- shadow-4.0.17.orig/src/groupadd.c	2006-06-24 07:52:00.000000000 +0200
-+++ shadow-4.0.17/src/groupadd.c	2006-07-11 22:25:06.000000000 +0200
+--- shadow-4.0.18.1.orig/src/groupadd.c	2006-07-28 19:38:52.000000000 +0200
++++ shadow-4.0.18.1/src/groupadd.c	2006-09-17 12:17:58.232039291 +0200
 @@ -28,6 +28,7 @@
   */
  
  #include <config.h>
 +#undef USE_PAM
  
- #ident "$Id: groupadd.c,v 1.53 2006/06/24 05:52:00 kloczek Exp $"
+ #ident "$Id: groupadd.c,v 1.55 2006/07/28 17:38:52 kloczek Exp $"
  
-Index: shadow-4.0.17/src/groupdel.c
+Index: shadow-4.0.18.1/src/groupdel.c
 ===================================================================
---- shadow-4.0.17.orig/src/groupdel.c	2006-01-18 20:55:15.000000000 +0100
-+++ shadow-4.0.17/src/groupdel.c	2006-07-11 22:25:06.000000000 +0200
+--- shadow-4.0.18.1.orig/src/groupdel.c	2006-01-18 20:55:15.000000000 +0100
++++ shadow-4.0.18.1/src/groupdel.c	2006-09-17 12:17:58.244039386 +0200
 @@ -28,6 +28,7 @@
   */
  
@@ -50,22 +50,22 @@
  
  #ident "$Id: groupdel.c,v 1.31 2006/01/18 19:55:15 kloczek Exp $"
  
-Index: shadow-4.0.17/src/groupmod.c
+Index: shadow-4.0.18.1/src/groupmod.c
 ===================================================================
---- shadow-4.0.17.orig/src/groupmod.c	2006-06-25 16:12:38.000000000 +0200
-+++ shadow-4.0.17/src/groupmod.c	2006-07-11 22:25:06.000000000 +0200
+--- shadow-4.0.18.1.orig/src/groupmod.c	2006-07-28 19:38:52.000000000 +0200
++++ shadow-4.0.18.1/src/groupmod.c	2006-09-17 12:17:58.248039418 +0200
 @@ -28,6 +28,7 @@
   */
  
  #include <config.h>
 +#undef USE_PAM
  
- #ident "$Id: groupmod.c,v 1.37 2005/10/19 15:21:07 kloczek Exp $"
+ #ident "$Id: groupmod.c,v 1.41 2006/07/28 17:38:52 kloczek Exp $"
  
-Index: shadow-4.0.17/src/newusers.c
+Index: shadow-4.0.18.1/src/newusers.c
 ===================================================================
---- shadow-4.0.17.orig/src/newusers.c	2006-03-07 16:50:33.000000000 +0100
-+++ shadow-4.0.17/src/newusers.c	2006-07-11 22:25:06.000000000 +0200
+--- shadow-4.0.18.1.orig/src/newusers.c	2006-03-07 16:50:33.000000000 +0100
++++ shadow-4.0.18.1/src/newusers.c	2006-09-17 12:17:58.248039418 +0200
 @@ -34,6 +34,7 @@
   */
  
@@ -74,22 +74,22 @@
  
  #ident "$Id: newusers.c,v 1.33 2006/03/07 15:47:32 kloczek Exp $"
  
-Index: shadow-4.0.17/src/useradd.c
+Index: shadow-4.0.18.1/src/useradd.c
 ===================================================================
---- shadow-4.0.17.orig/src/useradd.c	2006-06-22 13:30:32.000000000 +0200
-+++ shadow-4.0.17/src/useradd.c	2006-07-11 22:48:17.000000000 +0200
+--- shadow-4.0.18.1.orig/src/useradd.c	2006-07-28 19:42:48.000000000 +0200
++++ shadow-4.0.18.1/src/useradd.c	2006-09-17 12:17:58.252039450 +0200
 @@ -28,6 +28,7 @@
   */
  
  #include <config.h>
 +#undef USE_PAM
  
- #ident "$Id: useradd.c,v 1.99 2006/06/22 11:30:32 kloczek Exp $"
+ #ident "$Id: useradd.c,v 1.100 2006/07/28 17:42:48 kloczek Exp $"
  
-Index: shadow-4.0.17/src/userdel.c
+Index: shadow-4.0.18.1/src/userdel.c
 ===================================================================
---- shadow-4.0.17.orig/src/userdel.c	2006-07-10 06:11:32.000000000 +0200
-+++ shadow-4.0.17/src/userdel.c	2006-07-11 22:48:17.000000000 +0200
+--- shadow-4.0.18.1.orig/src/userdel.c	2006-07-10 06:11:32.000000000 +0200
++++ shadow-4.0.18.1/src/userdel.c	2006-09-17 12:17:58.256039482 +0200
 @@ -28,6 +28,7 @@
   */
  
@@ -98,22 +98,22 @@
  
  #ident "$Id: userdel.c,v 1.66 2006/07/10 04:11:32 kloczek Exp $"
  
-Index: shadow-4.0.17/src/usermod.c
+Index: shadow-4.0.18.1/src/usermod.c
 ===================================================================
---- shadow-4.0.17.orig/src/usermod.c	2006-06-25 15:10:29.000000000 +0200
-+++ shadow-4.0.17/src/usermod.c	2006-07-11 22:48:15.000000000 +0200
+--- shadow-4.0.18.1.orig/src/usermod.c	2006-07-28 19:42:48.000000000 +0200
++++ shadow-4.0.18.1/src/usermod.c	2006-09-17 12:17:58.256039482 +0200
 @@ -28,6 +28,7 @@
   */
  
  #include <config.h>
 +#undef USE_PAM
  
- #ident "$Id: usermod.c,v 1.69 2006/06/25 13:10:29 kloczek Exp $"
+ #ident "$Id: usermod.c,v 1.71 2006/07/28 17:42:48 kloczek Exp $"
  
-Index: shadow-4.0.17/src/chgpasswd.c
+Index: shadow-4.0.18.1/src/chgpasswd.c
 ===================================================================
---- shadow-4.0.17.orig/src/chgpasswd.c	2006-06-20 22:00:04.000000000 +0200
-+++ shadow-4.0.17/src/chgpasswd.c	2006-07-11 22:25:06.000000000 +0200
+--- shadow-4.0.18.1.orig/src/chgpasswd.c	2006-06-20 22:00:04.000000000 +0200
++++ shadow-4.0.18.1/src/chgpasswd.c	2006-09-17 12:17:58.260039514 +0200
 @@ -28,6 +28,7 @@
   */
  
@@ -122,10 +122,10 @@
  
  #ident "$Id: chgpasswd.c,v 1.5 2006/06/20 20:00:04 kloczek Exp $"
  
-Index: shadow-4.0.17/lib/getdef.c
+Index: shadow-4.0.18.1/lib/getdef.c
 ===================================================================
---- shadow-4.0.17.orig/lib/getdef.c	2006-07-11 22:49:19.000000000 +0200
-+++ shadow-4.0.17/lib/getdef.c	2006-07-11 22:52:15.000000000 +0200
+--- shadow-4.0.18.1.orig/lib/getdef.c	2006-09-17 12:17:55.628018587 +0200
++++ shadow-4.0.18.1/lib/getdef.c	2006-09-17 12:17:58.260039514 +0200
 @@ -82,6 +82,9 @@
  	{"UMASK", NULL},
  	{"USERDEL_CMD", NULL},
@@ -144,10 +144,10 @@
  	{"MOTD_FILE", NULL},
  	{"NOLOGINS_FILE", NULL},
  	{"OBSCURE_CHECKS_ENAB", NULL},
-Index: shadow-4.0.17/lib/prototypes.h
+Index: shadow-4.0.18.1/lib/prototypes.h
 ===================================================================
---- shadow-4.0.17.orig/lib/prototypes.h	2006-07-11 22:55:07.000000000 +0200
-+++ shadow-4.0.17/lib/prototypes.h	2006-07-11 22:59:42.000000000 +0200
+--- shadow-4.0.18.1.orig/lib/prototypes.h	2006-02-07 17:36:30.000000000 +0100
++++ shadow-4.0.18.1/lib/prototypes.h	2006-09-17 12:17:58.260039514 +0200
 @@ -130,8 +130,12 @@
  /* rlogin.c */
  extern int do_rlogin (const char *, char *, int, char *, int);
@@ -161,10 +161,10 @@
  
  /* setugid.c */
  extern int setup_groups (const struct passwd *);
-Index: shadow-4.0.17/libmisc/salt.c
+Index: shadow-4.0.18.1/libmisc/salt.c
 ===================================================================
---- shadow-4.0.17.orig/libmisc/salt.c	2006-07-11 22:54:04.000000000 +0200
-+++ shadow-4.0.17/libmisc/salt.c	2006-07-11 22:54:23.000000000 +0200
+--- shadow-4.0.18.1.orig/libmisc/salt.c	2005-08-31 19:24:58.000000000 +0200
++++ shadow-4.0.18.1/libmisc/salt.c	2006-09-17 12:17:58.260039514 +0200
 @@ -6,6 +6,7 @@
   */
  

Modified: trunk/debian/patches/504_undef_USE_PAM.nolibpam
===================================================================
--- trunk/debian/patches/504_undef_USE_PAM.nolibpam	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/504_undef_USE_PAM.nolibpam	2006-09-17 10:21:45 UTC (rev 1113)
@@ -1,7 +1,7 @@
-Index: shadow-4.0.18/src/Makefile.am
+Index: shadow-4.0.18.1/src/Makefile.am
 ===================================================================
---- 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
+--- shadow-4.0.18.1.orig/src/Makefile.am	2006-09-17 12:17:57.524033662 +0200
++++ shadow-4.0.18.1/src/Makefile.am	2006-09-17 12:17:59.228047210 +0200
 @@ -54,17 +54,17 @@
  		 $(top_builddir)/lib/libshadow.la
  AM_CPPFLAGS    = -DLOCALEDIR=\"$(datadir)/locale\"

Modified: trunk/debian/patches/506_relaxed_usernames
===================================================================
--- trunk/debian/patches/506_relaxed_usernames	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/506_relaxed_usernames	2006-09-17 10:21:45 UTC (rev 1113)
@@ -15,10 +15,10 @@
  than '-' as the leading character).  Thus, the maintenance tools don't
  anymore.  closes: #79682, #166798, #171179
 
-Index: shadow-4.0.16/libmisc/chkname.c
+Index: shadow-4.0.18.1/libmisc/chkname.c
 ===================================================================
---- shadow-4.0.16.orig/libmisc/chkname.c	2006-05-31 23:23:53.951456440 +0700
-+++ shadow-4.0.16/libmisc/chkname.c	2006-05-31 23:24:53.272438280 +0700
+--- shadow-4.0.18.1.orig/libmisc/chkname.c	2005-08-31 19:24:57.000000000 +0200
++++ shadow-4.0.18.1/libmisc/chkname.c	2006-09-17 12:17:59.836052044 +0200
 @@ -17,6 +17,7 @@
  #endif
  static int good_name (const char *name)
@@ -44,10 +44,10 @@
  
  	return 1;
  }
-Index: shadow-4.0.16/man/useradd.8.xml
+Index: shadow-4.0.18.1/man/useradd.8.xml
 ===================================================================
---- shadow-4.0.16.orig/man/useradd.8.xml	2006-05-31 23:23:53.994449904 +0700
-+++ shadow-4.0.16/man/useradd.8.xml	2006-05-31 23:24:53.274437976 +0700
+--- shadow-4.0.18.1.orig/man/useradd.8.xml	2006-07-24 07:48:36.000000000 +0200
++++ shadow-4.0.18.1/man/useradd.8.xml	2006-09-17 12:17:59.836052044 +0200
 @@ -172,6 +172,7 @@
  	    valid in conjunction with the <option>-m</option> option. The
  	    default is to not create the directory and to not copy any
@@ -56,7 +56,7 @@
  	  </para>
  	</listitem>
        </varlistentry>
-@@ -350,9 +351,13 @@
+@@ -353,9 +354,13 @@
      </para>
  
      <para>

Modified: trunk/debian/patches/507_32char_grnames.dpatch
===================================================================
--- trunk/debian/patches/507_32char_grnames.dpatch	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/507_32char_grnames.dpatch	2006-09-17 10:21:45 UTC (rev 1113)
@@ -31,10 +31,10 @@
 
 @DPATCH@
 
-Index: shadow-4.0.16/libmisc/chkname.c
+Index: shadow-4.0.18.1/libmisc/chkname.c
 ===================================================================
---- shadow-4.0.16.orig/libmisc/chkname.c	2006-05-31 23:24:53.272438280 +0700
-+++ shadow-4.0.16/libmisc/chkname.c	2006-05-31 23:24:54.271286432 +0700
+--- shadow-4.0.18.1.orig/libmisc/chkname.c	2006-09-17 12:17:59.836052044 +0200
++++ shadow-4.0.18.1/libmisc/chkname.c	2006-09-17 12:18:00.496057292 +0200
 @@ -66,10 +66,10 @@
  int check_group_name (const char *name)
  {

Modified: trunk/debian/patches/508_nologin_in_usr_sbin
===================================================================
--- trunk/debian/patches/508_nologin_in_usr_sbin	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/508_nologin_in_usr_sbin	2006-09-17 10:21:45 UTC (rev 1113)
@@ -1,7 +1,7 @@
-Index: shadow-4.0.17/src/Makefile.am
+Index: shadow-4.0.18.1/src/Makefile.am
 ===================================================================
---- shadow-4.0.17.orig/src/Makefile.am	2006-07-11 22:23:14.000000000 +0200
-+++ shadow-4.0.17/src/Makefile.am	2006-07-11 22:23:34.000000000 +0200
+--- shadow-4.0.18.1.orig/src/Makefile.am	2006-09-17 12:17:59.228047210 +0200
++++ shadow-4.0.18.1/src/Makefile.am	2006-09-17 12:18:13.284158968 +0200
 @@ -21,7 +21,6 @@
  # $prefix/bin and $prefix/sbin, no install-data hacks...)
  
@@ -10,7 +10,7 @@
  ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
  usbin_PROGRAMS = \
  	cppw \
-@@ -35,6 +34,7 @@
+@@ -36,6 +35,7 @@
  	grpunconv \
  	logoutd \
  	newusers \

Modified: trunk/debian/patches/523_su_arguments_are_concatenated
===================================================================
--- trunk/debian/patches/523_su_arguments_are_concatenated	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/523_su_arguments_are_concatenated	2006-09-17 10:21:45 UTC (rev 1113)
@@ -8,11 +8,11 @@
 Note: the fix of the man page is still missing.
       (to be taken from the trunk)
 
-Index: shadow-4.0.16/src/su.c
+Index: shadow-4.0.18.1/src/su.c
 ===================================================================
---- shadow-4.0.16.orig/src/su.c	2006-05-31 23:24:47.992240992 +0700
-+++ shadow-4.0.16/src/su.c	2006-05-31 23:25:04.184779352 +0700
-@@ -881,6 +881,35 @@
+--- shadow-4.0.18.1.orig/src/su.c	2006-09-17 12:17:56.308023993 +0200
++++ shadow-4.0.18.1/src/su.c	2006-09-17 12:18:07.008109068 +0200
+@@ -879,6 +879,35 @@
  			argv[0] = "-c";
  			argv[1] = command;
  		}

Modified: trunk/debian/patches/523_su_arguments_are_no_more_concatenated_by_default
===================================================================
--- trunk/debian/patches/523_su_arguments_are_no_more_concatenated_by_default	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/523_su_arguments_are_no_more_concatenated_by_default	2006-09-17 10:21:45 UTC (rev 1113)
@@ -8,10 +8,10 @@
 
 Status wrt upstream: This patch is Debian specific.
 
-Index: shadow-4.0.16/src/su.c
+Index: shadow-4.0.18.1/src/su.c
 ===================================================================
---- shadow-4.0.16.orig/src/su.c	2006-05-31 23:25:04.184779352 +0700
-+++ shadow-4.0.16/src/su.c	2006-05-31 23:25:05.180627960 +0700
+--- shadow-4.0.18.1.orig/src/su.c	2006-09-17 12:18:07.008109068 +0200
++++ shadow-4.0.18.1/src/su.c	2006-09-17 12:18:07.616113902 +0200
 @@ -76,6 +76,19 @@
  /* If nonzero, change some environment vars to indicate the user su'd to. */
  static int change_environment;
@@ -32,7 +32,7 @@
  #ifdef USE_PAM
  static pam_handle_t *pamh = NULL;
  static int caught = 0;
-@@ -322,6 +335,8 @@
+@@ -323,6 +336,8 @@
  #endif
  #endif				/* !USE_PAM */
  
@@ -41,7 +41,7 @@
  	/* sanitize_env (); */
  
  	setlocale (LC_ALL, "");
-@@ -885,7 +900,7 @@
+@@ -883,7 +898,7 @@
  		 * resulted string is always given to the shell with its
  		 * -c option.
  		 */

Modified: trunk/debian/patches/542_useradd-O_option
===================================================================
--- trunk/debian/patches/542_useradd-O_option	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/542_useradd-O_option	2006-09-17 10:21:45 UTC (rev 1113)
@@ -5,10 +5,10 @@
 Status wrt upstream: not included as this is just specific 
                      backward compatibility for Debian
 
-Index: shadow-4.0.16/man/useradd.8.xml
+Index: shadow-4.0.18.1/man/useradd.8.xml
 ===================================================================
---- shadow-4.0.16.orig/man/useradd.8.xml	2006-05-31 23:24:53.274437976 +0700
-+++ shadow-4.0.16/man/useradd.8.xml	2006-05-31 23:24:55.226141272 +0700
+--- shadow-4.0.18.1.orig/man/useradd.8.xml	2006-09-17 12:17:59.836052044 +0200
++++ shadow-4.0.18.1/man/useradd.8.xml	2006-09-17 12:18:01.136062380 +0200
 @@ -201,6 +201,11 @@
  	    <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
  	    doesn't work yet.
@@ -21,11 +21,11 @@
  	</listitem>
        </varlistentry>
        <varlistentry>
-Index: shadow-4.0.16/src/useradd.c
+Index: shadow-4.0.18.1/src/useradd.c
 ===================================================================
---- shadow-4.0.16.orig/src/useradd.c	2006-05-31 23:24:50.957790160 +0700
-+++ shadow-4.0.16/src/useradd.c	2006-05-31 23:24:55.230140664 +0700
-@@ -1017,7 +1017,7 @@
+--- shadow-4.0.18.1.orig/src/useradd.c	2006-09-17 12:17:58.252039450 +0200
++++ shadow-4.0.18.1/src/useradd.c	2006-09-17 12:18:01.140062412 +0200
+@@ -1023,7 +1023,7 @@
  			{NULL, 0, NULL, '\0'}
  		};
  		while ((c =
@@ -34,7 +34,7 @@
  				     long_options, NULL)) != -1) {
  			switch (c) {
  			case 'b':
-@@ -1136,6 +1136,7 @@
+@@ -1142,6 +1142,7 @@
  				kflg++;
  				break;
  			case 'K':

Modified: trunk/debian/patches/592_manpages_typos
===================================================================
--- trunk/debian/patches/592_manpages_typos	2006-09-17 09:58:48 UTC (rev 1112)
+++ trunk/debian/patches/592_manpages_typos	2006-09-17 10:21:45 UTC (rev 1113)
@@ -6,11 +6,11 @@
 
 It is probably a bug of docbook-xsl 1.68.1-0.1
 
-Index: shadow-4.0.16/man/passwd.1.xml
+Index: shadow-4.0.18.1/man/passwd.1.xml
 ===================================================================
---- shadow-4.0.16.orig/man/passwd.1.xml	2006-05-28 18:17:36.000000000 +0200
-+++ shadow-4.0.16/man/passwd.1.xml	2006-06-02 19:09:35.000000000 +0200
-@@ -85,8 +85,8 @@
+--- shadow-4.0.18.1.orig/man/passwd.1.xml	2006-07-24 07:48:36.000000000 +0200
++++ shadow-4.0.18.1/man/passwd.1.xml	2006-09-17 12:18:10.728138646 +0200
+@@ -87,8 +87,8 @@
        <title>Hints for user passwords</title>
        <para>
  	The security of a password depends upon the strength of the
@@ -21,10 +21,10 @@
  	NBS DES algorithm and is very secure. The size of the key space
  	depends upon the randomness of the password which is selected.
        </para>
-Index: shadow-4.0.16/man/useradd.8.xml
+Index: shadow-4.0.18.1/man/useradd.8.xml
 ===================================================================
---- shadow-4.0.16.orig/man/useradd.8.xml	2006-06-02 23:30:30.000000000 +0200
-+++ shadow-4.0.16/man/useradd.8.xml	2006-06-02 23:30:41.000000000 +0200
+--- shadow-4.0.18.1.orig/man/useradd.8.xml	2006-09-17 12:18:01.136062380 +0200
++++ shadow-4.0.18.1/man/useradd.8.xml	2006-09-17 12:18:10.728138646 +0200
 @@ -35,7 +35,7 @@
      <title>DESCRIPTION</title>
        <para>




More information about the Pkg-shadow-commits mailing list