[Pkg-shadow-commits] r564 - branches/4.0.13/debian/patches

Christian Perrier bubulle at costa.debian.org
Tue Oct 4 17:39:19 UTC 2005 

Author: bubulle
Date: 2005-10-04 17:39:17 +0000 (Tue, 04 Oct 2005)
New Revision: 564

Removed:
   branches/4.0.13/debian/patches/441_manpages-shadow.5
   branches/4.0.13/debian/patches/449_comment_missplaced
Modified:
   branches/4.0.13/debian/patches/004_configure.in.dpatch
   branches/4.0.13/debian/patches/005_manpages.dpatch
   branches/4.0.13/debian/patches/008_login_log_failure_in_FTMP
   branches/4.0.13/debian/patches/008_su_get_PAM_username
   branches/4.0.13/debian/patches/008_su_no_sanitize_env
   branches/4.0.13/debian/patches/333_shadow.5-typo_312430
   branches/4.0.13/debian/patches/401_cppw_src.dpatch
   branches/4.0.13/debian/patches/403_sg_symlink_162339_163652.dpatch
   branches/4.0.13/debian/patches/404_undef_USE_PAM.dpatch
   branches/4.0.13/debian/patches/405_subsystem_remove_*_in_shell.dpatch
   branches/4.0.13/debian/patches/406_good_name.dpatch
   branches/4.0.13/debian/patches/407_32char_grnames.dpatch
   branches/4.0.13/debian/patches/421_login.1_pishing
   branches/4.0.13/debian/patches/423_su_arguments_are_concatenated
   branches/4.0.13/debian/patches/424_pwck.8_quiet_option
   branches/4.0.13/debian/patches/426_grpck_group-gshadow_members_consistency
   branches/4.0.13/debian/patches/427_chage_expiry_0
   branches/4.0.13/debian/patches/428_grpck_add_prune_option
   branches/4.0.13/debian/patches/429_login_FAILLOG_ENAB
   branches/4.0.13/debian/patches/431_su_uid_0_not_root
   branches/4.0.13/debian/patches/432_login_cancel_timout_after_authentication
   branches/4.0.13/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
   branches/4.0.13/debian/patches/434_login_stop_checking_args_after--
   branches/4.0.13/debian/patches/435_su_addenv_HOME_and_SHELL
   branches/4.0.13/debian/patches/437_su_add_GNU_options_1
   branches/4.0.13/debian/patches/437_su_add_GNU_options_2
   branches/4.0.13/debian/patches/437_su_add_GNU_options_3
   branches/4.0.13/debian/patches/437_su_add_GNU_options_4
   branches/4.0.13/debian/patches/437_su_add_GNU_options_5
   branches/4.0.13/debian/patches/437_su_add_GNU_options_6
   branches/4.0.13/debian/patches/437_su_add_GNU_options_7
   branches/4.0.13/debian/patches/438_su_GNU_origin
   branches/4.0.13/debian/patches/439_su_PAM_session
   branches/4.0.13/debian/patches/440_manpages-login.1
   branches/4.0.13/debian/patches/442_useradd-O_option
   branches/4.0.13/debian/patches/445_su_password_expired
   branches/4.0.13/debian/patches/447_missing_login.defs_variables
   branches/4.0.13/debian/patches/448_enable_man
   branches/4.0.13/debian/patches/450_shadowconfig.8
   branches/4.0.13/debian/patches/451_login_PATH
   branches/4.0.13/debian/patches/series
Log:
Refresh all patches after a (successful) compile with upstream CVS
Two more patches removed because applied upstream


Modified: branches/4.0.13/debian/patches/004_configure.in.dpatch
===================================================================
--- branches/4.0.13/debian/patches/004_configure.in.dpatch	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/004_configure.in.dpatch	2005-10-04 17:39:17 UTC (rev 564)
@@ -1,8 +1,8 @@
 Index: shadow-4.0.13/configure.in
 ===================================================================
---- shadow-4.0.13.orig/configure.in	2005-10-02 10:38:49.103776076 +0200
-+++ shadow-4.0.13/configure.in	2005-10-02 10:39:32.239971404 +0200
-@@ -304,9 +304,10 @@
+--- shadow-4.0.13.orig/configure.in	2005-10-04 08:06:34.680490047 +0200
++++ shadow-4.0.13/configure.in	2005-10-04 08:07:11.639959261 +0200
+@@ -302,9 +302,10 @@
  	AC_CHECK_LIB(pam, pam_start,
  		[AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules])
  		LIBPAM="-lpam"

Modified: branches/4.0.13/debian/patches/005_manpages.dpatch
===================================================================
--- branches/4.0.13/debian/patches/005_manpages.dpatch	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/005_manpages.dpatch	2005-10-04 17:39:17 UTC (rev 564)
@@ -3,8 +3,8 @@
 
 Index: shadow-4.0.13/man/useradd.8.xml
 ===================================================================
---- shadow-4.0.13.orig/man/useradd.8.xml	2005-10-02 10:38:49.045787913 +0200
-+++ shadow-4.0.13/man/useradd.8.xml	2005-10-02 10:39:32.596898519 +0200
+--- shadow-4.0.13.orig/man/useradd.8.xml	2005-10-04 08:06:34.557515104 +0200
++++ shadow-4.0.13/man/useradd.8.xml	2005-10-04 08:07:12.327819105 +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

Modified: branches/4.0.13/debian/patches/008_login_log_failure_in_FTMP
===================================================================
--- branches/4.0.13/debian/patches/008_login_log_failure_in_FTMP	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/008_login_log_failure_in_FTMP	2005-10-04 17:39:17 UTC (rev 564)
@@ -6,8 +6,8 @@
 
 Index: shadow-4.0.13/src/login.c
 ===================================================================
---- shadow-4.0.13.orig/src/login.c	2005-10-02 10:39:39.134563557 +0200
-+++ shadow-4.0.13/src/login.c	2005-10-02 10:39:39.503488227 +0200
+--- shadow-4.0.13.orig/src/login.c	2005-10-04 08:07:24.390361293 +0200
++++ shadow-4.0.13/src/login.c	2005-10-04 08:07:25.132210138 +0200
 @@ -689,6 +689,20 @@
  			    break;
  			  
@@ -31,8 +31,8 @@
  			  pam_set_item(pamh,PAM_USER,NULL);
 Index: shadow-4.0.13/lib/getdef.c
 ===================================================================
---- shadow-4.0.13.orig/lib/getdef.c	2005-10-02 10:38:47.862029556 +0200
-+++ shadow-4.0.13/lib/getdef.c	2005-10-02 10:39:39.504488023 +0200
+--- shadow-4.0.13.orig/lib/getdef.c	2005-10-04 08:06:32.256983859 +0200
++++ shadow-4.0.13/lib/getdef.c	2005-10-04 08:07:25.133209934 +0200
 @@ -57,6 +57,7 @@
  	{"ERASECHAR", NULL},
  	{"FAIL_DELAY", NULL},

Modified: branches/4.0.13/debian/patches/008_su_get_PAM_username
===================================================================
--- branches/4.0.13/debian/patches/008_su_get_PAM_username	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/008_su_get_PAM_username	2005-10-04 17:39:17 UTC (rev 564)
@@ -7,8 +7,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:37.345928780 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:37.704855490 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:20.901072255 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:21.600929655 +0200
 @@ -350,6 +350,7 @@
  	char **envp = environ;
  	char *command = 0, *shell = 0, **additional_args = 0;

Modified: branches/4.0.13/debian/patches/008_su_no_sanitize_env
===================================================================
--- branches/4.0.13/debian/patches/008_su_no_sanitize_env	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/008_su_no_sanitize_env	2005-10-04 17:39:17 UTC (rev 564)
@@ -1,7 +1,7 @@
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:36.625075974 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:37.345928780 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:19.503357047 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:20.901072255 +0200
 @@ -364,7 +364,7 @@
  #endif
  #endif				/* !USE_PAM */

Modified: branches/4.0.13/debian/patches/333_shadow.5-typo_312430
===================================================================
--- branches/4.0.13/debian/patches/333_shadow.5-typo_312430	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/333_shadow.5-typo_312430	2005-10-04 17:39:17 UTC (rev 564)
@@ -5,14 +5,14 @@
 
 Index: shadow-4.0.13/man/shadow.5.xml
 ===================================================================
---- shadow-4.0.13.orig/man/shadow.5.xml	2005-10-02 10:39:32.956825021 +0200
-+++ shadow-4.0.13/man/shadow.5.xml	2005-10-02 10:39:40.988185070 +0200
-@@ -49,7 +49,7 @@
-     </itemizedlist>
+--- shadow-4.0.13.orig/man/shadow.5.xml	2005-10-04 08:06:31.734090404 +0200
++++ shadow-4.0.13/man/shadow.5.xml	2005-10-04 08:07:28.299564773 +0200
+@@ -51,7 +51,7 @@
  
-     <para>The password field must be filled. The encrypted password consists
--      of 13 to 24 characters from the 64 characters alphabet a thru z, A
+     <para>
+       The password field must be filled. The encrypted password consists of
+-      13 to 24 characters from the 64 characters alphabet a thru z, A thru
 +      of 13 to 24 characters from the 64 character alphabet a thru z, A
-       thru Z, 0 thru 9, \. and /. Optionally it can start with a "$"
-       character. This means the encrypted password was generated using
-       another (not DES) algorithm. For example if it starts with "$1$" it
+       Z, 0 thru 9, \. and /. Optionally it can start with a "$" character.
+       This means the encrypted password was generated using another (not
+       DES) algorithm. For example if it starts with "$1$" it means the

Modified: branches/4.0.13/debian/patches/401_cppw_src.dpatch
===================================================================
--- branches/4.0.13/debian/patches/401_cppw_src.dpatch	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/401_cppw_src.dpatch	2005-10-04 17:39:17 UTC (rev 564)
@@ -8,7 +8,7 @@
 Index: shadow-4.0.13/src/cppw.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.13/src/cppw.c	2005-10-02 10:39:41.346111987 +0200
++++ shadow-4.0.13/src/cppw.c	2005-10-04 08:07:29.005420951 +0200
 @@ -0,0 +1,200 @@
 +/*
 +  cppw, cpgr  copy with locking given file over the password or group file
@@ -212,8 +212,8 @@
 +}
 Index: shadow-4.0.13/src/Makefile.am
 ===================================================================
---- shadow-4.0.13.orig/src/Makefile.am	2005-10-02 10:38:46.606285897 +0200
-+++ shadow-4.0.13/src/Makefile.am	2005-10-02 10:39:41.346111987 +0200
+--- shadow-4.0.13.orig/src/Makefile.am	2005-10-04 08:06:31.607116276 +0200
++++ shadow-4.0.13/src/Makefile.am	2005-10-04 08:07:29.006420748 +0200
 @@ -23,6 +23,7 @@
  bin_PROGRAMS   = groups login su
  ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
@@ -224,8 +224,8 @@
  	groupdel \
 Index: shadow-4.0.13/po/POTFILES.in
 ===================================================================
---- shadow-4.0.13.orig/po/POTFILES.in	2005-10-02 10:38:46.606285897 +0200
-+++ shadow-4.0.13/po/POTFILES.in	2005-10-02 10:39:41.347111783 +0200
+--- shadow-4.0.13.orig/po/POTFILES.in	2005-10-04 08:06:31.608116072 +0200
++++ shadow-4.0.13/po/POTFILES.in	2005-10-04 08:07:29.007420544 +0200
 @@ -62,6 +62,7 @@
  src/chpasswd.c
  src/chsh.c

Modified: branches/4.0.13/debian/patches/403_sg_symlink_162339_163652.dpatch
===================================================================
--- branches/4.0.13/debian/patches/403_sg_symlink_162339_163652.dpatch	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/403_sg_symlink_162339_163652.dpatch	2005-10-04 17:39:17 UTC (rev 564)
@@ -14,8 +14,8 @@
 @DPATCH@
 Index: shadow-4.0.13/src/Makefile.am
 ===================================================================
---- shadow-4.0.13.orig/src/Makefile.am	2005-10-02 10:39:41.346111987 +0200
-+++ shadow-4.0.13/src/Makefile.am	2005-10-02 10:39:41.761027268 +0200
+--- shadow-4.0.13.orig/src/Makefile.am	2005-10-04 08:07:29.006420748 +0200
++++ shadow-4.0.13/src/Makefile.am	2005-10-04 08:07:29.804258184 +0200
 @@ -78,7 +78,6 @@
  
  install-am: all-am

Modified: branches/4.0.13/debian/patches/404_undef_USE_PAM.dpatch
===================================================================
--- branches/4.0.13/debian/patches/404_undef_USE_PAM.dpatch	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/404_undef_USE_PAM.dpatch	2005-10-04 17:39:17 UTC (rev 564)
@@ -8,8 +8,8 @@
 
 Index: shadow-4.0.13/src/chage.c
 ===================================================================
---- shadow-4.0.13.orig/src/chage.c	2005-10-02 10:38:46.270354473 +0200
-+++ shadow-4.0.13/src/chage.c	2005-10-02 10:39:42.129951939 +0200
+--- shadow-4.0.13.orig/src/chage.c	2005-10-04 08:06:31.341170465 +0200
++++ shadow-4.0.13/src/chage.c	2005-10-04 08:07:30.509114566 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -21,8 +21,8 @@
  #include <ctype.h>
 Index: shadow-4.0.13/src/chpasswd.c
 ===================================================================
---- shadow-4.0.13.orig/src/chpasswd.c	2005-10-02 10:38:46.271354269 +0200
-+++ shadow-4.0.13/src/chpasswd.c	2005-10-02 10:39:42.130951735 +0200
+--- shadow-4.0.13.orig/src/chpasswd.c	2005-10-04 08:06:31.342170261 +0200
++++ shadow-4.0.13/src/chpasswd.c	2005-10-04 08:07:30.510114363 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -34,8 +34,8 @@
  #include <fcntl.h>
 Index: shadow-4.0.13/src/groupadd.c
 ===================================================================
---- shadow-4.0.13.orig/src/groupadd.c	2005-10-02 10:38:46.271354269 +0200
-+++ shadow-4.0.13/src/groupadd.c	2005-10-02 10:39:42.131951531 +0200
+--- shadow-4.0.13.orig/src/groupadd.c	2005-10-04 08:06:31.342170261 +0200
++++ shadow-4.0.13/src/groupadd.c	2005-10-04 08:07:30.511114159 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -47,8 +47,8 @@
  #include <ctype.h>
 Index: shadow-4.0.13/src/groupdel.c
 ===================================================================
---- shadow-4.0.13.orig/src/groupdel.c	2005-10-02 10:38:46.271354269 +0200
-+++ shadow-4.0.13/src/groupdel.c	2005-10-02 10:39:42.132951327 +0200
+--- shadow-4.0.13.orig/src/groupdel.c	2005-10-04 08:06:31.343170057 +0200
++++ shadow-4.0.13/src/groupdel.c	2005-10-04 08:07:30.512113955 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -60,8 +60,8 @@
  #include <ctype.h>
 Index: shadow-4.0.13/src/groupmod.c
 ===================================================================
---- shadow-4.0.13.orig/src/groupmod.c	2005-10-02 10:38:46.272354065 +0200
-+++ shadow-4.0.13/src/groupmod.c	2005-10-02 10:39:42.133951123 +0200
+--- shadow-4.0.13.orig/src/groupmod.c	2005-10-04 08:06:31.343170057 +0200
++++ shadow-4.0.13/src/groupmod.c	2005-10-04 08:07:30.519112529 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -73,8 +73,8 @@
  #include <ctype.h>
 Index: shadow-4.0.13/src/newusers.c
 ===================================================================
---- shadow-4.0.13.orig/src/newusers.c	2005-10-02 10:38:46.272354065 +0200
-+++ shadow-4.0.13/src/newusers.c	2005-10-02 10:39:42.133951123 +0200
+--- shadow-4.0.13.orig/src/newusers.c	2005-10-04 08:06:31.344169854 +0200
++++ shadow-4.0.13/src/newusers.c	2005-10-04 08:07:30.520112326 +0200
 @@ -35,6 +35,8 @@
  
  #include <config.h>
@@ -86,8 +86,8 @@
  #include <sys/types.h>
 Index: shadow-4.0.13/src/useradd.c
 ===================================================================
---- shadow-4.0.13.orig/src/useradd.c	2005-10-02 10:38:46.272354065 +0200
-+++ shadow-4.0.13/src/useradd.c	2005-10-02 10:39:42.135950714 +0200
+--- shadow-4.0.13.orig/src/useradd.c	2005-10-04 08:06:31.345169650 +0200
++++ shadow-4.0.13/src/useradd.c	2005-10-04 08:07:30.523111714 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -99,21 +99,21 @@
  #include <ctype.h>
 Index: shadow-4.0.13/src/userdel.c
 ===================================================================
---- shadow-4.0.13.orig/src/userdel.c	2005-10-02 10:38:46.273353861 +0200
-+++ shadow-4.0.13/src/userdel.c	2005-10-02 10:39:42.136950510 +0200
+--- shadow-4.0.13.orig/src/userdel.c	2005-10-04 08:06:31.345169650 +0200
++++ shadow-4.0.13/src/userdel.c	2005-10-04 08:07:30.524111511 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
  
 +#undef USE_PAM
 +
- #ident "$Id: userdel.c,v 1.50 2005/09/07 15:00:45 kloczek Exp $"
+ #ident "$Id: userdel.c,v 1.51 2005/10/02 15:29:31 kloczek Exp $"
  
  #include <errno.h>
 Index: shadow-4.0.13/src/usermod.c
 ===================================================================
---- shadow-4.0.13.orig/src/usermod.c	2005-10-02 10:38:46.273353861 +0200
-+++ shadow-4.0.13/src/usermod.c	2005-10-02 10:39:42.138950102 +0200
+--- shadow-4.0.13.orig/src/usermod.c	2005-10-04 08:06:31.346169446 +0200
++++ shadow-4.0.13/src/usermod.c	2005-10-04 08:07:30.526111103 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>

Modified: branches/4.0.13/debian/patches/405_subsystem_remove_*_in_shell.dpatch
===================================================================
--- branches/4.0.13/debian/patches/405_subsystem_remove_*_in_shell.dpatch	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/405_subsystem_remove_*_in_shell.dpatch	2005-10-04 17:39:17 UTC (rev 564)
@@ -11,8 +11,8 @@
 @DPATCH@
 Index: shadow-4.0.13/lib/prototypes.h
 ===================================================================
---- shadow-4.0.13.orig/lib/prototypes.h	2005-10-02 10:38:46.183372229 +0200
-+++ shadow-4.0.13/lib/prototypes.h	2005-10-02 10:39:42.643847011 +0200
+--- shadow-4.0.13.orig/lib/prototypes.h	2005-10-04 08:06:31.175204282 +0200
++++ shadow-4.0.13/lib/prototypes.h	2005-10-04 08:07:31.522908001 +0200
 @@ -169,7 +169,7 @@
  extern void sulog (const char *, int, const char *, const char *);
  
@@ -24,8 +24,8 @@
  extern void ttytype (const char *);
 Index: shadow-4.0.13/libmisc/sub.c
 ===================================================================
---- shadow-4.0.13.orig/libmisc/sub.c	2005-10-02 10:38:46.184372025 +0200
-+++ shadow-4.0.13/libmisc/sub.c	2005-10-02 10:39:42.644846807 +0200
+--- shadow-4.0.13.orig/libmisc/sub.c	2005-10-04 08:06:31.175204282 +0200
++++ shadow-4.0.13/libmisc/sub.c	2005-10-04 08:07:31.522908001 +0200
 @@ -46,7 +46,7 @@
   *	directory will be used as the root of a new filesystem which
   *	the user is actually logged into.

Modified: branches/4.0.13/debian/patches/406_good_name.dpatch
===================================================================
--- branches/4.0.13/debian/patches/406_good_name.dpatch	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/406_good_name.dpatch	2005-10-04 17:39:17 UTC (rev 564)
@@ -36,8 +36,8 @@
 @DPATCH@
 Index: shadow-4.0.13/libmisc/chkname.c
 ===================================================================
---- shadow-4.0.13.orig/libmisc/chkname.c	2005-10-02 10:38:46.101388965 +0200
-+++ shadow-4.0.13/libmisc/chkname.c	2005-10-02 10:39:43.089755964 +0200
+--- shadow-4.0.13.orig/libmisc/chkname.c	2005-10-04 08:06:31.017236469 +0200
++++ shadow-4.0.13/libmisc/chkname.c	2005-10-04 08:07:32.351739123 +0200
 @@ -17,6 +17,7 @@
  #endif
  static int good_name (const char *name)

Modified: branches/4.0.13/debian/patches/407_32char_grnames.dpatch
===================================================================
--- branches/4.0.13/debian/patches/407_32char_grnames.dpatch	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/407_32char_grnames.dpatch	2005-10-04 17:39:17 UTC (rev 564)
@@ -33,8 +33,8 @@
 
 Index: shadow-4.0.13/libmisc/chkname.c
 ===================================================================
---- shadow-4.0.13.orig/libmisc/chkname.c	2005-10-02 10:39:43.089755964 +0200
-+++ shadow-4.0.13/libmisc/chkname.c	2005-10-02 10:39:43.444683494 +0200
+--- shadow-4.0.13.orig/libmisc/chkname.c	2005-10-04 08:07:32.351739123 +0200
++++ shadow-4.0.13/libmisc/chkname.c	2005-10-04 08:07:33.049596931 +0200
 @@ -66,10 +66,10 @@
  int check_group_name (const char *name)
  {

Modified: branches/4.0.13/debian/patches/421_login.1_pishing
===================================================================
--- branches/4.0.13/debian/patches/421_login.1_pishing	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/421_login.1_pishing	2005-10-04 17:39:17 UTC (rev 564)
@@ -5,9 +5,9 @@
 
 Index: shadow-4.0.13/man/login.1.xml
 ===================================================================
---- shadow-4.0.13.orig/man/login.1.xml	2005-10-02 10:39:33.308753157 +0200
-+++ shadow-4.0.13/man/login.1.xml	2005-10-02 10:39:43.805609800 +0200
-@@ -175,6 +175,14 @@
+--- shadow-4.0.13.orig/man/login.1.xml	2005-10-04 08:07:13.018678338 +0200
++++ shadow-4.0.13/man/login.1.xml	2005-10-04 08:07:33.744455350 +0200
+@@ -184,6 +184,14 @@
        will continue to appear to be logged in even after you log out of the
        "subsession".
      </para>

Modified: branches/4.0.13/debian/patches/423_su_arguments_are_concatenated
===================================================================
--- branches/4.0.13/debian/patches/423_su_arguments_are_concatenated	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/423_su_arguments_are_concatenated	2005-10-04 17:39:17 UTC (rev 564)
@@ -11,8 +11,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:40.622259788 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:44.169535494 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:27.298768690 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:34.443312955 +0200
 @@ -213,6 +213,8 @@
  	int status;
  	int ret;

Modified: branches/4.0.13/debian/patches/424_pwck.8_quiet_option
===================================================================
--- branches/4.0.13/debian/patches/424_pwck.8_quiet_option	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/424_pwck.8_quiet_option	2005-10-04 17:39:17 UTC (rev 564)
@@ -8,8 +8,8 @@
 
 Index: shadow-4.0.13/man/pwck.8.xml
 ===================================================================
---- shadow-4.0.13.orig/man/pwck.8.xml	2005-10-02 10:38:45.780454480 +0200
-+++ shadow-4.0.13/man/pwck.8.xml	2005-10-02 10:39:44.522463433 +0200
+--- shadow-4.0.13.orig/man/pwck.8.xml	2005-10-04 08:06:30.495342810 +0200
++++ shadow-4.0.13/man/pwck.8.xml	2005-10-04 08:07:35.150168930 +0200
 @@ -28,6 +28,7 @@
      </cmdsynopsis>
      <cmdsynopsis>
@@ -18,7 +18,7 @@
        <arg choice='opt'>-r </arg>
        <arg choice='opt'>
  	<arg choice='plain'>
-@@ -101,8 +102,8 @@
+@@ -104,8 +105,8 @@
  	</term>
  	<listitem>
  	  <para>

Modified: branches/4.0.13/debian/patches/426_grpck_group-gshadow_members_consistency
===================================================================
--- branches/4.0.13/debian/patches/426_grpck_group-gshadow_members_consistency	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/426_grpck_group-gshadow_members_consistency	2005-10-04 17:39:17 UTC (rev 564)
@@ -9,8 +9,8 @@
 
 Index: shadow-4.0.13/src/grpck.c
 ===================================================================
---- shadow-4.0.13.orig/src/grpck.c	2005-10-02 10:39:38.407711973 +0200
-+++ shadow-4.0.13/src/grpck.c	2005-10-02 10:39:44.891388106 +0200
+--- shadow-4.0.13.orig/src/grpck.c	2005-10-04 08:07:22.997645067 +0200
++++ shadow-4.0.13/src/grpck.c	2005-10-04 08:07:35.859024497 +0200
 @@ -136,7 +136,7 @@
  {
  	int arg;
@@ -195,8 +195,8 @@
  
 Index: shadow-4.0.13/src/pwck.c
 ===================================================================
---- shadow-4.0.13.orig/src/pwck.c	2005-10-02 10:38:45.719466929 +0200
-+++ shadow-4.0.13/src/pwck.c	2005-10-02 10:39:44.892387902 +0200
+--- shadow-4.0.13.orig/src/pwck.c	2005-10-04 08:06:30.360370312 +0200
++++ shadow-4.0.13/src/pwck.c	2005-10-04 08:07:35.861024090 +0200
 @@ -41,6 +41,7 @@
  #include "prototypes.h"
  #include "pwio.h"

Modified: branches/4.0.13/debian/patches/427_chage_expiry_0
===================================================================
--- branches/4.0.13/debian/patches/427_chage_expiry_0	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/427_chage_expiry_0	2005-10-04 17:39:17 UTC (rev 564)
@@ -5,8 +5,8 @@
 
 Index: shadow-4.0.13/src/chage.c
 ===================================================================
---- shadow-4.0.13.orig/src/chage.c	2005-10-02 10:39:42.129951939 +0200
-+++ shadow-4.0.13/src/chage.c	2005-10-02 10:39:45.274309922 +0200
+--- shadow-4.0.13.orig/src/chage.c	2005-10-04 08:07:30.509114566 +0200
++++ shadow-4.0.13/src/chage.c	2005-10-04 08:07:36.598873750 +0200
 @@ -235,8 +235,10 @@
  	 * was last modified. The date is the number of days since 1/1/1970.
  	 */

Modified: branches/4.0.13/debian/patches/428_grpck_add_prune_option
===================================================================
--- branches/4.0.13/debian/patches/428_grpck_add_prune_option	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/428_grpck_add_prune_option	2005-10-04 17:39:17 UTC (rev 564)
@@ -7,8 +7,8 @@
 
 Index: shadow-4.0.13/src/grpck.c
 ===================================================================
---- shadow-4.0.13.orig/src/grpck.c	2005-10-02 10:38:48.073986289 +0200
-+++ shadow-4.0.13/src/grpck.c	2005-10-02 10:39:38.407711973 +0200
+--- shadow-4.0.13.orig/src/grpck.c	2005-10-04 08:06:32.656902372 +0200
++++ shadow-4.0.13/src/grpck.c	2005-10-04 08:07:22.997645067 +0200
 @@ -138,6 +138,7 @@
  	int errors = 0;
  	int deleted = 0;

Modified: branches/4.0.13/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- branches/4.0.13/debian/patches/429_login_FAILLOG_ENAB	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/429_login_FAILLOG_ENAB	2005-10-04 17:39:17 UTC (rev 564)
@@ -9,8 +9,8 @@
 
 Index: shadow-4.0.13/src/login.c
 ===================================================================
---- shadow-4.0.13.orig/src/login.c	2005-10-02 10:39:39.503488227 +0200
-+++ shadow-4.0.13/src/login.c	2005-10-02 10:39:39.882410855 +0200
+--- shadow-4.0.13.orig/src/login.c	2005-10-04 08:07:25.132210138 +0200
++++ shadow-4.0.13/src/login.c	2005-10-04 08:07:25.859062038 +0200
 @@ -133,11 +133,11 @@
  static void setup_tty (void);
  static void check_flags (int, char *const *);
@@ -73,8 +73,8 @@
  			time_t ll_time = lastlog.ll_time;
 Index: shadow-4.0.13/lib/getdef.c
 ===================================================================
---- shadow-4.0.13.orig/lib/getdef.c	2005-10-02 10:39:39.504488023 +0200
-+++ shadow-4.0.13/lib/getdef.c	2005-10-02 10:39:39.883410651 +0200
+--- shadow-4.0.13.orig/lib/getdef.c	2005-10-04 08:07:25.133209934 +0200
++++ shadow-4.0.13/lib/getdef.c	2005-10-04 08:07:25.860061834 +0200
 @@ -56,6 +56,7 @@
  	{"ENV_SUPATH", NULL},
  	{"ERASECHAR", NULL},

Modified: branches/4.0.13/debian/patches/431_su_uid_0_not_root
===================================================================
--- branches/4.0.13/debian/patches/431_su_uid_0_not_root	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/431_su_uid_0_not_root	2005-10-04 17:39:17 UTC (rev 564)
@@ -8,8 +8,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:34.082595139 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:34.438522459 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:14.573361562 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:15.267220184 +0200
 @@ -373,7 +373,14 @@
  		argv++;		/* shift ... */
  	}

Modified: branches/4.0.13/debian/patches/432_login_cancel_timout_after_authentication
===================================================================
--- branches/4.0.13/debian/patches/432_login_cancel_timout_after_authentication	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/432_login_cancel_timout_after_authentication	2005-10-04 17:39:17 UTC (rev 564)
@@ -7,8 +7,8 @@
 
 Index: shadow-4.0.13/src/login.c
 ===================================================================
---- shadow-4.0.13.orig/src/login.c	2005-10-02 10:39:39.882410855 +0200
-+++ shadow-4.0.13/src/login.c	2005-10-02 10:39:40.265332667 +0200
+--- shadow-4.0.13.orig/src/login.c	2005-10-04 08:07:25.859062038 +0200
++++ shadow-4.0.13/src/login.c	2005-10-04 08:07:26.592912512 +0200
 @@ -720,6 +720,7 @@
  			}
  

Modified: branches/4.0.13/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
===================================================================
--- branches/4.0.13/debian/patches/433_login_more_LOG_UNKFAIL_ENAB	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/433_login_more_LOG_UNKFAIL_ENAB	2005-10-04 17:39:17 UTC (rev 564)
@@ -20,8 +20,8 @@
 
 Index: shadow-4.0.13/src/login.c
 ===================================================================
---- shadow-4.0.13.orig/src/login.c	2005-10-02 10:39:38.782635417 +0200
-+++ shadow-4.0.13/src/login.c	2005-10-02 10:39:39.134563557 +0200
+--- shadow-4.0.13.orig/src/login.c	2005-10-04 08:07:23.690503893 +0200
++++ shadow-4.0.13/src/login.c	2005-10-04 08:07:24.390361293 +0200
 @@ -633,47 +633,68 @@
  			 * pay attention to failure count and get rid of
  			 * MAX_LOGIN_TRIES?

Modified: branches/4.0.13/debian/patches/434_login_stop_checking_args_after--
===================================================================
--- branches/4.0.13/debian/patches/434_login_stop_checking_args_after--	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/434_login_stop_checking_args_after--	2005-10-04 17:39:17 UTC (rev 564)
@@ -5,8 +5,8 @@
 
 Index: shadow-4.0.13/src/login.c
 ===================================================================
---- shadow-4.0.13.orig/src/login.c	2005-10-02 10:38:48.012998738 +0200
-+++ shadow-4.0.13/src/login.c	2005-10-02 10:39:38.782635417 +0200
+--- shadow-4.0.13.orig/src/login.c	2005-10-04 08:06:32.527928651 +0200
++++ shadow-4.0.13/src/login.c	2005-10-04 08:07:23.690503893 +0200
 @@ -256,6 +256,8 @@
  	for (arg = 1; arg < argc; arg++) {
  		if (argv[arg][0] == '-' && strlen (argv[arg]) > 2)

Modified: branches/4.0.13/debian/patches/435_su_addenv_HOME_and_SHELL
===================================================================
--- branches/4.0.13/debian/patches/435_su_addenv_HOME_and_SHELL	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/435_su_addenv_HOME_and_SHELL	2005-10-04 17:39:17 UTC (rev 564)
@@ -5,8 +5,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:38:48.801837711 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:34.082595139 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:06:34.164595165 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:14.573361562 +0200
 @@ -668,8 +668,11 @@
  	if (fakelogin)
  		setup_env (&pwent);

Modified: branches/4.0.13/debian/patches/437_su_add_GNU_options_1
===================================================================
--- branches/4.0.13/debian/patches/437_su_add_GNU_options_1	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/437_su_add_GNU_options_1	2005-10-04 17:39:17 UTC (rev 564)
@@ -7,8 +7,8 @@
        * !doshell is broken (argv is not incremented)
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:34.438522459 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:34.804447738 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:15.267220184 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:15.966077788 +0200
 @@ -31,6 +31,7 @@
  
  #ident "$Id: su.c,v 1.45 2005/09/07 15:00:45 kloczek Exp $"

Modified: branches/4.0.13/debian/patches/437_su_add_GNU_options_2
===================================================================
--- branches/4.0.13/debian/patches/437_su_add_GNU_options_2	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/437_su_add_GNU_options_2	2005-10-04 17:39:17 UTC (rev 564)
@@ -9,8 +9,8 @@
        execute a shell when there is no additional arguments.
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:34.804447738 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:35.185369955 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:15.966077788 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:16.698928465 +0200
 @@ -127,6 +127,24 @@
  }
  #endif				/* !USE_PAM */

Modified: branches/4.0.13/debian/patches/437_su_add_GNU_options_3
===================================================================
--- branches/4.0.13/debian/patches/437_su_add_GNU_options_3	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/437_su_add_GNU_options_3	2005-10-04 17:39:17 UTC (rev 564)
@@ -4,8 +4,8 @@
        the environment, or if the user has a restricted shell.
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:35.185369955 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:35.549295643 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:16.698928465 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:17.407784032 +0200
 @@ -184,7 +184,10 @@
   * have been applied.  Some work was needed to get it integrated into
   * su.c from shadow.

Modified: branches/4.0.13/debian/patches/437_su_add_GNU_options_4
===================================================================
--- branches/4.0.13/debian/patches/437_su_add_GNU_options_4	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/437_su_add_GNU_options_4	2005-10-04 17:39:17 UTC (rev 564)
@@ -13,8 +13,8 @@
         restricted)
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:35.549295643 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:35.907222555 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:17.407784032 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:18.106641636 +0200
 @@ -207,14 +207,14 @@
  
  		shell_basename = getdef_str ("SU_NAME");

Modified: branches/4.0.13/debian/patches/437_su_add_GNU_options_5
===================================================================
--- branches/4.0.13/debian/patches/437_su_add_GNU_options_5	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/437_su_add_GNU_options_5	2005-10-04 17:39:17 UTC (rev 564)
@@ -4,8 +4,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:35.907222555 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:36.261150285 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:18.106641636 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:18.807498832 +0200
 @@ -232,6 +232,13 @@
  
  #ifndef USE_PAM

Modified: branches/4.0.13/debian/patches/437_su_add_GNU_options_6
===================================================================
--- branches/4.0.13/debian/patches/437_su_add_GNU_options_6	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/437_su_add_GNU_options_6	2005-10-04 17:39:17 UTC (rev 564)
@@ -2,8 +2,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:36.261150285 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:36.625075974 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:18.807498832 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:19.503357047 +0200
 @@ -610,7 +610,7 @@
  	/*
  	 * Set the default shell.

Modified: branches/4.0.13/debian/patches/437_su_add_GNU_options_7
===================================================================
--- branches/4.0.13/debian/patches/437_su_add_GNU_options_7	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/437_su_add_GNU_options_7	2005-10-04 17:39:17 UTC (rev 564)
@@ -2,8 +2,8 @@
 
 Index: shadow-4.0.13/man/su.1.xml
 ===================================================================
---- shadow-4.0.13.orig/man/su.1.xml	2005-10-02 10:38:48.319936083 +0200
-+++ shadow-4.0.13/man/su.1.xml	2005-10-02 10:39:36.997999825 +0200
+--- shadow-4.0.13.orig/man/su.1.xml	2005-10-04 08:06:33.161799494 +0200
++++ shadow-4.0.13/man/su.1.xml	2005-10-04 08:07:20.207213632 +0200
 @@ -15,6 +15,7 @@
    <refsynopsisdiv id='synopsis'>
      <cmdsynopsis>
@@ -12,13 +12,14 @@
        <arg choice='opt'>- </arg>
        <arg choice='opt'>
  	<arg choice='plain'>
-@@ -36,21 +37,24 @@
+@@ -37,24 +38,24 @@
        expect had the user logged in directly.
      </para>
  
--    <para>Additional arguments may be provided after the username, in which
--      case they are supplied to the user&acute;s login shell. In particular,
--      an argument of <option>-c</option> will cause the next argument to be
+-    <para>
+-      Additional arguments may be provided after the username, in which case
+-      they are supplied to the user&acute;s login shell. In particular, an
+-      argument of <option>-c</option> will cause the next argument to be
 -      treated as a command by most command interpreters. The command will be
 -      executed by the shell specified in <filename>/etc/passwd</filename>
 -      for the target user.
@@ -29,8 +30,6 @@
        invalid, are logged to detect abuses of the system.
      </para>
  
--    <para>The current environment is passed to the new shell. The value of
--      <emphasis remap='B'>$PATH</emphasis> is reset to
 +    <para>An optional command can be executed. This is done by the shell
 +      specified in <filename>/etc/passwd</filename> for the target user
 +      unless the <option>-s</option> or <option>-m</option>
@@ -40,14 +39,17 @@
 +      command to be passed to it).
 +    </para>
 +
-+    <para>
+     <para>
+-      The current environment is passed to the new shell. The value of
+-      <emphasis>$PATH</emphasis> is reset to
+-      <filename>/bin:/usr/bin</filename> for normal users, or
 +      Unless the <option>-m</option> or <option>-p</option> options are used,
 +      the current environment is passed to the new shell with alterations.
 +      The value of <emphasis remap='B'>$PATH</emphasis> is reset to
-       <filename>/bin:/usr/bin</filename> for normal users, or
-       <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the super user.
-       This may be changed with the <emphasis remap='B'>ENV_PATH</emphasis>
-@@ -88,6 +92,14 @@
+       <filename>/sbin:/bin:/usr/sbin:/usr/bin</filename> for the super user. 
+       This may be changed with the <emphasis>ENV_PATH</emphasis> and
+       <emphasis>ENV_SUPATH</emphasis> definitions in
+@@ -91,6 +92,14 @@
  	  <para>secure user account information</para>
  	</listitem>
        </varlistentry>

Modified: branches/4.0.13/debian/patches/438_su_GNU_origin
===================================================================
--- branches/4.0.13/debian/patches/438_su_GNU_origin	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/438_su_GNU_origin	2005-10-04 17:39:17 UTC (rev 564)
@@ -6,8 +6,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:38.052784446 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:40.622259788 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:22.296787870 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:27.298768690 +0200
 @@ -26,6 +26,24 @@
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.

Modified: branches/4.0.13/debian/patches/439_su_PAM_session
===================================================================
--- branches/4.0.13/debian/patches/439_su_PAM_session	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/439_su_PAM_session	2005-10-04 17:39:17 UTC (rev 564)
@@ -7,8 +7,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:37.704855490 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:38.052784446 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:21.600929655 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:22.296787870 +0200
 @@ -777,6 +777,7 @@
  		SYSLOG ((LOG_ERR, "pam_open_session: %s",
  			 pam_strerror (pamh, ret)));

Modified: branches/4.0.13/debian/patches/440_manpages-login.1
===================================================================
--- branches/4.0.13/debian/patches/440_manpages-login.1	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/440_manpages-login.1	2005-10-04 17:39:17 UTC (rev 564)
@@ -8,9 +8,9 @@
 
 Index: shadow-4.0.13/man/login.1.xml
 ===================================================================
---- shadow-4.0.13.orig/man/login.1.xml	2005-10-02 10:38:48.929811587 +0200
-+++ shadow-4.0.13/man/login.1.xml	2005-10-02 10:39:33.308753157 +0200
-@@ -163,6 +163,18 @@
+--- shadow-4.0.13.orig/man/login.1.xml	2005-10-04 08:06:34.433540365 +0200
++++ shadow-4.0.13/man/login.1.xml	2005-10-04 08:07:13.018678338 +0200
+@@ -172,6 +172,18 @@
      <para>The location of files is subject to differences in system
        configuration.
      </para>

Deleted: branches/4.0.13/debian/patches/441_manpages-shadow.5
===================================================================
--- branches/4.0.13/debian/patches/441_manpages-shadow.5	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/441_manpages-shadow.5	2005-10-04 17:39:17 UTC (rev 564)
@@ -1,28 +0,0 @@
-Goal: better document "!" and "*" fields in /etc/shadow
-Fixes: some old bug in Debian..:-)
-
-Status wrt upstream: Forwarded but not applied yet
-
-Index: shadow-4.0.13/man/shadow.5.xml
-===================================================================
---- shadow-4.0.13.orig/man/shadow.5.xml	2005-10-02 10:38:48.988799546 +0200
-+++ shadow-4.0.13/man/shadow.5.xml	2005-10-02 10:39:32.956825021 +0200
-@@ -64,6 +64,18 @@
-       for details on how this string is interpreted.
-     </para>
- 
-+    <para>If the password field contains some string that is not valid result
-+      of
-+      <citerefentry>
-+        <refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum>
-+      </citerefentry>,
-+      for instance ! or *, the user will not be able to use
-+      a unix password to log in, subject to
-+      <citerefentry>
-+        <refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum>
-+      </citerefentry>.
-+    </para>
-+
-     <para>The date of the last password change is given as the number of
-       days since Jan 1, 1970. The password may not be changed again until
-       the proper number of days have passed, and must be changed after the

Modified: branches/4.0.13/debian/patches/442_useradd-O_option
===================================================================
--- branches/4.0.13/debian/patches/442_useradd-O_option	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/442_useradd-O_option	2005-10-04 17:39:17 UTC (rev 564)
@@ -4,9 +4,9 @@
 
 Index: shadow-4.0.13/man/useradd.8.xml
 ===================================================================
---- shadow-4.0.13.orig/man/useradd.8.xml	2005-10-02 10:39:32.596898519 +0200
-+++ shadow-4.0.13/man/useradd.8.xml	2005-10-02 10:39:45.647233779 +0200
-@@ -199,6 +199,11 @@
+--- shadow-4.0.13.orig/man/useradd.8.xml	2005-10-04 08:07:12.327819105 +0200
++++ shadow-4.0.13/man/useradd.8.xml	2005-10-04 08:07:37.300730743 +0200
+@@ -201,6 +201,11 @@
  	    <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
  	    doesn't work yet.
  	  </para>
@@ -20,8 +20,8 @@
        <varlistentry>
 Index: shadow-4.0.13/src/useradd.c
 ===================================================================
---- shadow-4.0.13.orig/src/useradd.c	2005-10-02 10:39:42.135950714 +0200
-+++ shadow-4.0.13/src/useradd.c	2005-10-02 10:39:45.649233371 +0200
+--- shadow-4.0.13.orig/src/useradd.c	2005-10-04 08:07:30.523111714 +0200
++++ shadow-4.0.13/src/useradd.c	2005-10-04 08:07:37.302730336 +0200
 @@ -950,7 +950,7 @@
  			{NULL, 0, NULL, '\0'}
  		};

Modified: branches/4.0.13/debian/patches/445_su_password_expired
===================================================================
--- branches/4.0.13/debian/patches/445_su_password_expired	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/445_su_password_expired	2005-10-04 17:39:17 UTC (rev 564)
@@ -9,8 +9,8 @@
 
 Index: shadow-4.0.13/src/su.c
 ===================================================================
---- shadow-4.0.13.orig/src/su.c	2005-10-02 10:39:44.169535494 +0200
-+++ shadow-4.0.13/src/su.c	2005-10-02 10:39:46.388082515 +0200
+--- shadow-4.0.13.orig/src/su.c	2005-10-04 08:07:34.443312955 +0200
++++ shadow-4.0.13/src/su.c	2005-10-04 08:07:38.039580199 +0200
 @@ -702,6 +702,16 @@
  		if (amroot) {
  			fprintf (stderr, _("%s: %s\n(Ignored)\n"), Prog,

Modified: branches/4.0.13/debian/patches/447_missing_login.defs_variables
===================================================================
--- branches/4.0.13/debian/patches/447_missing_login.defs_variables	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/447_missing_login.defs_variables	2005-10-04 17:39:17 UTC (rev 564)
@@ -9,8 +9,8 @@
 
 Index: shadow-4.0.13/lib/getdef.c
 ===================================================================
---- shadow-4.0.13.orig/lib/getdef.c	2005-10-02 10:39:39.883410651 +0200
-+++ shadow-4.0.13/lib/getdef.c	2005-10-02 10:39:46.752008211 +0200
+--- shadow-4.0.13.orig/lib/getdef.c	2005-10-04 08:07:25.860061834 +0200
++++ shadow-4.0.13/lib/getdef.c	2005-10-04 08:07:38.742436989 +0200
 @@ -69,6 +69,8 @@
  	{"LOG_OK_LOGINS", NULL},
  	{"LOG_UNKFAIL_ENAB", NULL},

Modified: branches/4.0.13/debian/patches/448_enable_man
===================================================================
--- branches/4.0.13/debian/patches/448_enable_man	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/448_enable_man	2005-10-04 17:39:17 UTC (rev 564)
@@ -12,9 +12,9 @@
 
 Index: shadow-4.0.13/configure.in
 ===================================================================
---- shadow-4.0.13.orig/configure.in	2005-10-02 10:39:32.239971404 +0200
-+++ shadow-4.0.13/configure.in	2005-10-02 10:39:47.114934110 +0200
-@@ -265,6 +265,23 @@
+--- shadow-4.0.13.orig/configure.in	2005-10-04 08:07:11.639959261 +0200
++++ shadow-4.0.13/configure.in	2005-10-04 08:07:39.450292761 +0200
+@@ -263,6 +263,23 @@
  fi
  AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
  

Deleted: branches/4.0.13/debian/patches/449_comment_missplaced
===================================================================
--- branches/4.0.13/debian/patches/449_comment_missplaced	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/449_comment_missplaced	2005-10-04 17:39:17 UTC (rev 564)
@@ -1,29 +0,0 @@
-Goal: During the changes on libmisc/setupenv.c, a piece of code was moved
-without its comment. This comment is now at the wrong place.
-
-Status wrt to upstream: 
-
-Index: shadow-4.0.13/libmisc/setupenv.c
-===================================================================
---- shadow-4.0.13.orig/libmisc/setupenv.c	2005-10-02 10:38:45.520507545 +0200
-+++ shadow-4.0.13/libmisc/setupenv.c	2005-10-02 10:39:46.034154779 +0200
-@@ -234,9 +234,6 @@
- 
- 	addenv ("SHELL", info->pw_shell);
- 
--	/*
--	 * Create the PATH environmental variable and export it.
--	 */
- 
- 	/*
- 	 * Export the user name.  For BSD derived systems, it's "USER", for
-@@ -247,6 +244,9 @@
- 	addenv ("LOGNAME", info->pw_name);
- 
- #ifndef USE_PAM
-+	/*
-+	 * Create the PATH environmental variable and export it.
-+	 */
- 	cp = getdef_str ((info->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
- 
- 	if (!cp) {

Modified: branches/4.0.13/debian/patches/450_shadowconfig.8
===================================================================
--- branches/4.0.13/debian/patches/450_shadowconfig.8	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/450_shadowconfig.8	2005-10-04 17:39:17 UTC (rev 564)
@@ -6,7 +6,7 @@
 Index: shadow-4.0.13/man/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.13/man/shadowconfig.8	2005-10-02 10:39:33.670679252 +0200
++++ shadow-4.0.13/man/shadowconfig.8	2005-10-04 08:07:13.711537164 +0200
 @@ -0,0 +1,41 @@
 +.\"Generated by db2man.xsl. Don't modify this, modify the source.
 +.de Sh \" Subsection
@@ -52,7 +52,7 @@
 Index: shadow-4.0.13/man/shadowconfig.8.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.13/man/shadowconfig.8.xml	2005-10-02 10:39:33.671679048 +0200
++++ shadow-4.0.13/man/shadowconfig.8.xml	2005-10-04 08:07:13.712536961 +0200
 @@ -0,0 +1,52 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -109,7 +109,7 @@
 Index: shadow-4.0.13/man/fr/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.13/man/fr/shadowconfig.8	2005-10-02 10:39:33.672678844 +0200
++++ shadow-4.0.13/man/fr/shadowconfig.8	2005-10-04 08:07:13.713536757 +0200
 @@ -0,0 +1,26 @@
 +.\" This file was generated with po4a. Translate the source file.
 +.\" 
@@ -140,7 +140,7 @@
 Index: shadow-4.0.13/man/ja/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.13/man/ja/shadowconfig.8	2005-10-02 10:39:33.672678844 +0200
++++ shadow-4.0.13/man/ja/shadowconfig.8	2005-10-04 08:07:13.714536553 +0200
 @@ -0,0 +1,25 @@
 +.\"     all right reserved,
 +.\" Translated Tue Oct 30 11:59:11 JST 2001
@@ -170,7 +170,7 @@
 Index: shadow-4.0.13/man/pl/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.13/man/pl/shadowconfig.8	2005-10-02 10:39:33.673678640 +0200
++++ shadow-4.0.13/man/pl/shadowconfig.8	2005-10-04 08:07:13.715536349 +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: branches/4.0.13/debian/patches/451_login_PATH
===================================================================
--- branches/4.0.13/debian/patches/451_login_PATH	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/451_login_PATH	2005-10-04 17:39:17 UTC (rev 564)
@@ -6,9 +6,9 @@
 
 Index: shadow-4.0.13/libmisc/setupenv.c
 ===================================================================
---- shadow-4.0.13.orig/libmisc/setupenv.c	2005-10-02 10:39:46.034154779 +0200
-+++ shadow-4.0.13/libmisc/setupenv.c	2005-10-02 10:39:47.479859602 +0200
-@@ -243,7 +243,6 @@
+--- shadow-4.0.13.orig/libmisc/setupenv.c	2005-10-04 08:06:29.498545917 +0200
++++ shadow-4.0.13/libmisc/setupenv.c	2005-10-04 08:07:40.148150569 +0200
+@@ -242,7 +242,6 @@
  	addenv ("USER", info->pw_name);
  	addenv ("LOGNAME", info->pw_name);
  

Modified: branches/4.0.13/debian/patches/series
===================================================================
--- branches/4.0.13/debian/patches/series	2005-10-04 07:27:35 UTC (rev 563)
+++ branches/4.0.13/debian/patches/series	2005-10-04 17:39:17 UTC (rev 564)
@@ -1,6 +1,5 @@
 004_configure.in.dpatch
 005_manpages.dpatch
-441_manpages-shadow.5
 440_manpages-login.1
 450_shadowconfig.8
 435_su_addenv_HOME_and_SHELL
@@ -51,7 +50,6 @@
 426_grpck_group-gshadow_members_consistency
 427_chage_expiry_0
 442_useradd-O_option
-449_comment_missplaced
 445_su_password_expired
 447_missing_login.defs_variables
 448_enable_man

More information about the Pkg-shadow-commits mailing list