[Pkg-shadow-commits] r465 - branches/experimental/debian/patches

Christian Perrier bubulle at costa.debian.org
Wed Aug 17 09:52:41 UTC 2005 

Author: bubulle
Date: 2005-08-17 09:52:40 +0000 (Wed, 17 Aug 2005)
New Revision: 465

Modified:
   branches/experimental/debian/patches/004_configure.in.dpatch
   branches/experimental/debian/patches/005_manpages.dpatch
   branches/experimental/debian/patches/008_login_log_failure_in_FTMP
   branches/experimental/debian/patches/008_su_get_PAM_username
   branches/experimental/debian/patches/008_su_no_sanitize_env
   branches/experimental/debian/patches/010_more-i18ned-messages
   branches/experimental/debian/patches/333_shadow.5-typo_312430
   branches/experimental/debian/patches/345_shadowconfig.8
   branches/experimental/debian/patches/357_newgrp-stop_cont-proxy
   branches/experimental/debian/patches/362_warning_messages
   branches/experimental/debian/patches/401_cppw_src.dpatch
   branches/experimental/debian/patches/403_sg_symlink_162339_163652.dpatch
   branches/experimental/debian/patches/404_undef_USE_PAM.dpatch
   branches/experimental/debian/patches/405_subsystem_remove_*_in_shell.dpatch
   branches/experimental/debian/patches/406_good_name.dpatch
   branches/experimental/debian/patches/407_32char_grnames.dpatch
   branches/experimental/debian/patches/421_login.1_pishing
   branches/experimental/debian/patches/423_su_arguments_are_concatenated
   branches/experimental/debian/patches/424_pwck.8_quiet_option
   branches/experimental/debian/patches/426_grpck_group-gshadow_members_consistency
   branches/experimental/debian/patches/427_chage_expiry_0
   branches/experimental/debian/patches/428_grpck_add_prune_option
   branches/experimental/debian/patches/429_login_FAILLOG_ENAB
   branches/experimental/debian/patches/431_su_uid_0_not_root
   branches/experimental/debian/patches/432_login_cancel_timout_after_authentication
   branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
   branches/experimental/debian/patches/434_login_stop_checking_args_after--
   branches/experimental/debian/patches/435_su_addenv_HOME_and_SHELL
   branches/experimental/debian/patches/437_su_add_GNU_options_1
   branches/experimental/debian/patches/437_su_add_GNU_options_2
   branches/experimental/debian/patches/437_su_add_GNU_options_3
   branches/experimental/debian/patches/437_su_add_GNU_options_4
   branches/experimental/debian/patches/437_su_add_GNU_options_5
   branches/experimental/debian/patches/437_su_add_GNU_options_6
   branches/experimental/debian/patches/438_su_GNU_origin
   branches/experimental/debian/patches/439_su_PAM_session
   branches/experimental/debian/patches/440_manpages-login.1
   branches/experimental/debian/patches/441_manpages-shadow.5
   branches/experimental/debian/patches/442_useradd-O_option
   branches/experimental/debian/patches/443_chage_exit_values
   branches/experimental/debian/patches/445_su_password_expired
   branches/experimental/debian/patches/999_hack_build_package
Log:
Refresh all patches so that they apply without offsets
(let's be ultra-clean..:-))


Modified: branches/experimental/debian/patches/004_configure.in.dpatch
===================================================================
--- branches/experimental/debian/patches/004_configure.in.dpatch	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/004_configure.in.dpatch	2005-08-17 09:52:40 UTC (rev 465)
@@ -1,8 +1,8 @@
-Index: shadow-4.0.9/configure.in
+Index: shadow-4.0.12/configure.in
 ===================================================================
---- shadow-4.0.9.orig/configure.in	2005-04-26 02:58:53.000000000 +0200
-+++ shadow-4.0.9/configure.in	2005-06-11 18:18:44.326481454 +0200
-@@ -237,9 +237,10 @@ if test "$with_libpam" = "yes"; then
+--- shadow-4.0.12.orig/configure.in	2005-08-17 11:49:50.000000000 +0200
++++ shadow-4.0.12/configure.in	2005-08-17 11:50:32.000000000 +0200
+@@ -255,9 +255,10 @@
  	AC_CHECK_LIB(pam, pam_start,
  		[AC_DEFINE(USE_PAM, 1, [Define to support Pluggable Authentication Modules])
  		LIBPAM="-lpam"

Modified: branches/experimental/debian/patches/005_manpages.dpatch
===================================================================
--- branches/experimental/debian/patches/005_manpages.dpatch	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/005_manpages.dpatch	2005-08-17 09:52:40 UTC (rev 465)
@@ -1,11 +1,11 @@
 Note: * The small useradd.8.xml change seems to be the only one
         not applied upstream
 
-Index: shadow-4.0.10/man/useradd.8.xml
+Index: shadow-4.0.12/man/useradd.8.xml
 ===================================================================
---- shadow-4.0.10.orig/man/useradd.8.xml	2005-06-16 20:58:43.000000000 +0200
-+++ shadow-4.0.10/man/useradd.8.xml	2005-07-04 17:02:30.000000000 +0200
-@@ -181,6 +181,7 @@
+--- shadow-4.0.12.orig/man/useradd.8.xml	2005-08-17 11:49:22.000000000 +0200
++++ shadow-4.0.12/man/useradd.8.xml	2005-08-17 11:50:33.000000000 +0200
+@@ -169,6 +169,7 @@
              <option>-k</option> option is only valid in conjunction with the
              <option>-m</option> option. The default is to not create the
              directory and to not copy any files.

Modified: branches/experimental/debian/patches/008_login_log_failure_in_FTMP
===================================================================
--- branches/experimental/debian/patches/008_login_log_failure_in_FTMP	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/008_login_log_failure_in_FTMP	2005-08-17 09:52:40 UTC (rev 465)
@@ -6,8 +6,8 @@
 
 Index: shadow-4.0.12/src/login.c
 ===================================================================
---- shadow-4.0.12.orig/src/login.c	2005-08-17 10:19:58.000000000 +0200
-+++ shadow-4.0.12/src/login.c	2005-08-17 10:21:20.000000000 +0200
+--- shadow-4.0.12.orig/src/login.c	2005-08-17 11:50:52.000000000 +0200
++++ shadow-4.0.12/src/login.c	2005-08-17 11:50:54.000000000 +0200
 @@ -705,6 +705,20 @@
  			    break;
  			  
@@ -31,8 +31,8 @@
  			  pam_set_item(pamh,PAM_USER,NULL);
 Index: shadow-4.0.12/lib/getdef.c
 ===================================================================
---- shadow-4.0.12.orig/lib/getdef.c	2005-08-11 13:26:11.000000000 +0200
-+++ shadow-4.0.12/lib/getdef.c	2005-08-17 10:21:20.000000000 +0200
+--- shadow-4.0.12.orig/lib/getdef.c	2005-08-17 11:49:18.000000000 +0200
++++ shadow-4.0.12/lib/getdef.c	2005-08-17 11:50:54.000000000 +0200
 @@ -88,7 +88,6 @@
  	{"ENV_TZ", NULL},
  	{"ENVIRON_FILE", NULL},

Modified: branches/experimental/debian/patches/008_su_get_PAM_username
===================================================================
--- branches/experimental/debian/patches/008_su_get_PAM_username	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/008_su_get_PAM_username	2005-08-17 09:52:40 UTC (rev 465)
@@ -5,11 +5,11 @@
    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.10/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.10.orig/src/su.c	2005-07-22 01:27:30.000000000 +0200
-+++ shadow-4.0.10/src/su.c	2005-07-22 01:28:40.000000000 +0200
-@@ -347,6 +347,7 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:47.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:48.000000000 +0200
+@@ -352,6 +352,7 @@
  	char **envp = environ;
  	char *command = 0, *shell = 0, **additional_args = 0;
  	int optc;
@@ -17,7 +17,7 @@
  
  #ifdef USE_PAM
  	int ret;
-@@ -659,6 +660,14 @@
+@@ -646,6 +647,14 @@
  			su_failure (tty);
  		}
  	}

Modified: branches/experimental/debian/patches/008_su_no_sanitize_env
===================================================================
--- branches/experimental/debian/patches/008_su_no_sanitize_env	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/008_su_no_sanitize_env	2005-08-17 09:52:40 UTC (rev 465)
@@ -1,8 +1,8 @@
-Index: shadow-4.0.3/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.3.orig/src/su.c	2005-05-29 23:33:33.107531000 +0200
-+++ shadow-4.0.3/src/su.c	2005-05-29 23:34:27.117531000 +0200
-@@ -278,7 +278,7 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:46.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:47.000000000 +0200
+@@ -366,7 +366,7 @@
  #endif
  #endif				/* !USE_PAM */
  

Modified: branches/experimental/debian/patches/010_more-i18ned-messages
===================================================================
--- branches/experimental/debian/patches/010_more-i18ned-messages	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/010_more-i18ned-messages	2005-08-17 09:52:40 UTC (rev 465)
@@ -7,8 +7,8 @@
 
 Index: shadow-4.0.12/libmisc/obscure.c
 ===================================================================
---- shadow-4.0.12.orig/libmisc/obscure.c	2005-05-25 21:31:44.000000000 +0200
-+++ shadow-4.0.12/libmisc/obscure.c	2005-08-17 11:12:06.000000000 +0200
+--- shadow-4.0.12.orig/libmisc/obscure.c	2005-08-17 11:49:14.000000000 +0200
++++ shadow-4.0.12/libmisc/obscure.c	2005-08-17 11:51:09.000000000 +0200
 @@ -158,7 +158,7 @@
  #endif
  
@@ -54,8 +54,8 @@
  	 * Remaining checks are optional.
 Index: shadow-4.0.12/libmisc/utmp.c
 ===================================================================
---- shadow-4.0.12.orig/libmisc/utmp.c	2005-07-06 17:29:58.000000000 +0200
-+++ shadow-4.0.12/libmisc/utmp.c	2005-08-17 11:12:06.000000000 +0200
+--- shadow-4.0.12.orig/libmisc/utmp.c	2005-08-17 11:49:14.000000000 +0200
++++ shadow-4.0.12/libmisc/utmp.c	2005-08-17 11:51:09.000000000 +0200
 @@ -53,9 +53,9 @@
  extern void endutent ();
  
@@ -70,8 +70,8 @@
   * checkutmp - see if utmp file is correct for this process
 Index: shadow-4.0.12/src/login.c
 ===================================================================
---- shadow-4.0.12.orig/src/login.c	2005-08-17 10:24:47.000000000 +0200
-+++ shadow-4.0.12/src/login.c	2005-08-17 11:13:15.000000000 +0200
+--- shadow-4.0.12.orig/src/login.c	2005-08-17 11:50:56.000000000 +0200
++++ shadow-4.0.12/src/login.c	2005-08-17 11:51:09.000000000 +0200
 @@ -595,7 +595,7 @@
  		retcode = pam_start ("login", username, &conv, &pamh);
  		if (retcode != PAM_SUCCESS) {
@@ -101,8 +101,8 @@
  		exit (0);
 Index: shadow-4.0.12/src/logoutd.c
 ===================================================================
---- shadow-4.0.12.orig/src/logoutd.c	2005-08-09 17:25:56.000000000 +0200
-+++ shadow-4.0.12/src/logoutd.c	2005-08-17 11:12:06.000000000 +0200
+--- shadow-4.0.12.orig/src/logoutd.c	2005-08-17 11:49:14.000000000 +0200
++++ shadow-4.0.12/src/logoutd.c	2005-08-17 11:51:09.000000000 +0200
 @@ -41,7 +41,7 @@
  static char *Prog;
  
@@ -114,8 +114,8 @@
  #ifndef HUP_MESG_FILE
 Index: shadow-4.0.12/src/newgrp.c
 ===================================================================
---- shadow-4.0.12.orig/src/newgrp.c	2005-08-11 13:26:11.000000000 +0200
-+++ shadow-4.0.12/src/newgrp.c	2005-08-17 11:13:46.000000000 +0200
+--- shadow-4.0.12.orig/src/newgrp.c	2005-08-17 11:49:14.000000000 +0200
++++ shadow-4.0.12/src/newgrp.c	2005-08-17 11:51:09.000000000 +0200
 @@ -467,7 +467,7 @@
  		child = fork ();
  		if (child < 0) {
@@ -127,8 +127,8 @@
  		} else if (child) {
 Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.12.orig/src/su.c	2005-08-17 10:24:50.000000000 +0200
-+++ shadow-4.0.12/src/su.c	2005-08-17 11:12:06.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:57.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:51:09.000000000 +0200
 @@ -329,7 +329,7 @@
  	if (ret != PAM_SUCCESS) {
  		SYSLOG ((LOG_ERR, "pam_close_session: %s",
@@ -185,8 +185,8 @@
  		exit (1);
 Index: shadow-4.0.12/src/useradd.c
 ===================================================================
---- shadow-4.0.12.orig/src/useradd.c	2005-08-17 10:29:25.000000000 +0200
-+++ shadow-4.0.12/src/useradd.c	2005-08-17 11:12:06.000000000 +0200
+--- shadow-4.0.12.orig/src/useradd.c	2005-08-17 11:51:02.000000000 +0200
++++ shadow-4.0.12/src/useradd.c	2005-08-17 11:51:09.000000000 +0200
 @@ -790,7 +790,7 @@
  		ngrp->gr_mem = add_list (ngrp->gr_mem, user_name);
  		if (!gr_update (ngrp)) {
@@ -198,8 +198,8 @@
  		SYSLOG ((LOG_INFO, "add `%s' to group `%s'",
 Index: shadow-4.0.12/src/chage.c
 ===================================================================
---- shadow-4.0.12.orig/src/chage.c	2005-08-17 10:29:25.000000000 +0200
-+++ shadow-4.0.12/src/chage.c	2005-08-17 11:12:06.000000000 +0200
+--- shadow-4.0.12.orig/src/chage.c	2005-08-17 11:51:02.000000000 +0200
++++ shadow-4.0.12/src/chage.c	2005-08-17 11:51:09.000000000 +0200
 @@ -563,7 +563,7 @@
  	}
  

Modified: branches/experimental/debian/patches/333_shadow.5-typo_312430
===================================================================
--- branches/experimental/debian/patches/333_shadow.5-typo_312430	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/333_shadow.5-typo_312430	2005-08-17 09:52:40 UTC (rev 465)
@@ -3,10 +3,10 @@
 
 Status wrt upstream: should be reported
 
-Index: shadow-4.0.10/man/shadow.5.xml
+Index: shadow-4.0.12/man/shadow.5.xml
 ===================================================================
---- shadow-4.0.10.orig/man/shadow.5.xml	2005-07-07 02:19:03.000000000 +0200
-+++ shadow-4.0.10/man/shadow.5.xml	2005-07-07 02:48:56.000000000 +0200
+--- shadow-4.0.12.orig/man/shadow.5.xml	2005-08-17 11:50:34.000000000 +0200
++++ shadow-4.0.12/man/shadow.5.xml	2005-08-17 11:50:58.000000000 +0200
 @@ -49,7 +49,7 @@
      </itemizedlist>
      

Modified: branches/experimental/debian/patches/345_shadowconfig.8
===================================================================
--- branches/experimental/debian/patches/345_shadowconfig.8	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/345_shadowconfig.8	2005-08-17 09:52:40 UTC (rev 465)
@@ -5,10 +5,10 @@
 
 Note: should be renamed to a 4xx.
 
-Index: shadow-4.0.11.1/man/shadowconfig.8
+Index: shadow-4.0.12/man/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.11.1/man/shadowconfig.8	2005-07-26 00:56:12.000000000 +0200
++++ shadow-4.0.12/man/shadowconfig.8	2005-08-17 11:50:36.000000000 +0200
 @@ -0,0 +1,41 @@
 +.\"Generated by db2man.xsl. Don't modify this, modify the source.
 +.de Sh \" Subsection
@@ -51,10 +51,10 @@
 +.PP
 +Note that turning shadow passwords off and on again will lose all password aging information\&.
 +
-Index: shadow-4.0.11.1/man/shadowconfig.8.xml
+Index: shadow-4.0.12/man/shadowconfig.8.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.11.1/man/shadowconfig.8.xml	2005-07-26 00:56:12.000000000 +0200
++++ shadow-4.0.12/man/shadowconfig.8.xml	2005-08-17 11:50:36.000000000 +0200
 @@ -0,0 +1,52 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -108,10 +108,10 @@
 +    </para>
 +  </refsect1>
 +</refentry>
-Index: shadow-4.0.11.1/man/fr/shadowconfig.8
+Index: shadow-4.0.12/man/fr/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.11.1/man/fr/shadowconfig.8	2005-07-26 01:03:03.000000000 +0200
++++ shadow-4.0.12/man/fr/shadowconfig.8	2005-08-17 11:50:36.000000000 +0200
 @@ -0,0 +1,26 @@
 +.\" This file was generated with po4a. Translate the source file.
 +.\" 
@@ -139,10 +139,10 @@
 +.SH TRADUCTION
 +Nicolas FRANÇOIS, 2004.
 +Veuillez signaler toute erreur à <\fIdebian\-l10\-french at lists.debian.org\fR>.
-Index: shadow-4.0.11.1/man/ja/shadowconfig.8
+Index: shadow-4.0.12/man/ja/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.11.1/man/ja/shadowconfig.8	2005-07-26 01:03:12.000000000 +0200
++++ shadow-4.0.12/man/ja/shadowconfig.8	2005-08-17 11:50:36.000000000 +0200
 @@ -0,0 +1,25 @@
 +.\"     all right reserved,
 +.\" Translated Tue Oct 30 11:59:11 JST 2001
@@ -169,10 +169,10 @@
 +
 +.I /usr/share/doc/passwd/README.debian.gz
 +¤Ë¤Ï shadow ¥Ñ¥¹¥ï¡¼¥É¤È¤½¤ì¤Ë´Ø¤¹¤ëÆÃħ¤Î´Êñ¤Ê¾Ò²ð¤¬½ñ¤«¤ì¤Æ¤¤¤ë¡£
-Index: shadow-4.0.11.1/man/pl/shadowconfig.8
+Index: shadow-4.0.12/man/pl/shadowconfig.8
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.11.1/man/pl/shadowconfig.8	2005-07-26 01:03:20.000000000 +0200
++++ shadow-4.0.12/man/pl/shadowconfig.8	2005-08-17 11:50:36.000000000 +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/experimental/debian/patches/357_newgrp-stop_cont-proxy
===================================================================
--- branches/experimental/debian/patches/357_newgrp-stop_cont-proxy	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/357_newgrp-stop_cont-proxy	2005-08-17 09:52:40 UTC (rev 465)
@@ -13,8 +13,8 @@
 
 Index: shadow-4.0.12/src/newgrp.c
 ===================================================================
---- shadow-4.0.12.orig/src/newgrp.c	2005-08-17 11:13:46.000000000 +0200
-+++ shadow-4.0.12/src/newgrp.c	2005-08-17 11:18:36.000000000 +0200
+--- shadow-4.0.12.orig/src/newgrp.c	2005-08-17 11:51:09.000000000 +0200
++++ shadow-4.0.12/src/newgrp.c	2005-08-17 11:51:13.000000000 +0200
 @@ -472,9 +472,18 @@
  			exit (1);
  		} else if (child) {

Modified: branches/experimental/debian/patches/362_warning_messages
===================================================================
--- branches/experimental/debian/patches/362_warning_messages	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/362_warning_messages	2005-08-17 09:52:40 UTC (rev 465)
@@ -6,10 +6,10 @@
 Note: upstream and Debian login.defs and lib/getdef.c will have to be
       different if some utilities are not built with their PAM support.
 
-Index: shadow-4.0.11.1/libmisc/setupenv.c
+Index: shadow-4.0.12/libmisc/setupenv.c
 ===================================================================
---- shadow-4.0.11.1.orig/libmisc/setupenv.c	2005-07-06 13:49:21.000000000 +0200
-+++ shadow-4.0.11.1/libmisc/setupenv.c	2005-07-26 00:35:32.000000000 +0200
+--- shadow-4.0.12.orig/libmisc/setupenv.c	2005-08-17 11:49:12.000000000 +0200
++++ shadow-4.0.12/libmisc/setupenv.c	2005-08-17 11:51:18.000000000 +0200
 @@ -234,9 +234,6 @@
  
  	addenv ("SHELL", info->pw_shell);
@@ -30,11 +30,11 @@
  	cp = getdef_str ((info->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
  
  	if (!cp) {
-Index: shadow-4.0.11.1/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.11.1.orig/src/su.c	2005-07-25 17:14:13.000000000 +0200
-+++ shadow-4.0.11.1/src/su.c	2005-07-26 00:35:32.000000000 +0200
-@@ -596,6 +596,7 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:51:11.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:51:18.000000000 +0200
+@@ -597,6 +597,7 @@
  	 */
  
  	if (fakelogin && (change_environment || restricted_shell(pwent.pw_shell))) {
@@ -42,7 +42,7 @@
  		if ((cp = getdef_str ("ENV_TZ")))
  			addenv (*cp == '/' ? tz (cp) : cp, NULL);
  		/*
-@@ -603,6 +604,7 @@
+@@ -604,6 +605,7 @@
  		 */
  		if ((cp = getdef_str ("ENV_HZ")))
  			addenv (cp, NULL);	/* set the default $HZ, if one */

Modified: branches/experimental/debian/patches/401_cppw_src.dpatch
===================================================================
--- branches/experimental/debian/patches/401_cppw_src.dpatch	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/401_cppw_src.dpatch	2005-08-17 09:52:40 UTC (rev 465)
@@ -5,10 +5,10 @@
 ## DP: Add cppw / cpgr
 
 @DPATCH@
-Index: shadow-4.0.10/src/cppw.c
+Index: shadow-4.0.12/src/cppw.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.10/src/cppw.c	2005-07-07 03:06:03.000000000 +0200
++++ shadow-4.0.12/src/cppw.c	2005-08-17 11:51:00.000000000 +0200
 @@ -0,0 +1,200 @@
 +/*
 +  cppw, cpgr  copy with locking given file over the password or group file
@@ -210,24 +210,23 @@
 +
 +  return 0;
 +}
-Index: shadow-4.0.10/src/Makefile.am
+Index: shadow-4.0.12/src/Makefile.am
 ===================================================================
---- shadow-4.0.10.orig/src/Makefile.am	2005-06-16 20:42:51.000000000 +0200
-+++ shadow-4.0.10/src/Makefile.am	2005-07-07 03:06:03.000000000 +0200
+--- shadow-4.0.12.orig/src/Makefile.am	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/Makefile.am	2005-08-17 11:51:00.000000000 +0200
 @@ -23,6 +23,7 @@
- bin_PROGRAMS = groups login su
- ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
+ bin_PROGRAMS   = groups login su
+ ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
  usbin_PROGRAMS = \
 +	cppw \
  	chpasswd \
  	groupadd \
  	groupdel \
-Index: shadow-4.0.10/po/POTFILES.in
+Index: shadow-4.0.12/po/POTFILES.in
 ===================================================================
---- shadow-4.0.10.orig/po/POTFILES.in	2005-07-07 02:54:12.000000000 +0200
-+++ shadow-4.0.10/po/POTFILES.in	2005-07-07 03:06:03.000000000 +0200
-@@ -68,7 +68,8 @@
- src/chfn.c
+--- shadow-4.0.12.orig/po/POTFILES.in	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/po/POTFILES.in	2005-08-17 11:51:00.000000000 +0200
+@@ -62,6 +62,7 @@
  src/chpasswd.c
  src/chsh.c
  src/chsh_chkshell.c

Modified: branches/experimental/debian/patches/403_sg_symlink_162339_163652.dpatch
===================================================================
--- branches/experimental/debian/patches/403_sg_symlink_162339_163652.dpatch	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/403_sg_symlink_162339_163652.dpatch	2005-08-17 09:52:40 UTC (rev 465)
@@ -12,11 +12,11 @@
 ## DP: (We just have to test if sg is linked to newgrp)
 
 @DPATCH@
-Index: shadow-4.0.10/src/Makefile.am
+Index: shadow-4.0.12/src/Makefile.am
 ===================================================================
---- shadow-4.0.10.orig/src/Makefile.am	2005-07-07 03:06:03.000000000 +0200
-+++ shadow-4.0.10/src/Makefile.am	2005-07-07 03:21:45.000000000 +0200
-@@ -75,7 +75,6 @@
+--- shadow-4.0.12.orig/src/Makefile.am	2005-08-17 11:51:00.000000000 +0200
++++ shadow-4.0.12/src/Makefile.am	2005-08-17 11:51:01.000000000 +0200
+@@ -77,7 +77,6 @@
  
  install-am: all-am
  	$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

Modified: branches/experimental/debian/patches/404_undef_USE_PAM.dpatch
===================================================================
--- branches/experimental/debian/patches/404_undef_USE_PAM.dpatch	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/404_undef_USE_PAM.dpatch	2005-08-17 09:52:40 UTC (rev 465)
@@ -9,9 +9,10 @@
 ## DP: see also #283961, #162181, #162199, #162228.
 
 @DPATCH@
-diff -urNad shadow-4.0.3/src/chage.c /tmp/dpep.a88PWo/shadow-4.0.3/src/chage.c
---- shadow-4.0.3/src/chage.c	2005-04-16 21:23:27.935795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/chage.c	2005-04-16 21:25:07.565795000 +0200
+Index: shadow-4.0.12/src/chage.c
+===================================================================
+--- shadow-4.0.12.orig/src/chage.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/chage.c	2005-08-17 11:51:02.000000000 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -19,11 +20,12 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: chage.c,v 1.27 2002/01/05 15:41:43 kloczek Exp $")
- #include <sys/types.h>
-diff -urNad shadow-4.0.3/src/chpasswd.c /tmp/dpep.a88PWo/shadow-4.0.3/src/chpasswd.c
---- shadow-4.0.3/src/chpasswd.c	2005-04-16 21:23:27.935795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/chpasswd.c	2005-04-16 21:25:07.565795000 +0200
+ RCSID (PKG_VER "$Id: chage.c,v 1.55 2005/08/09 17:20:02 kloczek Exp $")
+ #include <ctype.h>
+Index: shadow-4.0.12/src/chpasswd.c
+===================================================================
+--- shadow-4.0.12.orig/src/chpasswd.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/chpasswd.c	2005-08-17 11:51:02.000000000 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -31,11 +33,12 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: chpasswd.c,v 1.14 2002/01/05 15:41:43 kloczek Exp $")
- #include <stdio.h>
-diff -urNad shadow-4.0.3/src/groupadd.c /tmp/dpep.a88PWo/shadow-4.0.3/src/groupadd.c
---- shadow-4.0.3/src/groupadd.c	2005-04-16 21:23:27.935795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/groupadd.c	2005-04-16 21:25:07.565795000 +0200
+ RCSID (PKG_VER "$Id: chpasswd.c,v 1.28 2005/08/03 16:00:46 kloczek Exp $")
+ #include <fcntl.h>
+Index: shadow-4.0.12/src/groupadd.c
+===================================================================
+--- shadow-4.0.12.orig/src/groupadd.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/groupadd.c	2005-08-17 11:51:02.000000000 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -43,11 +46,12 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: groupadd.c,v 1.22 2002/01/06 14:09:07 kloczek Exp $")
+ RCSID (PKG_VER "$Id: groupadd.c,v 1.40 2005/08/02 18:35:03 kloczek Exp $")
  #include <sys/types.h>
-diff -urNad shadow-4.0.3/src/groupdel.c /tmp/dpep.a88PWo/shadow-4.0.3/src/groupdel.c
---- shadow-4.0.3/src/groupdel.c	2005-04-16 21:23:27.935795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/groupdel.c	2005-04-16 21:25:07.565795000 +0200
+Index: shadow-4.0.12/src/groupdel.c
+===================================================================
+--- shadow-4.0.12.orig/src/groupdel.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/groupdel.c	2005-08-17 11:51:02.000000000 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -55,11 +59,12 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID(PKG_VER "$Id: groupdel.c,v 1.14 2000/10/09 19:02:20 kloczek Exp $")
- 
-diff -urNad shadow-4.0.3/src/groupmod.c /tmp/dpep.a88PWo/shadow-4.0.3/src/groupmod.c
---- shadow-4.0.3/src/groupmod.c	2005-04-16 21:23:27.935795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/groupmod.c	2005-04-16 21:25:07.565795000 +0200
+ RCSID (PKG_VER "$Id: groupdel.c,v 1.22 2005/08/02 17:49:17 kloczek Exp $")
+ #include <sys/types.h>
+Index: shadow-4.0.12/src/groupmod.c
+===================================================================
+--- shadow-4.0.12.orig/src/groupmod.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/groupmod.c	2005-08-17 11:51:02.000000000 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -67,11 +72,12 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: groupmod.c,v 1.19 2002/01/05 15:41:43 kloczek Exp $")
+ RCSID (PKG_VER "$Id: groupmod.c,v 1.30 2005/08/02 17:49:17 kloczek Exp $")
  #include <sys/types.h>
-diff -urNad shadow-4.0.3/src/newusers.c /tmp/dpep.a88PWo/shadow-4.0.3/src/newusers.c
---- shadow-4.0.3/src/newusers.c	2005-04-16 21:23:27.945795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/newusers.c	2005-04-16 21:25:07.605795000 +0200
+Index: shadow-4.0.12/src/newusers.c
+===================================================================
+--- shadow-4.0.12.orig/src/newusers.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/newusers.c	2005-08-17 11:51:02.000000000 +0200
 @@ -35,6 +35,8 @@
  
  #include <config.h>
@@ -79,11 +85,12 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: newusers.c,v 1.15 2002/01/05 15:41:43 kloczek Exp $")
+ RCSID (PKG_VER "$Id: newusers.c,v 1.25 2005/08/03 16:00:46 kloczek Exp $")
  #include <sys/types.h>
-diff -urNad shadow-4.0.3/src/useradd.c /tmp/dpep.a88PWo/shadow-4.0.3/src/useradd.c
---- shadow-4.0.3/src/useradd.c	2005-04-16 21:23:27.955795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/useradd.c	2005-04-16 21:25:07.665795000 +0200
+Index: shadow-4.0.12/src/useradd.c
+===================================================================
+--- shadow-4.0.12.orig/src/useradd.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/useradd.c	2005-08-17 11:51:02.000000000 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -91,11 +98,12 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: useradd.c,v 1.32 2002/01/10 13:01:28 kloczek Exp $")
- #include "prototypes.h"
-diff -urNad shadow-4.0.3/src/userdel.c /tmp/dpep.a88PWo/shadow-4.0.3/src/userdel.c
---- shadow-4.0.3/src/userdel.c	2005-04-16 21:23:27.955795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/userdel.c	2005-04-16 21:25:07.725795000 +0200
+ RCSID (PKG_VER "$Id: useradd.c,v 1.72 2005/08/07 19:23:33 kloczek Exp $")
+ #include <ctype.h>
+Index: shadow-4.0.12/src/userdel.c
+===================================================================
+--- shadow-4.0.12.orig/src/userdel.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/userdel.c	2005-08-17 11:51:02.000000000 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -103,11 +111,12 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: userdel.c,v 1.21 2002/01/05 15:41:44 kloczek Exp $")
+ RCSID (PKG_VER "$Id: userdel.c,v 1.44 2005/08/03 16:00:46 kloczek Exp $")
  #include <sys/stat.h>
-diff -urNad shadow-4.0.3/src/usermod.c /tmp/dpep.a88PWo/shadow-4.0.3/src/usermod.c
---- shadow-4.0.3/src/usermod.c	2005-04-16 21:23:27.955795000 +0200
-+++ /tmp/dpep.a88PWo/shadow-4.0.3/src/usermod.c	2005-04-16 21:25:07.775795000 +0200
+Index: shadow-4.0.12/src/usermod.c
+===================================================================
+--- shadow-4.0.12.orig/src/usermod.c	2005-08-17 11:49:16.000000000 +0200
++++ shadow-4.0.12/src/usermod.c	2005-08-17 11:51:02.000000000 +0200
 @@ -29,6 +29,8 @@
  
  #include <config.h>
@@ -115,5 +124,5 @@
 +#undef USE_PAM
 +
  #include "rcsid.h"
- RCSID (PKG_VER "$Id: usermod.c,v 1.25 2002/01/05 15:41:44 kloczek Exp $")
+ RCSID (PKG_VER "$Id: usermod.c,v 1.50 2005/08/09 15:12:41 kloczek Exp $")
  #include <sys/types.h>

Modified: branches/experimental/debian/patches/405_subsystem_remove_*_in_shell.dpatch
===================================================================
--- branches/experimental/debian/patches/405_subsystem_remove_*_in_shell.dpatch	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/405_subsystem_remove_*_in_shell.dpatch	2005-08-17 09:52:40 UTC (rev 465)
@@ -9,10 +9,11 @@
 ## DP: Thus, it is no more needed (but does not harm).
 
 @DPATCH@
-diff -urNad shadow-4.0.3/lib/prototypes.h /tmp/dpep.Ff9YlN/shadow-4.0.3/lib/prototypes.h
---- shadow-4.0.3/lib/prototypes.h	2005-04-17 19:40:40.837048000 +0200
-+++ /tmp/dpep.Ff9YlN/shadow-4.0.3/lib/prototypes.h	2005-04-17 19:44:06.817048000 +0200
-@@ -203,7 +203,7 @@
+Index: shadow-4.0.12/lib/prototypes.h
+===================================================================
+--- shadow-4.0.12.orig/lib/prototypes.h	2005-08-17 11:49:15.000000000 +0200
++++ shadow-4.0.12/lib/prototypes.h	2005-08-17 11:51:04.000000000 +0200
+@@ -157,7 +157,7 @@
  extern void sulog (const char *, int, const char *, const char *);
  
  /* sub.c */
@@ -21,10 +22,11 @@
  
  /* ttytype.c */
  extern void ttytype (const char *);
-diff -urNad shadow-4.0.3/libmisc/sub.c /tmp/dpep.Ff9YlN/shadow-4.0.3/libmisc/sub.c
---- shadow-4.0.3/libmisc/sub.c	2005-04-17 19:40:40.907048000 +0200
-+++ /tmp/dpep.Ff9YlN/shadow-4.0.3/libmisc/sub.c	2005-04-17 19:44:06.817048000 +0200
-@@ -51,7 +51,7 @@
+Index: shadow-4.0.12/libmisc/sub.c
+===================================================================
+--- shadow-4.0.12.orig/libmisc/sub.c	2005-08-17 11:49:15.000000000 +0200
++++ shadow-4.0.12/libmisc/sub.c	2005-08-17 11:51:04.000000000 +0200
+@@ -46,7 +46,7 @@
   *	directory will be used as the root of a new filesystem which
   *	the user is actually logged into.
   */
@@ -33,8 +35,8 @@
  {
  	/*
  	 * The new root directory must begin with a "/" character.
-@@ -75,4 +75,8 @@
- 		closelog();
+@@ -71,4 +71,8 @@
+ 		closelog ();
  		exit (1);
  	}
 +

Modified: branches/experimental/debian/patches/406_good_name.dpatch
===================================================================
--- branches/experimental/debian/patches/406_good_name.dpatch	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/406_good_name.dpatch	2005-08-17 09:52:40 UTC (rev 465)
@@ -34,19 +34,20 @@
 exit 0
 
 @DPATCH@
-diff -urNad shadow-4.0.3/libmisc/chkname.c /tmp/dpep.aDA3oY/shadow-4.0.3/libmisc/chkname.c
---- shadow-4.0.3/libmisc/chkname.c	2002-01-10 15:04:34.000000000 +0200
-+++ /tmp/dpep.aDA3oY/shadow-4.0.3/libmisc/chkname.c	2005-05-08 16:41:10.000000000 +0300
-@@ -21,6 +21,7 @@
- static int
- good_name(const char *name)
+Index: shadow-4.0.12/libmisc/chkname.c
+===================================================================
+--- shadow-4.0.12.orig/libmisc/chkname.c	2005-08-17 11:49:15.000000000 +0200
++++ shadow-4.0.12/libmisc/chkname.c	2005-08-17 11:51:05.000000000 +0200
+@@ -17,6 +17,7 @@
+ #endif
+ static int good_name (const char *name)
  {
 +#if 0
  	/*
  	 * User/group names must match [a-z_][a-z0-9_-]*
  	 */
-@@ -34,6 +35,16 @@
- 		    (*name == '$' && *(name+1) == NULL)))
+@@ -30,6 +31,16 @@
+ 		      (*name == '$' && *(name + 1) == '\0')))
  			return 0;
  	}
 +#endif

Modified: branches/experimental/debian/patches/407_32char_grnames.dpatch
===================================================================
--- branches/experimental/debian/patches/407_32char_grnames.dpatch	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/407_32char_grnames.dpatch	2005-08-17 09:52:40 UTC (rev 465)
@@ -31,12 +31,12 @@
 
 @DPATCH@
 
-Index: shadow-4.0.3/libmisc/chkname.c
+Index: shadow-4.0.12/libmisc/chkname.c
 ===================================================================
---- shadow-4.0.3.orig/libmisc/chkname.c	2005-05-12 14:06:09.310665804 +0200
-+++ shadow-4.0.3/libmisc/chkname.c	2005-05-12 14:06:10.644466517 +0200
-@@ -72,10 +72,10 @@ int
- check_group_name (const char *name)
+--- shadow-4.0.12.orig/libmisc/chkname.c	2005-08-17 11:51:05.000000000 +0200
++++ shadow-4.0.12/libmisc/chkname.c	2005-08-17 11:51:06.000000000 +0200
+@@ -66,10 +66,10 @@
+ int check_group_name (const char *name)
  {
  	/*
 -	 * Arbitrary limit for group names - max 16

Modified: branches/experimental/debian/patches/421_login.1_pishing
===================================================================
--- branches/experimental/debian/patches/421_login.1_pishing	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/421_login.1_pishing	2005-08-17 09:52:40 UTC (rev 465)
@@ -3,11 +3,11 @@
 
 Status wrt upstream: Not applied
 
-Index: shadow-4.0.10/man/login.1.xml
+Index: shadow-4.0.12/man/login.1.xml
 ===================================================================
---- shadow-4.0.10.orig/man/login.1.xml	2005-07-07 02:54:12.000000000 +0200
-+++ shadow-4.0.10/man/login.1.xml	2005-07-09 11:48:07.000000000 +0200
-@@ -164,6 +164,14 @@
+--- shadow-4.0.12.orig/man/login.1.xml	2005-08-17 11:50:35.000000000 +0200
++++ shadow-4.0.12/man/login.1.xml	2005-08-17 11:51:08.000000000 +0200
+@@ -175,6 +175,14 @@
        will continue to appear to be logged in even after you log out of the
        "subsession".
      </para>

Modified: branches/experimental/debian/patches/423_su_arguments_are_concatenated
===================================================================
--- branches/experimental/debian/patches/423_su_arguments_are_concatenated	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/423_su_arguments_are_concatenated	2005-08-17 09:52:40 UTC (rev 465)
@@ -9,10 +9,10 @@
 Note: the fix of the man page is still missing.
       (to be taken from the trunk)
 
-Index: shadow-4.0.11.1/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.11.1.orig/src/su.c	2005-07-27 22:01:02.000000000 +0200
-+++ shadow-4.0.11.1/src/su.c	2005-07-27 22:04:09.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:51:09.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:51:11.000000000 +0200
 @@ -214,6 +214,8 @@
  	int status;
  	int ret;

Modified: branches/experimental/debian/patches/424_pwck.8_quiet_option
===================================================================
--- branches/experimental/debian/patches/424_pwck.8_quiet_option	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/424_pwck.8_quiet_option	2005-08-17 09:52:40 UTC (rev 465)
@@ -6,10 +6,10 @@
 
 Status wrt upstream: It should be forwarded to upstream.
 
-Index: shadow-4.0.11.1/man/pwck.8.xml
+Index: shadow-4.0.12/man/pwck.8.xml
 ===================================================================
---- shadow-4.0.11.1.orig/man/pwck.8.xml	2005-07-12 19:28:14.000000000 +0300
-+++ shadow-4.0.11.1/man/pwck.8.xml	2005-07-25 18:24:47.000000000 +0300
+--- shadow-4.0.12.orig/man/pwck.8.xml	2005-08-17 11:49:14.000000000 +0200
++++ shadow-4.0.12/man/pwck.8.xml	2005-08-17 11:51:12.000000000 +0200
 @@ -28,6 +28,7 @@
      </cmdsynopsis>
      <cmdsynopsis>

Modified: branches/experimental/debian/patches/426_grpck_group-gshadow_members_consistency
===================================================================
--- branches/experimental/debian/patches/426_grpck_group-gshadow_members_consistency	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/426_grpck_group-gshadow_members_consistency	2005-08-17 09:52:40 UTC (rev 465)
@@ -9,8 +9,8 @@
 
 Index: shadow-4.0.12/src/grpck.c
 ===================================================================
---- shadow-4.0.12.orig/src/grpck.c	2005-08-17 10:19:54.000000000 +0200
-+++ shadow-4.0.12/src/grpck.c	2005-08-17 11:24:46.000000000 +0200
+--- shadow-4.0.12.orig/src/grpck.c	2005-08-17 11:50:50.000000000 +0200
++++ shadow-4.0.12/src/grpck.c	2005-08-17 11:51:14.000000000 +0200
 @@ -143,7 +143,7 @@
  {
  	int arg;
@@ -196,8 +196,8 @@
  
 Index: shadow-4.0.12/src/pwck.c
 ===================================================================
---- shadow-4.0.12.orig/src/pwck.c	2005-08-09 17:27:02.000000000 +0200
-+++ shadow-4.0.12/src/pwck.c	2005-08-17 11:26:44.000000000 +0200
+--- shadow-4.0.12.orig/src/pwck.c	2005-08-17 11:49:13.000000000 +0200
++++ shadow-4.0.12/src/pwck.c	2005-08-17 11:51:14.000000000 +0200
 @@ -44,6 +44,7 @@
  extern struct commonio_entry *__pw_get_head (void);
  

Modified: branches/experimental/debian/patches/427_chage_expiry_0
===================================================================
--- branches/experimental/debian/patches/427_chage_expiry_0	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/427_chage_expiry_0	2005-08-17 09:52:40 UTC (rev 465)
@@ -6,11 +6,11 @@
 Note: On Debian, PAM deals unconsistently with these fields when they are
       set to 0. See #308229.
 
-Index: shadow-4.0.10/src/chage.c
+Index: shadow-4.0.12/src/chage.c
 ===================================================================
---- shadow-4.0.10.orig/src/chage.c	2005-07-09 13:27:35.000000000 +0200
-+++ shadow-4.0.10/src/chage.c	2005-07-09 14:08:52.000000000 +0200
-@@ -241,8 +241,10 @@
+--- shadow-4.0.12.orig/src/chage.c	2005-08-17 11:51:09.000000000 +0200
++++ shadow-4.0.12/src/chage.c	2005-08-17 11:51:15.000000000 +0200
+@@ -239,8 +239,10 @@
  	 */
  
  	printf (_("Last password change\t\t\t\t\t: "));

Modified: branches/experimental/debian/patches/428_grpck_add_prune_option
===================================================================
--- branches/experimental/debian/patches/428_grpck_add_prune_option	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/428_grpck_add_prune_option	2005-08-17 09:52:40 UTC (rev 465)
@@ -5,11 +5,11 @@
 
 Status wrt upstream: It could certainly be submitted to upstream.
 
-Index: shadow-4.0.3/src/grpck.c
+Index: shadow-4.0.12/src/grpck.c
 ===================================================================
---- shadow-4.0.3.orig/src/grpck.c	2005-05-23 01:08:35.567167000 +0200
-+++ shadow-4.0.3/src/grpck.c	2005-05-23 01:09:33.657167000 +0200
-@@ -146,6 +146,7 @@
+--- shadow-4.0.12.orig/src/grpck.c	2005-08-17 11:49:18.000000000 +0200
++++ shadow-4.0.12/src/grpck.c	2005-08-17 11:50:50.000000000 +0200
+@@ -145,6 +145,7 @@
  	int errors = 0;
  	int deleted = 0;
  	int i;
@@ -17,7 +17,7 @@
  	struct commonio_entry *gre, *tgre;
  	struct group *grp;
  	int sort_mode = 0;
-@@ -172,7 +173,7 @@
+@@ -171,7 +172,7 @@
  	 * Parse the command line arguments
  	 */
  
@@ -26,7 +26,7 @@
  		switch (arg) {
  		case 'q':
  			/* quiet - ignored for now */
-@@ -183,6 +184,9 @@
+@@ -182,6 +183,9 @@
  		case 's':
  			sort_mode = 1;
  			break;
@@ -36,7 +36,7 @@
  		default:
  			usage ();
  		}
-@@ -315,9 +319,13 @@
+@@ -311,9 +315,13 @@
  			/*
  			 * prompt the user to delete the entry or not
  			 */

Modified: branches/experimental/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- branches/experimental/debian/patches/429_login_FAILLOG_ENAB	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/429_login_FAILLOG_ENAB	2005-08-17 09:52:40 UTC (rev 465)
@@ -9,8 +9,8 @@
 
 Index: shadow-4.0.12/src/login.c
 ===================================================================
---- shadow-4.0.12.orig/src/login.c	2005-08-17 10:21:20.000000000 +0200
-+++ shadow-4.0.12/src/login.c	2005-08-17 10:23:53.000000000 +0200
+--- shadow-4.0.12.orig/src/login.c	2005-08-17 11:50:54.000000000 +0200
++++ shadow-4.0.12/src/login.c	2005-08-17 11:50:55.000000000 +0200
 @@ -130,11 +130,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.12/lib/getdef.c
 ===================================================================
---- shadow-4.0.12.orig/lib/getdef.c	2005-08-17 10:21:20.000000000 +0200
-+++ shadow-4.0.12/lib/getdef.c	2005-08-17 10:24:11.000000000 +0200
+--- shadow-4.0.12.orig/lib/getdef.c	2005-08-17 11:50:54.000000000 +0200
++++ shadow-4.0.12/lib/getdef.c	2005-08-17 11:50:55.000000000 +0200
 @@ -56,6 +56,7 @@
  	{"ENV_SUPATH", NULL},
  	{"ERASECHAR", NULL},

Modified: branches/experimental/debian/patches/431_su_uid_0_not_root
===================================================================
--- branches/experimental/debian/patches/431_su_uid_0_not_root	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/431_su_uid_0_not_root	2005-08-17 09:52:40 UTC (rev 465)
@@ -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.3/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.3.orig/src/su.c	2005-05-30 23:07:20.196974000 +0200
-+++ shadow-4.0.3/src/su.c	2005-05-30 23:13:57.716974000 +0200
-@@ -270,7 +270,14 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:38.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:39.000000000 +0200
+@@ -378,7 +378,14 @@
  		argv++;		/* shift ... */
  	}
  	if (!name[0])		/* use default user ID */

Modified: branches/experimental/debian/patches/432_login_cancel_timout_after_authentication
===================================================================
--- branches/experimental/debian/patches/432_login_cancel_timout_after_authentication	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/432_login_cancel_timout_after_authentication	2005-08-17 09:52:40 UTC (rev 465)
@@ -5,11 +5,11 @@
 
 Status wrt upstream: It should be forwarded to upstream.
 
-Index: shadow-4.0.10/src/login.c
+Index: shadow-4.0.12/src/login.c
 ===================================================================
---- shadow-4.0.10.orig/src/login.c	2005-07-10 21:45:40.000000000 +0300
-+++ shadow-4.0.10/src/login.c	2005-07-10 21:48:31.000000000 +0300
-@@ -730,6 +730,7 @@
+--- shadow-4.0.12.orig/src/login.c	2005-08-17 11:50:55.000000000 +0200
++++ shadow-4.0.12/src/login.c	2005-08-17 11:50:56.000000000 +0200
+@@ -736,6 +736,7 @@
  			}
  
  			/* We don't get here unless they were authenticated above */

Modified: branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
===================================================================
--- branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB	2005-08-17 09:52:40 UTC (rev 465)
@@ -18,11 +18,11 @@
    open, we don't have to close it.
  * a HAVE_PAM_FAIL_DELAY is missing
 
-Index: shadow-4.0.3/src/login.c
+Index: shadow-4.0.12/src/login.c
 ===================================================================
---- shadow-4.0.3.orig/src/login.c	2005-05-29 00:06:16.954189000 +0200
-+++ shadow-4.0.3/src/login.c	2005-05-29 00:06:56.174189000 +0200
-@@ -775,47 +775,68 @@
+--- shadow-4.0.12.orig/src/login.c	2005-08-17 11:50:51.000000000 +0200
++++ shadow-4.0.12/src/login.c	2005-08-17 11:50:52.000000000 +0200
+@@ -649,47 +649,68 @@
  			 * MAX_LOGIN_TRIES?
  			 */
  

Modified: branches/experimental/debian/patches/434_login_stop_checking_args_after--
===================================================================
--- branches/experimental/debian/patches/434_login_stop_checking_args_after--	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/434_login_stop_checking_args_after--	2005-08-17 09:52:40 UTC (rev 465)
@@ -3,11 +3,11 @@
 
 Status wrt upstream: It could certainly be submitted to upstream.
 
-Index: shadow-4.0.3/src/login.c
+Index: shadow-4.0.12/src/login.c
 ===================================================================
---- shadow-4.0.3.orig/src/login.c	2005-05-23 01:23:54.377167000 +0200
-+++ shadow-4.0.3/src/login.c	2005-05-23 01:24:36.427167000 +0200
-@@ -294,6 +294,8 @@
+--- shadow-4.0.12.orig/src/login.c	2005-08-17 11:49:18.000000000 +0200
++++ shadow-4.0.12/src/login.c	2005-08-17 11:50:51.000000000 +0200
+@@ -258,6 +258,8 @@
  	for (arg = 1; arg < argc; arg++) {
  		if (argv[arg][0] == '-' && strlen (argv[arg]) > 2)
  			usage ();

Modified: branches/experimental/debian/patches/435_su_addenv_HOME_and_SHELL
===================================================================
--- branches/experimental/debian/patches/435_su_addenv_HOME_and_SHELL	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/435_su_addenv_HOME_and_SHELL	2005-08-17 09:52:40 UTC (rev 465)
@@ -3,11 +3,11 @@
 
 Status wrt upstream: It should be proposed to upstream.
 
-Index: shadow-4.0.3/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.3.orig/src/su.c	2005-05-30 00:48:15.997531000 +0200
-+++ shadow-4.0.3/src/su.c	2005-05-30 00:53:34.157531000 +0200
-@@ -576,8 +576,11 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:49:21.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:38.000000000 +0200
+@@ -677,8 +677,11 @@
  	if (fakelogin)
  		setup_env (&pwent);
  #if 1				/* Suggested by Joey Hess. XXX - is this right?  */

Modified: branches/experimental/debian/patches/437_su_add_GNU_options_1
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_1	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_1	2005-08-17 09:52:40 UTC (rev 465)
@@ -7,8 +7,8 @@
        * !doshell is broken (argv is not incremented)
 Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.12.orig/src/su.c	2005-08-17 10:10:19.000000000 +0200
-+++ shadow-4.0.12/src/su.c	2005-08-17 10:13:00.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:39.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:40.000000000 +0200
 @@ -31,6 +31,7 @@
  
  #include "rcsid.h"

Modified: branches/experimental/debian/patches/437_su_add_GNU_options_2
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_2	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_2	2005-08-17 09:52:40 UTC (rev 465)
@@ -9,8 +9,8 @@
        execute a shell when there is no additional arguments.
 Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.12.orig/src/su.c	2005-08-17 10:13:00.000000000 +0200
-+++ shadow-4.0.12/src/su.c	2005-08-17 10:13:46.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:40.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:41.000000000 +0200
 @@ -128,6 +128,24 @@
  }
  #endif				/* !USE_PAM */

Modified: branches/experimental/debian/patches/437_su_add_GNU_options_3
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_3	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_3	2005-08-17 09:52:40 UTC (rev 465)
@@ -4,8 +4,8 @@
        the environment, or if the user has a restricted shell.
 Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.12.orig/src/su.c	2005-08-17 10:13:46.000000000 +0200
-+++ shadow-4.0.12/src/su.c	2005-08-17 10:16:56.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:41.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:42.000000000 +0200
 @@ -185,7 +185,10 @@
   * have been applied.  Some work was needed to get it integrated into
   * su.c from shadow.

Modified: branches/experimental/debian/patches/437_su_add_GNU_options_4
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_4	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_4	2005-08-17 09:52:40 UTC (rev 465)
@@ -13,8 +13,8 @@
         restricted)
 Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.12.orig/src/su.c	2005-08-17 10:16:56.000000000 +0200
-+++ shadow-4.0.12/src/su.c	2005-08-17 10:17:47.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:42.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:43.000000000 +0200
 @@ -208,14 +208,14 @@
  
  		shell_basename = getdef_str ("SU_NAME");

Modified: branches/experimental/debian/patches/437_su_add_GNU_options_5
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_5	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_5	2005-08-17 09:52:40 UTC (rev 465)
@@ -2,11 +2,11 @@
       Also, return a 126 or 127 exit status when !USE_PAM (was mising
       from another patch.
 
-Index: shadow-4.0.10/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.10.orig/src/su.c	2005-07-22 10:34:01.000000000 +0200
-+++ shadow-4.0.10/src/su.c	2005-07-22 10:36:52.000000000 +0200
-@@ -237,6 +237,13 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:43.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:44.000000000 +0200
+@@ -233,6 +233,13 @@
  
  #ifndef USE_PAM
  	(void) execv (shellstr, args);
@@ -20,7 +20,7 @@
  	/* NOT REACHED */
  #else
  	child = fork ();
-@@ -244,6 +251,8 @@
+@@ -240,6 +247,8 @@
  		pam_end (pamh, PAM_SUCCESS);
  
  		(void) execv (shellstr, (char **) args);

Modified: branches/experimental/debian/patches/437_su_add_GNU_options_6
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_6	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_6	2005-08-17 09:52:40 UTC (rev 465)
@@ -1,10 +1,10 @@
 Goal: I'm not sure if the pw_shell can be NULL, but checking can't arm.
 
-Index: shadow-4.0.10/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.10.orig/src/su.c	2005-07-22 10:36:52.000000000 +0200
-+++ shadow-4.0.10/src/su.c	2005-07-22 10:41:12.000000000 +0200
-@@ -622,7 +622,7 @@
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:44.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:46.000000000 +0200
+@@ -617,7 +617,7 @@
  	 * Set the default shell.
  	 */
  
@@ -12,4 +12,4 @@
 +	if (pwent.pw_shell == NULL || pwent.pw_shell[0] == '\0')
  		pwent.pw_shell = "/bin/sh";	/* XXX warning: const */
  
- 	/* If the user do not want to change the environment,
+ 	signal (SIGINT, SIG_IGN);

Modified: branches/experimental/debian/patches/438_su_GNU_origin
===================================================================
--- branches/experimental/debian/patches/438_su_GNU_origin	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/438_su_GNU_origin	2005-08-17 09:52:40 UTC (rev 465)
@@ -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.3/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.3.orig/src/su.c	2005-05-23 00:34:54.617167000 +0200
-+++ shadow-4.0.3/src/su.c	2005-05-23 00:36:04.067167000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:49.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:57.000000000 +0200
 @@ -26,6 +26,24 @@
   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.

Modified: branches/experimental/debian/patches/439_su_PAM_session
===================================================================
--- branches/experimental/debian/patches/439_su_PAM_session	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/439_su_PAM_session	2005-08-17 09:52:40 UTC (rev 465)
@@ -5,12 +5,12 @@
       One difference may be that the session is not closed as root (changing
       this will require a major rewrite of su).
 
-Index: shadow-4.0.10/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.10.orig/src/su.c	2005-07-20 00:54:30.000000000 +0200
-+++ shadow-4.0.10/src/su.c	2005-07-20 00:54:54.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:50:48.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:50:49.000000000 +0200
 @@ -191,7 +191,7 @@
- static void run_shell (const char *shellstr, char **additional_args, int fakelogin)
+                        int fakelogin)
  {
  	const char **args;
 -	int child;
@@ -18,8 +18,8 @@
  	sigset_t ourset;
  	int status;
  	int ret;
-@@ -230,8 +230,10 @@
- 		shell (shellstr, args[0]);
+@@ -242,8 +242,10 @@
+ 	}
  	/* NOT REACHED */
  #else
 -	child = fork ();
@@ -30,8 +30,8 @@
 +	if (child == 0) {	/* child shell or no CLOSE_SESSIONS */
  		pam_end (pamh, PAM_SUCCESS);
  
- 		if (argno == 1)
-@@ -249,6 +251,7 @@
+ 		(void) execv (shellstr, (char **) args);
+@@ -260,6 +262,7 @@
  		closelog ();
  		exit (1);
  	}
@@ -39,7 +39,7 @@
  	/* parent only */
  	sigfillset (&ourset);
  	if (sigprocmask (SIG_BLOCK, &ourset, NULL)) {
-@@ -774,6 +777,7 @@
+@@ -787,6 +790,7 @@
  		SYSLOG ((LOG_ERR, "pam_open_session: %s",
  			 pam_strerror (pamh, ret)));
  		fprintf (stderr, "%s: %s\n", Prog, pam_strerror (pamh, ret));
@@ -47,7 +47,7 @@
  		pam_end (pamh, ret);
  		exit (1);
  	}
-@@ -795,6 +799,7 @@
+@@ -810,6 +814,7 @@
  
  	/* become the new user */
  	if (change_uid (&pwent)) {

Modified: branches/experimental/debian/patches/440_manpages-login.1
===================================================================
--- branches/experimental/debian/patches/440_manpages-login.1	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/440_manpages-login.1	2005-08-17 09:52:40 UTC (rev 465)
@@ -5,11 +5,11 @@
 Status wrt upstream: Forwarded but not completely applied yet
                      (the files locations patches are already applied)
             
-Index: shadow-4.0.10/man/login.1.xml
+Index: shadow-4.0.12/man/login.1.xml
 ===================================================================
---- shadow-4.0.10.orig/man/login.1.xml	2005-06-15 14:39:27.000000000 +0200
-+++ shadow-4.0.10/man/login.1.xml	2005-07-04 18:17:03.000000000 +0200
-@@ -152,6 +152,18 @@
+--- shadow-4.0.12.orig/man/login.1.xml	2005-08-17 11:49:22.000000000 +0200
++++ shadow-4.0.12/man/login.1.xml	2005-08-17 11:50:35.000000000 +0200
+@@ -163,6 +163,18 @@
      <para>The location of files is subject to differences in system
        configuration.
      </para>

Modified: branches/experimental/debian/patches/441_manpages-shadow.5
===================================================================
--- branches/experimental/debian/patches/441_manpages-shadow.5	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/441_manpages-shadow.5	2005-08-17 09:52:40 UTC (rev 465)
@@ -3,10 +3,10 @@
 
 Status wrt upstream: Forwarded but not applied yet
 
-Index: shadow-4.0.10/man/shadow.5.xml
+Index: shadow-4.0.12/man/shadow.5.xml
 ===================================================================
---- shadow-4.0.10.orig/man/shadow.5.xml	2005-06-16 19:37:40.000000000 +0200
-+++ shadow-4.0.10/man/shadow.5.xml	2005-07-04 18:08:33.000000000 +0200
+--- shadow-4.0.12.orig/man/shadow.5.xml	2005-08-17 11:49:22.000000000 +0200
++++ shadow-4.0.12/man/shadow.5.xml	2005-08-17 11:50:34.000000000 +0200
 @@ -64,6 +64,18 @@
        for details on how this string is interpreted.
      </para>

Modified: branches/experimental/debian/patches/442_useradd-O_option
===================================================================
--- branches/experimental/debian/patches/442_useradd-O_option	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/442_useradd-O_option	2005-08-17 09:52:40 UTC (rev 465)
@@ -1,7 +1,7 @@
-Index: shadow-4.0.11.1/man/useradd.8.xml
+Index: shadow-4.0.12/man/useradd.8.xml
 ===================================================================
---- shadow-4.0.11.1.orig/man/useradd.8.xml	2005-07-25 16:33:46.000000000 +0200
-+++ shadow-4.0.11.1/man/useradd.8.xml	2005-07-25 17:39:07.000000000 +0200
+--- shadow-4.0.12.orig/man/useradd.8.xml	2005-08-17 11:50:33.000000000 +0200
++++ shadow-4.0.12/man/useradd.8.xml	2005-08-17 11:51:16.000000000 +0200
 @@ -194,6 +194,11 @@
  	    <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
  	    doesn't work yet.
@@ -14,10 +14,10 @@
          </listitem>
        </varlistentry>
        <varlistentry>
-Index: shadow-4.0.11.1/src/useradd.c
+Index: shadow-4.0.12/src/useradd.c
 ===================================================================
---- shadow-4.0.11.1.orig/src/useradd.c	2005-07-25 17:14:12.000000000 +0200
-+++ shadow-4.0.11.1/src/useradd.c	2005-07-25 17:35:21.000000000 +0200
+--- shadow-4.0.12.orig/src/useradd.c	2005-08-17 11:51:09.000000000 +0200
++++ shadow-4.0.12/src/useradd.c	2005-08-17 11:51:16.000000000 +0200
 @@ -965,7 +965,7 @@
  			{NULL, 0, NULL, '\0'}
  		};

Modified: branches/experimental/debian/patches/443_chage_exit_values
===================================================================
--- branches/experimental/debian/patches/443_chage_exit_values	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/443_chage_exit_values	2005-08-17 09:52:40 UTC (rev 465)
@@ -18,8 +18,8 @@
 
 Index: shadow-4.0.12/src/chage.c
 ===================================================================
---- shadow-4.0.12.orig/src/chage.c	2005-08-17 11:29:39.000000000 +0200
-+++ shadow-4.0.12/src/chage.c	2005-08-17 11:35:35.000000000 +0200
+--- shadow-4.0.12.orig/src/chage.c	2005-08-17 11:51:15.000000000 +0200
++++ shadow-4.0.12/src/chage.c	2005-08-17 11:51:19.000000000 +0200
 @@ -541,6 +541,15 @@
  	pwent = *pw;
  	STRFCPY (name, pwent.pw_name);
@@ -38,8 +38,8 @@
  	 * the entries as was done for the password file. The user entries
 Index: shadow-4.0.12/lib/exitcodes.h
 ===================================================================
---- shadow-4.0.12.orig/lib/exitcodes.h	2005-07-27 12:10:31.000000000 +0200
-+++ shadow-4.0.12/lib/exitcodes.h	2005-08-17 11:42:14.000000000 +0200
+--- shadow-4.0.12.orig/lib/exitcodes.h	2005-08-17 11:49:12.000000000 +0200
++++ shadow-4.0.12/lib/exitcodes.h	2005-08-17 11:51:19.000000000 +0200
 @@ -7,3 +7,4 @@
  #define E_NOPERM        1	/* permission denied */
  #define E_USAGE         2	/* invalid command syntax */

Modified: branches/experimental/debian/patches/445_su_password_expired
===================================================================
--- branches/experimental/debian/patches/445_su_password_expired	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/445_su_password_expired	2005-08-17 09:52:40 UTC (rev 465)
@@ -7,10 +7,10 @@
 
 Note: When su is not compiled with PAM, there is no syslog messages.
 
-Index: shadow-4.0.11.1/src/su.c
+Index: shadow-4.0.12/src/su.c
 ===================================================================
---- shadow-4.0.11.1.orig/src/su.c	2005-08-06 00:27:35.000000000 +0200
-+++ shadow-4.0.11.1/src/su.c	2005-08-09 12:35:19.000000000 +0200
+--- shadow-4.0.12.orig/src/su.c	2005-08-17 11:51:18.000000000 +0200
++++ shadow-4.0.12/src/su.c	2005-08-17 11:51:20.000000000 +0200
 @@ -697,6 +697,16 @@
  		if (amroot) {
  			fprintf (stderr, _("%s: %s\n(Ignored)\n"), Prog,

Modified: branches/experimental/debian/patches/999_hack_build_package
===================================================================
--- branches/experimental/debian/patches/999_hack_build_package	2005-08-17 09:48:23 UTC (rev 464)
+++ branches/experimental/debian/patches/999_hack_build_package	2005-08-17 09:52:40 UTC (rev 465)
@@ -10,10 +10,10 @@
 
 These points could be checked on debian-devel
 
-Index: shadow-4.0.11.1/debian/passwd.files
+Index: shadow-4.0.12/debian/passwd.files
 ===================================================================
---- shadow-4.0.11.1.orig/debian/passwd.files	2005-07-26 01:04:21.000000000 +0200
-+++ shadow-4.0.11.1/debian/passwd.files	2005-07-26 01:04:50.000000000 +0200
+--- shadow-4.0.12.orig/debian/passwd.files	2005-08-17 11:49:11.000000000 +0200
++++ shadow-4.0.12/debian/passwd.files	2005-08-17 11:51:21.000000000 +0200
 @@ -6,7 +6,6 @@
  usr/bin/passwd
  usr/sbin/chpasswd
@@ -22,10 +22,10 @@
  usr/sbin/groupadd
  usr/sbin/groupdel
  usr/sbin/groupmod
-Index: shadow-4.0.11.1/debian/rules
+Index: shadow-4.0.12/debian/rules
 ===================================================================
---- shadow-4.0.11.1.orig/debian/rules	2005-07-26 01:04:21.000000000 +0200
-+++ shadow-4.0.11.1/debian/rules	2005-07-26 01:37:06.000000000 +0200
+--- shadow-4.0.12.orig/debian/rules	2005-08-17 11:49:11.000000000 +0200
++++ shadow-4.0.12/debian/rules	2005-08-17 11:51:21.000000000 +0200
 @@ -100,10 +100,6 @@
  	# but does not reflect what we do in Debian
  	# so we'd better forget about that man page

More information about the Pkg-shadow-commits mailing list