[Pkg-shadow-commits] r893 - trunk/debian/patches
Christian Perrier
bubulle at costa.debian.org
Wed Mar 8 18:36:17 UTC 2006
Author: bubulle
Date: 2006-03-08 18:36:15 +0000 (Wed, 08 Mar 2006)
New Revision: 893
Modified:
trunk/debian/patches/008_login_log_failure_in_FTMP
trunk/debian/patches/008_su_get_PAM_username
trunk/debian/patches/008_su_no_sanitize_env
trunk/debian/patches/401_cppw_src.dpatch
trunk/debian/patches/404_undef_USE_PAM.dpatch
trunk/debian/patches/404_undef_USE_PAM.nolibpam
trunk/debian/patches/406_good_name.dpatch
trunk/debian/patches/407_32char_grnames.dpatch
trunk/debian/patches/423_su_arguments_are_concatenated
trunk/debian/patches/426_grpck_group-gshadow_members_consistency
trunk/debian/patches/428_grpck_add_prune_option
trunk/debian/patches/429_login_FAILLOG_ENAB
trunk/debian/patches/431_su_uid_0_not_root
trunk/debian/patches/432_login_cancel_timout_after_authentication
trunk/debian/patches/433_shadow.5-typo_312430
trunk/debian/patches/434_login_stop_checking_args_after--
trunk/debian/patches/438_su_GNU_origin
trunk/debian/patches/451_login_PATH
trunk/debian/patches/452_doc_password_check_order
trunk/debian/patches/454_userdel_no_MAIL_FILE
trunk/debian/patches/461_keep_sticky_bit_for_dirs
trunk/debian/patches/462_warn_to_edit_shadow
trunk/debian/patches/463_login_delay_obeys_to_PAM
trunk/debian/patches/466_fflush-prompt
trunk/debian/patches/468_duplicate_passwd_struct_before_usage
trunk/debian/patches/479_chowntty_debug
trunk/debian/patches/480_getopt_args_reorder
trunk/debian/patches/482_libmisc_copydir_check_return_values
trunk/debian/patches/483_su_fakelogin_wrong_arg0
trunk/debian/patches/484_su-p_preserve_PATH
trunk/debian/patches/491_configure.in_friendly_selinux_detection
trunk/debian/patches/501_commonio_group_shadow
trunk/debian/patches/503_shadowconfig.8
trunk/debian/patches/542_useradd-O_option
trunk/debian/patches/592_manpages_typos
trunk/debian/patches/series
Log:
Update patches to fit 4.0.15 pre-release
Modified: trunk/debian/patches/008_login_log_failure_in_FTMP
===================================================================
--- trunk/debian/patches/008_login_log_failure_in_FTMP 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/008_login_log_failure_in_FTMP 2006-03-08 18:36:15 UTC (rev 893)
@@ -4,11 +4,11 @@
* I'm not sure login should add an entry in the FTMP file when PAM is used.
(but nothing in /etc/login.defs indicates that the failure is not logged)
-Index: shadow-4.0.14/src/login.c
+Index: shadow-4.0.15/src/login.c
===================================================================
---- shadow-4.0.14.orig/src/login.c 2006-01-03 08:25:01.887557833 +0100
-+++ shadow-4.0.14/src/login.c 2006-01-03 08:25:02.262481714 +0100
-@@ -711,6 +711,20 @@
+--- shadow-4.0.15.orig/src/login.c 2006-03-08 19:33:13.424419158 +0100
++++ shadow-4.0.15/src/login.c 2006-03-08 19:33:14.653170248 +0100
+@@ -716,6 +716,20 @@
#endif /* WITH_AUDIT */
fprintf(stderr,"\nLogin incorrect\n");
@@ -29,10 +29,10 @@
/* Let's give it another go around */
pam_set_item(pamh,PAM_USER,NULL);
-Index: shadow-4.0.14/lib/getdef.c
+Index: shadow-4.0.15/lib/getdef.c
===================================================================
---- shadow-4.0.14.orig/lib/getdef.c 2006-01-03 08:23:48.080540738 +0100
-+++ shadow-4.0.14/lib/getdef.c 2006-01-03 08:25:02.263481511 +0100
+--- shadow-4.0.15.orig/lib/getdef.c 2006-03-08 19:32:13.201618584 +0100
++++ shadow-4.0.15/lib/getdef.c 2006-03-08 19:33:14.656169640 +0100
@@ -57,6 +57,7 @@
{"ERASECHAR", NULL},
{"FAIL_DELAY", NULL},
Modified: trunk/debian/patches/008_su_get_PAM_username
===================================================================
--- trunk/debian/patches/008_su_get_PAM_username 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/008_su_get_PAM_username 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,19 +5,19 @@
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.14/src/su.c
+Index: shadow-4.0.15/src/su.c
===================================================================
---- shadow-4.0.14.orig/src/su.c 2006-01-03 08:25:00.246890930 +0100
-+++ shadow-4.0.14/src/su.c 2006-01-03 08:25:00.575824149 +0100
-@@ -287,6 +287,7 @@
+--- shadow-4.0.15.orig/src/su.c 2006-03-08 19:33:09.823148673 +0100
++++ shadow-4.0.15/src/su.c 2006-03-08 19:33:11.024905231 +0100
+@@ -285,6 +285,7 @@
struct passwd *pw = 0;
char **envp = environ;
- char *shellstr = 0;
+ char *shellstr = 0, *command = 0;
+ char *tmp_name;
#ifdef USE_PAM
int ret;
-@@ -643,6 +644,14 @@
+@@ -649,6 +650,14 @@
su_failure (tty);
}
}
Modified: trunk/debian/patches/008_su_no_sanitize_env
===================================================================
--- trunk/debian/patches/008_su_no_sanitize_env 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/008_su_no_sanitize_env 2006-03-08 18:36:15 UTC (rev 893)
@@ -1,7 +1,7 @@
-Index: shadow-4.0.14/src/su.c
+Index: shadow-4.0.15/src/su.c
===================================================================
---- shadow-4.0.14.orig/src/su.c 2006-01-03 08:24:59.924956291 +0100
-+++ shadow-4.0.14/src/su.c 2006-01-03 08:25:00.246890930 +0100
+--- shadow-4.0.15.orig/src/su.c 2006-03-08 19:33:08.617392925 +0100
++++ shadow-4.0.15/src/su.c 2006-03-08 19:33:09.823148673 +0100
@@ -301,7 +301,7 @@
#endif
#endif /* !USE_PAM */
Modified: trunk/debian/patches/401_cppw_src.dpatch
===================================================================
--- trunk/debian/patches/401_cppw_src.dpatch 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/401_cppw_src.dpatch 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,10 +5,10 @@
## DP: Add cppw / cpgr
@DPATCH@
-Index: shadow-4.0.14/src/cppw.c
+Index: shadow-4.0.15/src/cppw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.14/src/cppw.c 2006-01-03 08:25:03.943140495 +0100
++++ shadow-4.0.15/src/cppw.c 2006-03-08 19:33:20.948894913 +0100
@@ -0,0 +1,200 @@
+/*
+ cppw, cpgr copy with locking given file over the password or group file
@@ -210,24 +210,24 @@
+
+ return 0;
+}
-Index: shadow-4.0.14/src/Makefile.am
+Index: shadow-4.0.15/src/Makefile.am
===================================================================
---- shadow-4.0.14.orig/src/Makefile.am 2006-01-03 08:23:47.851587210 +0100
-+++ shadow-4.0.14/src/Makefile.am 2006-01-03 08:25:03.943140495 +0100
-@@ -24,6 +24,7 @@
- sbin_PROGRAMS = nologin
+--- shadow-4.0.15.orig/src/Makefile.am 2006-03-08 19:32:12.184824557 +0100
++++ shadow-4.0.15/src/Makefile.am 2006-03-08 19:33:20.950894508 +0100
+@@ -23,6 +23,7 @@
+ bin_PROGRAMS = groups login su
ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
usbin_PROGRAMS = \
+ cppw \
+ chgpasswd \
chpasswd \
groupadd \
- groupdel \
-Index: shadow-4.0.14/po/POTFILES.in
+Index: shadow-4.0.15/po/POTFILES.in
===================================================================
---- shadow-4.0.14.orig/po/POTFILES.in 2006-01-03 08:23:47.851587210 +0100
-+++ shadow-4.0.14/po/POTFILES.in 2006-01-03 08:25:03.944140292 +0100
-@@ -61,6 +61,7 @@
- src/chfn.c
+--- shadow-4.0.15.orig/po/POTFILES.in 2006-03-08 19:32:12.186824152 +0100
++++ shadow-4.0.15/po/POTFILES.in 2006-03-08 19:33:20.952894103 +0100
+@@ -62,6 +62,7 @@
+ src/chgpasswd.c
src/chpasswd.c
src/chsh.c
+src/cppw.c
Modified: trunk/debian/patches/404_undef_USE_PAM.dpatch
===================================================================
--- trunk/debian/patches/404_undef_USE_PAM.dpatch 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/404_undef_USE_PAM.dpatch 2006-03-08 18:36:15 UTC (rev 893)
@@ -6,22 +6,22 @@
* If it is kept for 4.0.13, libmisc/salt.c will also require an
#undef USE_PAM
-Index: shadow-4.0.14/src/chage.c
+Index: shadow-4.0.15/src/chage.c
===================================================================
---- shadow-4.0.14.orig/src/chage.c 2006-01-03 08:23:47.800597560 +0100
-+++ shadow-4.0.14/src/chage.c 2006-01-03 08:25:04.305067014 +0100
+--- shadow-4.0.15.orig/src/chage.c 2006-03-08 19:32:11.925877012 +0100
++++ shadow-4.0.15/src/chage.c 2006-03-08 19:33:24.670141095 +0100
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: chage.c,v 1.68 2005/12/02 19:42:25 kloczek Exp $"
+ #ident "$Id: chage.c,v 1.71 2006/02/21 22:44:35 kloczek Exp $"
-Index: shadow-4.0.14/src/chpasswd.c
+Index: shadow-4.0.15/src/chpasswd.c
===================================================================
---- shadow-4.0.14.orig/src/chpasswd.c 2006-01-03 08:23:47.801597357 +0100
-+++ shadow-4.0.14/src/chpasswd.c 2006-01-03 08:25:04.306066811 +0100
+--- shadow-4.0.15.orig/src/chpasswd.c 2006-03-08 19:32:11.927876607 +0100
++++ shadow-4.0.15/src/chpasswd.c 2006-03-08 19:33:24.672140689 +0100
@@ -28,6 +28,7 @@
*/
@@ -30,34 +30,34 @@
#ident "$Id: chpasswd.c,v 1.34 2005/10/19 15:21:07 kloczek Exp $"
-Index: shadow-4.0.14/src/groupadd.c
+Index: shadow-4.0.15/src/groupadd.c
===================================================================
---- shadow-4.0.14.orig/src/groupadd.c 2006-01-03 08:23:47.801597357 +0100
-+++ shadow-4.0.14/src/groupadd.c 2006-01-03 08:25:04.307066608 +0100
+--- shadow-4.0.15.orig/src/groupadd.c 2006-03-08 19:32:11.928876405 +0100
++++ shadow-4.0.15/src/groupadd.c 2006-03-08 19:33:24.675140082 +0100
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: groupadd.c,v 1.50 2005/12/06 20:24:03 kloczek Exp $"
+ #ident "$Id: groupadd.c,v 1.51 2006/01/18 19:55:15 kloczek Exp $"
-Index: shadow-4.0.14/src/groupdel.c
+Index: shadow-4.0.15/src/groupdel.c
===================================================================
---- shadow-4.0.14.orig/src/groupdel.c 2006-01-03 08:23:47.801597357 +0100
-+++ shadow-4.0.14/src/groupdel.c 2006-01-03 08:25:04.307066608 +0100
+--- shadow-4.0.15.orig/src/groupdel.c 2006-03-08 19:32:11.930876000 +0100
++++ shadow-4.0.15/src/groupdel.c 2006-03-08 19:33:24.677139677 +0100
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: groupdel.c,v 1.30 2005/10/19 15:21:07 kloczek Exp $"
+ #ident "$Id: groupdel.c,v 1.31 2006/01/18 19:55:15 kloczek Exp $"
-Index: shadow-4.0.14/src/groupmod.c
+Index: shadow-4.0.15/src/groupmod.c
===================================================================
---- shadow-4.0.14.orig/src/groupmod.c 2006-01-03 08:23:47.802597154 +0100
-+++ shadow-4.0.14/src/groupmod.c 2006-01-03 08:25:04.308066405 +0100
+--- shadow-4.0.15.orig/src/groupmod.c 2006-03-08 19:32:11.931875797 +0100
++++ shadow-4.0.15/src/groupmod.c 2006-03-08 19:33:24.680139069 +0100
@@ -28,6 +28,7 @@
*/
@@ -66,51 +66,51 @@
#ident "$Id: groupmod.c,v 1.37 2005/10/19 15:21:07 kloczek Exp $"
-Index: shadow-4.0.14/src/newusers.c
+Index: shadow-4.0.15/src/newusers.c
===================================================================
---- shadow-4.0.14.orig/src/newusers.c 2006-01-03 08:23:47.802597154 +0100
-+++ shadow-4.0.14/src/newusers.c 2006-01-03 08:25:04.309066202 +0100
+--- shadow-4.0.15.orig/src/newusers.c 2006-03-08 19:32:11.932875595 +0100
++++ shadow-4.0.15/src/newusers.c 2006-03-08 19:33:24.683138462 +0100
@@ -34,6 +34,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: newusers.c,v 1.31 2005/10/19 15:21:07 kloczek Exp $"
+ #ident "$Id: newusers.c,v 1.32 2006/01/18 19:55:15 kloczek Exp $"
-Index: shadow-4.0.14/src/useradd.c
+Index: shadow-4.0.15/src/useradd.c
===================================================================
---- shadow-4.0.14.orig/src/useradd.c 2006-01-03 08:23:47.802597154 +0100
-+++ shadow-4.0.14/src/useradd.c 2006-01-03 08:25:04.310065999 +0100
+--- shadow-4.0.15.orig/src/useradd.c 2006-03-08 19:32:11.934875190 +0100
++++ shadow-4.0.15/src/useradd.c 2006-03-08 19:33:24.690137044 +0100
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: useradd.c,v 1.89 2005/12/15 15:06:28 kloczek Exp $"
+ #ident "$Id: useradd.c,v 1.91 2006/02/07 19:49:32 kloczek Exp $"
-Index: shadow-4.0.14/src/userdel.c
+Index: shadow-4.0.15/src/userdel.c
===================================================================
---- shadow-4.0.14.orig/src/userdel.c 2006-01-03 08:23:47.803596951 +0100
-+++ shadow-4.0.14/src/userdel.c 2006-01-03 08:25:04.312065593 +0100
+--- shadow-4.0.15.orig/src/userdel.c 2006-03-08 19:32:11.935874987 +0100
++++ shadow-4.0.15/src/userdel.c 2006-03-08 19:33:24.695136031 +0100
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: userdel.c,v 1.58 2005/12/01 20:10:48 kloczek Exp $"
+ #ident "$Id: userdel.c,v 1.61 2006/02/07 20:19:46 kloczek Exp $"
-Index: shadow-4.0.14/src/usermod.c
+Index: shadow-4.0.15/src/usermod.c
===================================================================
---- shadow-4.0.14.orig/src/usermod.c 2006-01-03 08:23:47.803596951 +0100
-+++ shadow-4.0.14/src/usermod.c 2006-01-03 08:25:04.319064172 +0100
+--- shadow-4.0.15.orig/src/usermod.c 2006-03-08 19:32:11.937874582 +0100
++++ shadow-4.0.15/src/usermod.c 2006-03-08 19:33:24.702134614 +0100
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: usermod.c,v 1.64 2005/12/05 18:19:47 kloczek Exp $"
+ #ident "$Id: usermod.c,v 1.65 2006/01/18 19:55:15 kloczek Exp $"
Modified: trunk/debian/patches/404_undef_USE_PAM.nolibpam
===================================================================
--- trunk/debian/patches/404_undef_USE_PAM.nolibpam 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/404_undef_USE_PAM.nolibpam 2006-03-08 18:36:15 UTC (rev 893)
@@ -1,43 +1,47 @@
-Index: shadow-4.0.14/src/Makefile.am
+Index: shadow-4.0.15/src/Makefile.am
===================================================================
---- shadow-4.0.14.orig/src/Makefile.am 2006-01-03 08:25:03.943140495 +0100
-+++ shadow-4.0.14/src/Makefile.am 2006-01-03 08:25:04.764973640 +0100
-@@ -52,29 +52,29 @@
+--- shadow-4.0.15.orig/src/Makefile.am 2006-03-08 19:33:20.950894508 +0100
++++ shadow-4.0.15/src/Makefile.am 2006-03-08 19:33:30.316997202 +0100
+@@ -53,15 +53,15 @@
$(top_builddir)/lib/libshadow.la
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
--chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
-+chage_LDADD = $(LDADD) $(LIBAUDIT)
- chfn_LDADD = $(LDADD) $(LIBPAM)
- chsh_LDADD = $(LDADD) $(LIBPAM)
--chpasswd_LDADD = $(LDADD) $(LIBPAM)
-+chpasswd_LDADD = $(LDADD)
- gpasswd_LDADD = $(LDADD) $(LIBAUDIT)
--groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
--groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
--groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
-+groupadd_LDADD = $(LDADD) $(LIBAUDIT)
-+groupdel_LDADD = $(LDADD) $(LIBAUDIT)
-+groupmod_LDADD = $(LDADD) $(LIBAUDIT)
- login_SOURCES = \
- login.c \
+-chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
++chage_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+ chfn_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+ chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+ chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+-chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
++chpasswd_LDADD = $(LDADD) $(LIBSELINUX)
+ gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+-groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+-groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+-groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
++groupadd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
++groupdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
++groupmod_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+ grpck_LDADD = $(LDADD) $(LIBSELINUX)
+ grpconv_LDADD = $(LDADD) $(LIBSELINUX)
+ grpunconv_LDADD = $(LDADD) $(LIBSELINUX)
+@@ -70,7 +70,7 @@
login_nopam.c
login_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
- newgrp_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
--newusers_LDADD = $(LDADD) $(LIBPAM)
-+newusers_LDADD = $(LDADD)
+ newgrp_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+-newusers_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
++newusers_LDADD = $(LDADD) $(LIBSELINUX)
nologin_LDADD =
- passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT)
- su_SOURCES = \
+ passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX)
+ pwck_LDADD = $(LDADD) $(LIBSELINUX)
+@@ -80,9 +80,9 @@
su.c \
suauth.c
su_LDADD = $(LDADD) $(LIBPAM)
--useradd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
--userdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
--usermod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT)
-+useradd_LDADD = $(LDADD) $(LIBAUDIT)
-+userdel_LDADD = $(LDADD) $(LIBAUDIT)
-+usermod_LDADD = $(LDADD) $(LIBAUDIT)
+-useradd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+-userdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+-usermod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
++useradd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
++userdel_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
++usermod_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+ vipw_LDADD = $(LDADD) $(LIBSELINUX)
install-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
Modified: trunk/debian/patches/406_good_name.dpatch
===================================================================
--- trunk/debian/patches/406_good_name.dpatch 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/406_good_name.dpatch 2006-03-08 18:36:15 UTC (rev 893)
@@ -34,10 +34,10 @@
exit 0
@DPATCH@
-Index: shadow-4.0.14/libmisc/chkname.c
+Index: shadow-4.0.15/libmisc/chkname.c
===================================================================
---- shadow-4.0.14.orig/libmisc/chkname.c 2006-01-03 08:23:47.687620491 +0100
-+++ shadow-4.0.14/libmisc/chkname.c 2006-01-03 08:25:05.090907466 +0100
+--- shadow-4.0.15.orig/libmisc/chkname.c 2006-03-08 19:32:11.412980911 +0100
++++ shadow-4.0.15/libmisc/chkname.c 2006-03-08 19:33:33.777296244 +0100
@@ -17,6 +17,7 @@
#endif
static int good_name (const char *name)
@@ -63,11 +63,11 @@
return 1;
}
-Index: shadow-4.0.14/man/useradd.8.xml
+Index: shadow-4.0.15/man/useradd.8.xml
===================================================================
---- shadow-4.0.14.orig/man/useradd.8.xml 2006-01-03 08:23:47.687620491 +0100
-+++ shadow-4.0.14/man/useradd.8.xml 2006-01-03 08:25:05.092907060 +0100
-@@ -173,6 +173,7 @@
+--- shadow-4.0.15.orig/man/useradd.8.xml 2006-03-08 19:32:11.414980506 +0100
++++ shadow-4.0.15/man/useradd.8.xml 2006-03-08 19:33:33.780295636 +0100
+@@ -174,6 +174,7 @@
valid in conjunction with the <option>-m</option> option. The
default is to not create the directory and to not copy any
files.
@@ -75,7 +75,7 @@
</para>
</listitem>
</varlistentry>
-@@ -351,9 +352,13 @@
+@@ -352,9 +353,13 @@
</para>
<para>
Modified: trunk/debian/patches/407_32char_grnames.dpatch
===================================================================
--- trunk/debian/patches/407_32char_grnames.dpatch 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/407_32char_grnames.dpatch 2006-03-08 18:36:15 UTC (rev 893)
@@ -31,10 +31,10 @@
@DPATCH@
-Index: shadow-4.0.14/libmisc/chkname.c
+Index: shadow-4.0.15/libmisc/chkname.c
===================================================================
---- shadow-4.0.14.orig/libmisc/chkname.c 2006-01-03 08:25:05.090907466 +0100
-+++ shadow-4.0.14/libmisc/chkname.c 2006-01-03 08:25:05.441836218 +0100
+--- shadow-4.0.15.orig/libmisc/chkname.c 2006-03-08 19:33:33.777296244 +0100
++++ shadow-4.0.15/libmisc/chkname.c 2006-03-08 19:33:36.412762374 +0100
@@ -66,10 +66,10 @@
int check_group_name (const char *name)
{
Modified: trunk/debian/patches/423_su_arguments_are_concatenated
===================================================================
--- trunk/debian/patches/423_su_arguments_are_concatenated 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/423_su_arguments_are_concatenated 2006-03-08 18:36:15 UTC (rev 893)
@@ -8,11 +8,11 @@
Note: the fix of the man page is still missing.
(to be taken from the trunk)
-Index: shadow-4.0.14/src/su.c
+Index: shadow-4.0.15/src/su.c
===================================================================
---- shadow-4.0.14.orig/src/su.c 2006-01-03 08:25:09.543003559 +0100
-+++ shadow-4.0.14/src/su.c 2006-01-03 08:25:09.888933325 +0100
-@@ -880,6 +880,35 @@
+--- shadow-4.0.15.orig/src/su.c 2006-03-08 19:33:18.457399619 +0100
++++ shadow-4.0.15/src/su.c 2006-03-08 19:33:53.727254950 +0100
+@@ -879,6 +879,35 @@
argv[0] = "-c";
argv[1] = command;
}
Modified: trunk/debian/patches/426_grpck_group-gshadow_members_consistency
===================================================================
--- trunk/debian/patches/426_grpck_group-gshadow_members_consistency 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/426_grpck_group-gshadow_members_consistency 2006-03-08 18:36:15 UTC (rev 893)
@@ -7,11 +7,11 @@
files (/etc/shadow for pwck or /etc/gshadow for grpck) when this entry is
present in non-shadowed file and not present in the shadowed file.
-Index: shadow-4.0.14/src/grpck.c
+Index: shadow-4.0.15/src/grpck.c
===================================================================
---- shadow-4.0.14.orig/src/grpck.c 2006-01-03 08:25:01.220693224 +0100
-+++ shadow-4.0.14/src/grpck.c 2006-01-03 08:25:05.768769841 +0100
-@@ -136,7 +136,7 @@
+--- shadow-4.0.15.orig/src/grpck.c 2006-03-08 19:33:12.227661587 +0100
++++ shadow-4.0.15/src/grpck.c 2006-03-08 19:33:37.719497666 +0100
+@@ -137,7 +137,7 @@
{
int arg;
int errors = 0;
@@ -20,7 +20,7 @@
int i;
int prune = 0;
struct commonio_entry *gre, *tgre;
-@@ -316,7 +316,7 @@
+@@ -317,7 +317,7 @@
delete_gr:
SYSLOG ((LOG_INFO, "delete group line `%s'",
gre->line));
@@ -29,7 +29,7 @@
__gr_del_entry (gre);
continue;
-@@ -401,11 +401,78 @@
+@@ -402,11 +402,78 @@
SYSLOG ((LOG_INFO, "delete member `%s' group `%s'",
grp->gr_mem[i], grp->gr_name));
@@ -109,7 +109,7 @@
}
#ifdef SHADOWGRP
-@@ -447,7 +514,7 @@
+@@ -448,7 +515,7 @@
delete_sg:
SYSLOG ((LOG_INFO, "delete shadow line `%s'",
sge->line));
@@ -118,7 +118,7 @@
__sgr_del_entry (sge);
continue;
-@@ -498,12 +565,32 @@
+@@ -499,12 +566,32 @@
/*
* Make sure this entry exists in the /etc/group file.
*/
@@ -153,7 +153,7 @@
}
/*
-@@ -529,7 +616,7 @@
+@@ -530,7 +617,7 @@
SYSLOG ((LOG_INFO,
"delete admin `%s' from shadow group `%s'",
sgr->sg_adm[i], sgr->sg_name));
@@ -162,7 +162,7 @@
delete_member (sgr->sg_adm, sgr->sg_adm[i]);
sge->changed = 1;
__sgr_set_changed ();
-@@ -556,7 +643,7 @@
+@@ -557,7 +644,7 @@
SYSLOG ((LOG_INFO,
"delete member `%s' from shadow group `%s'",
sgr->sg_mem[i], sgr->sg_name));
@@ -171,7 +171,7 @@
delete_member (sgr->sg_mem, sgr->sg_mem[i]);
sge->changed = 1;
__sgr_set_changed ();
-@@ -567,10 +654,10 @@
+@@ -568,10 +655,10 @@
#endif /* SHADOWGRP */
/*
@@ -184,7 +184,7 @@
write_and_bye:
if (!gr_close ()) {
fprintf (stderr, _("%s: cannot update file %s\n"),
-@@ -601,7 +688,7 @@
+@@ -602,7 +689,7 @@
* Tell the user what we did and exit.
*/
if (errors)
@@ -193,19 +193,19 @@
_("%s: the files have been updated\n") :
_("%s: no changes\n"), Prog);
-Index: shadow-4.0.14/src/pwck.c
+Index: shadow-4.0.15/src/pwck.c
===================================================================
---- shadow-4.0.14.orig/src/pwck.c 2006-01-03 08:23:47.597638755 +0100
-+++ shadow-4.0.14/src/pwck.c 2006-01-03 08:25:05.769769638 +0100
+--- shadow-4.0.15.orig/src/pwck.c 2006-03-08 19:32:11.059052606 +0100
++++ shadow-4.0.15/src/pwck.c 2006-03-08 19:33:37.722497059 +0100
@@ -41,6 +41,7 @@
#include "prototypes.h"
#include "pwio.h"
#include "shadowio.h"
+#include "getdef.h"
+ #include "nscd.h"
extern void __pw_del_entry (const struct commonio_entry *);
extern struct commonio_entry *__pw_get_head (void);
-
-@@ -115,7 +116,7 @@
+@@ -116,7 +117,7 @@
{
int arg;
int errors = 0;
@@ -214,7 +214,7 @@
struct commonio_entry *pfe, *tpfe;
struct passwd *pwd;
int sort_mode = 0;
-@@ -271,7 +272,7 @@
+@@ -272,7 +273,7 @@
delete_pw:
SYSLOG ((LOG_INFO, "delete passwd line `%s'",
pfe->line));
@@ -223,7 +223,7 @@
__pw_del_entry (pfe);
continue;
-@@ -366,6 +367,55 @@
+@@ -367,6 +368,55 @@
pwd->pw_name, pwd->pw_shell);
errors++;
}
@@ -279,7 +279,7 @@
}
if (!is_shadow)
-@@ -376,6 +426,13 @@
+@@ -377,6 +427,13 @@
*/
for (spe = __spw_get_head (); spe; spe = spe->next) {
/*
@@ -293,7 +293,7 @@
* If this is a NIS line, skip it. You can't "know" what NIS
* is going to do without directly asking NIS ...
*/
-@@ -411,7 +468,7 @@
+@@ -412,7 +469,7 @@
delete_spw:
SYSLOG ((LOG_INFO, "delete shadow line `%s'",
spe->line));
@@ -302,7 +302,7 @@
__spw_del_entry (spe);
continue;
-@@ -467,7 +524,8 @@
+@@ -468,7 +525,8 @@
* Tell the user this entry has no matching
* /etc/passwd entry and ask them to delete it.
*/
@@ -312,7 +312,7 @@
printf (_("delete line `%s'? "), spe->line);
errors++;
-@@ -492,10 +550,10 @@
+@@ -493,10 +551,10 @@
shadow_done:
/*
@@ -325,7 +325,7 @@
write_and_bye:
if (!pw_close ()) {
fprintf (stderr, _("%s: cannot update file %s\n"),
-@@ -526,7 +584,7 @@
+@@ -527,7 +585,7 @@
* Tell the user what we did and exit.
*/
if (errors)
Modified: trunk/debian/patches/428_grpck_add_prune_option
===================================================================
--- trunk/debian/patches/428_grpck_add_prune_option 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/428_grpck_add_prune_option 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,11 +5,11 @@
Status wrt upstream: It could certainly be submitted to upstream.
-Index: shadow-4.0.14/src/grpck.c
+Index: shadow-4.0.15/src/grpck.c
===================================================================
---- shadow-4.0.14.orig/src/grpck.c 2006-01-03 08:23:48.216513139 +0100
-+++ shadow-4.0.14/src/grpck.c 2006-01-03 08:25:01.220693224 +0100
-@@ -138,6 +138,7 @@
+--- shadow-4.0.15.orig/src/grpck.c 2006-03-08 19:32:13.636530483 +0100
++++ shadow-4.0.15/src/grpck.c 2006-03-08 19:33:12.227661587 +0100
+@@ -139,6 +139,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;
-@@ -162,7 +163,7 @@
+@@ -163,7 +164,7 @@
/*
* Parse the command line arguments
*/
@@ -26,7 +26,7 @@
switch (arg) {
case 'q':
/* quiet - ignored for now */
-@@ -173,6 +174,9 @@
+@@ -174,6 +175,9 @@
case 's':
sort_mode = 1;
break;
@@ -36,7 +36,7 @@
default:
usage ();
}
-@@ -295,8 +299,13 @@
+@@ -296,8 +300,13 @@
/*
* prompt the user to delete the entry or not
*/
Modified: trunk/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- trunk/debian/patches/429_login_FAILLOG_ENAB 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/429_login_FAILLOG_ENAB 2006-03-08 18:36:15 UTC (rev 893)
@@ -7,11 +7,11 @@
Note: It could be removed if pam_tally could report the number of failures
preceding a successful login.
-Index: shadow-4.0.14/src/login.c
+Index: shadow-4.0.15/src/login.c
===================================================================
---- shadow-4.0.14.orig/src/login.c 2006-01-03 08:25:02.262481714 +0100
-+++ shadow-4.0.14/src/login.c 2006-01-03 08:25:02.607411684 +0100
-@@ -129,11 +129,11 @@
+--- shadow-4.0.15.orig/src/login.c 2006-03-08 19:33:14.653170248 +0100
++++ shadow-4.0.15/src/login.c 2006-03-08 19:33:15.924912629 +0100
+@@ -130,11 +130,11 @@
static void setup_tty (void);
static void check_flags (int, char *const *);
@@ -25,7 +25,7 @@
static void bad_time_notify (void);
static void check_nologin (void);
#endif
-@@ -663,6 +663,8 @@
+@@ -668,6 +668,8 @@
SYSLOG ((LOG_NOTICE,
"TOO MANY LOGIN TRIES (%d)%s FOR `%s'",
failcount, fromhost, failent_user));
@@ -34,7 +34,7 @@
fprintf(stderr,
_("Maximum number of tries exceeded (%d)\n"),
failcount);
-@@ -680,6 +682,13 @@
+@@ -685,6 +687,13 @@
pam_strerror (pamh, retcode)));
failed = 1;
}
@@ -48,7 +48,7 @@
if (!failed)
break;
-@@ -711,6 +720,8 @@
+@@ -716,6 +725,8 @@
#endif /* WITH_AUDIT */
fprintf(stderr,"\nLogin incorrect\n");
@@ -57,7 +57,7 @@
if (getdef_str("FTMP_FILE") != NULL) {
#if HAVE_UTMPX_H
failent = utxent;
-@@ -1071,6 +1082,7 @@
+@@ -1076,6 +1087,7 @@
*/
#ifndef USE_PAM
motd (); /* print the message of the day */
@@ -65,7 +65,7 @@
if (getdef_bool ("FAILLOG_ENAB")
&& faillog.fail_cnt != 0) {
failprint (&faillog);
-@@ -1084,6 +1096,7 @@
+@@ -1089,6 +1101,7 @@
username, (int) faillog.fail_cnt));
}
}
@@ -73,10 +73,10 @@
if (getdef_bool ("LASTLOG_ENAB")
&& lastlog.ll_time != 0) {
time_t ll_time = lastlog.ll_time;
-Index: shadow-4.0.14/lib/getdef.c
+Index: shadow-4.0.15/lib/getdef.c
===================================================================
---- shadow-4.0.14.orig/lib/getdef.c 2006-01-03 08:25:02.263481511 +0100
-+++ shadow-4.0.14/lib/getdef.c 2006-01-03 08:25:02.608411481 +0100
+--- shadow-4.0.15.orig/lib/getdef.c 2006-03-08 19:33:14.656169640 +0100
++++ shadow-4.0.15/lib/getdef.c 2006-03-08 19:33:15.927912021 +0100
@@ -56,6 +56,7 @@
{"ENV_SUPATH", NULL},
{"ERASECHAR", NULL},
Modified: trunk/debian/patches/431_su_uid_0_not_root
===================================================================
--- trunk/debian/patches/431_su_uid_0_not_root 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/431_su_uid_0_not_root 2006-03-08 18:36:15 UTC (rev 893)
@@ -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.14/src/su.c
+Index: shadow-4.0.15/src/su.c
===================================================================
---- shadow-4.0.14.orig/src/su.c 2006-01-03 08:23:48.395476814 +0100
-+++ shadow-4.0.14/src/su.c 2006-01-03 08:24:59.924956291 +0100
-@@ -420,7 +420,14 @@
+--- shadow-4.0.15.orig/src/su.c 2006-03-08 19:32:14.295397015 +0100
++++ shadow-4.0.15/src/su.c 2006-03-08 19:33:08.617392925 +0100
+@@ -424,7 +424,14 @@
optind++;
}
if (!name[0]) /* use default user ID */
@@ -25,4 +25,4 @@
+ }
doshell = argc == optind; /* any arguments remaining? */
-
+ if (command)
Modified: trunk/debian/patches/432_login_cancel_timout_after_authentication
===================================================================
--- trunk/debian/patches/432_login_cancel_timout_after_authentication 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/432_login_cancel_timout_after_authentication 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,11 +5,11 @@
Status wrt upstream: It should be forwarded to upstream.
-Index: shadow-4.0.14/src/login.c
+Index: shadow-4.0.15/src/login.c
===================================================================
---- shadow-4.0.14.orig/src/login.c 2006-01-03 08:25:02.607411684 +0100
-+++ shadow-4.0.14/src/login.c 2006-01-03 08:25:02.951341857 +0100
-@@ -742,6 +742,7 @@
+--- shadow-4.0.15.orig/src/login.c 2006-03-08 19:33:15.924912629 +0100
++++ shadow-4.0.15/src/login.c 2006-03-08 19:33:17.240646099 +0100
+@@ -747,6 +747,7 @@
}
/* We don't get here unless they were authenticated above */
Modified: trunk/debian/patches/433_shadow.5-typo_312430
===================================================================
--- trunk/debian/patches/433_shadow.5-typo_312430 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/433_shadow.5-typo_312430 2006-03-08 18:36:15 UTC (rev 893)
@@ -3,10 +3,10 @@
Status wrt upstream: Forwarded but not applied yet
-Index: shadow-4.0.14/man/shadow.5.xml
+Index: shadow-4.0.15/man/shadow.5.xml
===================================================================
---- shadow-4.0.14.orig/man/shadow.5.xml 2006-01-03 08:23:47.895578281 +0100
-+++ shadow-4.0.14/man/shadow.5.xml 2006-01-03 08:25:03.620206059 +0100
+--- shadow-4.0.15.orig/man/shadow.5.xml 2006-03-08 19:32:12.315798026 +0100
++++ shadow-4.0.15/man/shadow.5.xml 2006-03-08 19:33:19.743139165 +0100
@@ -52,7 +52,7 @@
<para>
Modified: trunk/debian/patches/434_login_stop_checking_args_after--
===================================================================
--- trunk/debian/patches/434_login_stop_checking_args_after-- 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/434_login_stop_checking_args_after-- 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,11 +5,11 @@
Upstream comment: "Better will be rewrite login
for use getopt_long()."
-Index: shadow-4.0.14/src/login.c
+Index: shadow-4.0.15/src/login.c
===================================================================
---- shadow-4.0.14.orig/src/login.c 2006-01-03 08:23:48.172522068 +0100
-+++ shadow-4.0.14/src/login.c 2006-01-03 08:25:01.557624818 +0100
-@@ -252,6 +252,8 @@
+--- shadow-4.0.15.orig/src/login.c 2006-03-08 19:32:13.422573824 +0100
++++ shadow-4.0.15/src/login.c 2006-03-08 19:33:13.424419158 +0100
+@@ -253,6 +253,8 @@
for (arg = 1; arg < argc; arg++) {
if (argv[arg][0] == '-' && strlen (argv[arg]) > 2)
usage ();
Modified: trunk/debian/patches/438_su_GNU_origin
===================================================================
--- trunk/debian/patches/438_su_GNU_origin 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/438_su_GNU_origin 2006-03-08 18:36:15 UTC (rev 893)
@@ -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.14/src/su.c
+Index: shadow-4.0.15/src/su.c
===================================================================
---- shadow-4.0.14.orig/src/su.c 2006-01-03 08:25:00.899758382 +0100
-+++ shadow-4.0.14/src/su.c 2006-01-03 08:25:03.284274262 +0100
+--- shadow-4.0.15.orig/src/su.c 2006-03-08 19:33:11.024905231 +0100
++++ shadow-4.0.15/src/su.c 2006-03-08 19:33:18.457399619 +0100
@@ -26,6 +26,24 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
Modified: trunk/debian/patches/451_login_PATH
===================================================================
--- trunk/debian/patches/451_login_PATH 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/451_login_PATH 2006-03-08 18:36:15 UTC (rev 893)
@@ -4,10 +4,10 @@
Status wrt upstream:
-Index: shadow-4.0.14/libmisc/setupenv.c
+Index: shadow-4.0.15/libmisc/setupenv.c
===================================================================
---- shadow-4.0.14.orig/libmisc/setupenv.c 2006-01-03 08:23:47.500658440 +0100
-+++ shadow-4.0.14/libmisc/setupenv.c 2006-01-03 08:25:06.461629171 +0100
+--- shadow-4.0.15.orig/libmisc/setupenv.c 2006-03-08 19:32:10.692126935 +0100
++++ shadow-4.0.15/libmisc/setupenv.c 2006-03-08 19:33:40.256983644 +0100
@@ -242,7 +242,6 @@
addenv ("USER", info->pw_name);
addenv ("LOGNAME", info->pw_name);
Modified: trunk/debian/patches/452_doc_password_check_order
===================================================================
--- trunk/debian/patches/452_doc_password_check_order 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/452_doc_password_check_order 2006-03-08 18:36:15 UTC (rev 893)
@@ -3,15 +3,15 @@
Status wrt upstream: Proposed but not applied yet
-Index: shadow-4.0.14/man/passwd.1.xml
+Index: shadow-4.0.15/man/passwd.1.xml
===================================================================
---- shadow-4.0.14.orig/man/passwd.1.xml 2006-01-03 08:23:47.457667166 +0100
-+++ shadow-4.0.14/man/passwd.1.xml 2006-01-03 08:25:06.786563200 +0100
-@@ -65,10 +65,16 @@
+--- shadow-4.0.15.orig/man/passwd.1.xml 2006-03-08 19:32:10.569151846 +0100
++++ shadow-4.0.15/man/passwd.1.xml 2006-03-08 19:33:41.446742632 +0100
+@@ -52,10 +52,16 @@
</para>
<para>
-- The user is then prompted for a replacement password. This password
+- The user is then prompted for a replacement password. This password
- is tested for complexity. As a general guideline, passwords should
- consist of 6 to 8 characters including one or more from each of
- following sets:
@@ -28,14 +28,14 @@
</para>
<itemizedlist mark='bullet'>
-@@ -89,11 +95,6 @@
+@@ -76,11 +82,6 @@
is not suitably complex.
</para>
-- <para>If the password is accepted, <command>passwd</command> will
-- prompt again and compare the second entry against the first. Both
-- entries are required to match in order for the password to be
-- changed.
+- <para>
+- If the password is accepted, <command>passwd</command> will prompt
+- again and compare the second entry against the first. Both entries
+- are required to match in order for the password to be changed.
- </para>
</refsect2>
Modified: trunk/debian/patches/454_userdel_no_MAIL_FILE
===================================================================
--- trunk/debian/patches/454_userdel_no_MAIL_FILE 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/454_userdel_no_MAIL_FILE 2006-03-08 18:36:15 UTC (rev 893)
@@ -6,11 +6,11 @@
Note: usermod should be checked also. Maybe MAIL_FILE can be removed from
login.defs
-Index: shadow-4.0.14/src/userdel.c
+Index: shadow-4.0.15/src/userdel.c
===================================================================
---- shadow-4.0.14.orig/src/userdel.c 2006-01-03 08:25:04.312065593 +0100
-+++ shadow-4.0.14/src/userdel.c 2006-01-03 08:25:07.111497228 +0100
-@@ -613,7 +613,7 @@
+--- shadow-4.0.15.orig/src/userdel.c 2006-03-08 19:33:24.695136031 +0100
++++ shadow-4.0.15/src/userdel.c 2006-03-08 19:33:42.637501419 +0100
+@@ -547,7 +547,7 @@
maildir = getdef_str ("MAIL_DIR");
#ifdef MAIL_SPOOL_DIR
Modified: trunk/debian/patches/461_keep_sticky_bit_for_dirs
===================================================================
--- trunk/debian/patches/461_keep_sticky_bit_for_dirs 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/461_keep_sticky_bit_for_dirs 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,10 +5,10 @@
Status wrt upstream: Forwarded but not applied yet
-Index: shadow-4.0.13/libmisc/copydir.c
+Index: shadow-4.0.15/libmisc/copydir.c
===================================================================
---- shadow-4.0.13.orig/libmisc/copydir.c 2005-10-27 15:02:29.379978864 +0200
-+++ shadow-4.0.13/libmisc/copydir.c 2005-10-27 15:00:43.179123848 +0200
+--- shadow-4.0.15.orig/libmisc/copydir.c 2006-03-08 19:32:10.102246428 +0100
++++ shadow-4.0.15/libmisc/copydir.c 2006-03-08 19:33:45.042014333 +0100
@@ -225,10 +225,11 @@
#ifdef WITH_SELINUX
selinux_file_context (dst_name);
Modified: trunk/debian/patches/462_warn_to_edit_shadow
===================================================================
--- trunk/debian/patches/462_warn_to_edit_shadow 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/462_warn_to_edit_shadow 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,10 +5,10 @@
Status wrt upstream: Forwarded but not applied yet
-Index: shadow-4.0.14/src/vipw.c
+Index: shadow-4.0.15/src/vipw.c
===================================================================
---- shadow-4.0.14.orig/src/vipw.c 2005-12-13 15:01:08.000000000 +0100
-+++ shadow-4.0.14/src/vipw.c 2006-01-11 00:47:25.000000000 +0100
+--- shadow-4.0.15.orig/src/vipw.c 2006-03-08 19:32:09.889289567 +0100
++++ shadow-4.0.15/src/vipw.c 2006-03-08 19:33:46.246770283 +0100
@@ -41,6 +41,12 @@
#include "pwio.h"
#include "sgroupio.h"
@@ -22,7 +22,7 @@
/*
* Global variables
*/
-@@ -285,17 +291,39 @@
+@@ -284,17 +290,39 @@
}
if (do_vipw) {
Modified: trunk/debian/patches/463_login_delay_obeys_to_PAM
===================================================================
--- trunk/debian/patches/463_login_delay_obeys_to_PAM 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/463_login_delay_obeys_to_PAM 2006-03-08 18:36:15 UTC (rev 893)
@@ -7,11 +7,11 @@
Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs
-Index: shadow-4.0.14/src/login.c
+Index: shadow-4.0.15/src/login.c
===================================================================
---- shadow-4.0.14.orig/src/login.c 2006-01-11 00:03:20.000000000 +0100
-+++ shadow-4.0.14/src/login.c 2006-01-11 01:07:23.000000000 +0100
-@@ -327,7 +327,6 @@
+--- shadow-4.0.15.orig/src/login.c 2006-03-08 19:33:17.240646099 +0100
++++ shadow-4.0.15/src/login.c 2006-03-08 19:33:47.443527854 +0100
+@@ -331,7 +331,6 @@
char ptime[80];
#endif
int reason = PW_LOGIN;
@@ -19,7 +19,7 @@
int retries;
int failed;
int flag;
-@@ -346,6 +345,7 @@
+@@ -351,6 +350,7 @@
pid_t child;
char *pam_user;
#else
@@ -27,7 +27,7 @@
struct spwd *spwd = NULL;
#endif
/*
-@@ -568,7 +568,6 @@
+@@ -573,7 +573,6 @@
alarm (timeout);
environ = newenvp; /* make new environment active */
@@ -35,7 +35,7 @@
retries = getdef_num ("LOGIN_RETRIES", RETRIES);
#ifdef USE_PAM
-@@ -584,17 +583,12 @@
+@@ -589,17 +588,12 @@
/*
* hostname & tty are either set to NULL or their correct values,
@@ -54,7 +54,7 @@
/* if fflg == 1, then the user has already been authenticated */
if (!fflg || (getuid () != 0)) {
int failcount = 0;
-@@ -635,8 +629,6 @@
+@@ -640,8 +634,6 @@
failed = 0;
failcount++;
@@ -63,7 +63,7 @@
retcode = pam_authenticate (pamh, 0);
-@@ -931,13 +923,16 @@
+@@ -936,13 +928,16 @@
if (pwent.pw_passwd[0] == '\0')
pw_auth ("!", username, reason, (char *) 0);
@@ -80,10 +80,10 @@
puts (_("Login incorrect"));
-Index: shadow-4.0.14/lib/getdef.c
+Index: shadow-4.0.15/lib/getdef.c
===================================================================
---- shadow-4.0.14.orig/lib/getdef.c 2006-01-11 00:03:20.000000000 +0100
-+++ shadow-4.0.14/lib/getdef.c 2006-01-11 01:07:15.000000000 +0100
+--- shadow-4.0.15.orig/lib/getdef.c 2006-03-08 19:33:15.927912021 +0100
++++ shadow-4.0.15/lib/getdef.c 2006-03-08 19:33:47.446527247 +0100
@@ -55,7 +55,6 @@
{"ENV_PATH", NULL},
{"ENV_SUPATH", NULL},
Modified: trunk/debian/patches/466_fflush-prompt
===================================================================
--- trunk/debian/patches/466_fflush-prompt 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/466_fflush-prompt 2006-03-08 18:36:15 UTC (rev 893)
@@ -3,10 +3,10 @@
Status wrt upstream: may appear in 4.0.14
-Index: shadow-4.0.14/libmisc/Makefile.am
+Index: shadow-4.0.15/libmisc/Makefile.am
===================================================================
---- shadow-4.0.14.orig/libmisc/Makefile.am 2006-01-03 08:23:47.281702882 +0100
-+++ shadow-4.0.14/libmisc/Makefile.am 2006-01-03 08:25:08.108294849 +0100
+--- shadow-4.0.15.orig/libmisc/Makefile.am 2006-03-08 19:32:09.500368352 +0100
++++ shadow-4.0.15/libmisc/Makefile.am 2006-03-08 19:33:49.240163907 +0100
@@ -49,4 +49,5 @@
ulimit.c \
utmp.c \
@@ -14,10 +14,10 @@
- xmalloc.c
+ xmalloc.c \
+ yesno.c
-Index: shadow-4.0.14/libmisc/fields.c
+Index: shadow-4.0.15/libmisc/fields.c
===================================================================
---- shadow-4.0.14.orig/libmisc/fields.c 2006-01-03 08:23:47.281702882 +0100
-+++ shadow-4.0.14/libmisc/fields.c 2006-01-03 08:25:08.109294646 +0100
+--- shadow-4.0.15.orig/libmisc/fields.c 2006-03-08 19:32:09.501368149 +0100
++++ shadow-4.0.15/libmisc/fields.c 2006-03-08 19:33:49.242163502 +0100
@@ -71,6 +71,7 @@
maxsize = sizeof (newf);
@@ -26,10 +26,10 @@
if (fgets (newf, maxsize, stdin) != newf)
return;
-Index: shadow-4.0.14/libmisc/yesno.c
+Index: shadow-4.0.15/libmisc/yesno.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.14/libmisc/yesno.c 2006-01-03 08:25:08.109294646 +0100
++++ shadow-4.0.15/libmisc/yesno.c 2006-03-08 19:33:49.243163299 +0100
@@ -0,0 +1,41 @@
+/*
+ * Common code for yes/no prompting
@@ -72,11 +72,11 @@
+
+ return 0;
+}
-Index: shadow-4.0.14/src/grpck.c
+Index: shadow-4.0.15/src/grpck.c
===================================================================
---- shadow-4.0.14.orig/src/grpck.c 2006-01-03 08:25:05.768769841 +0100
-+++ shadow-4.0.14/src/grpck.c 2006-01-03 08:25:08.110294443 +0100
-@@ -49,6 +49,8 @@
+--- shadow-4.0.15.orig/src/grpck.c 2006-03-08 19:33:37.719497666 +0100
++++ shadow-4.0.15/src/grpck.c 2006-03-08 19:33:49.248162287 +0100
+@@ -50,6 +50,8 @@
extern struct commonio_entry *__sgr_get_head (void);
#endif
@@ -85,7 +85,7 @@
/*
* Exit codes
*/
-@@ -73,7 +75,6 @@
+@@ -74,7 +76,6 @@
/* local function prototypes */
static void usage (void);
@@ -93,7 +93,7 @@
static void delete_member (char **, const char *);
/*
-@@ -90,30 +91,6 @@
+@@ -91,30 +92,6 @@
}
/*
@@ -124,7 +124,7 @@
* delete_member - delete an entry in a list of members
*/
static void delete_member (char **list, const char *member)
-@@ -300,7 +277,7 @@
+@@ -301,7 +278,7 @@
* prompt the user to delete the entry or not
*/
if (!prune) {
@@ -133,7 +133,7 @@
continue;
} else {
puts (_("Yes"));
-@@ -360,7 +337,7 @@
+@@ -361,7 +338,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -142,7 +142,7 @@
goto delete_gr;
}
-@@ -396,7 +373,7 @@
+@@ -397,7 +374,7 @@
grp->gr_name, grp->gr_mem[i]);
printf (_("delete member `%s'? "), grp->gr_mem[i]);
@@ -151,7 +151,7 @@
continue;
SYSLOG ((LOG_INFO, "delete member `%s' group `%s'",
-@@ -420,7 +397,7 @@
+@@ -421,7 +398,7 @@
printf (_("add group `%s' in %s? "),
grp->gr_name, sgr_file);
errors++;
@@ -160,7 +160,7 @@
{
struct sgrp sg;
struct group gr;
-@@ -502,7 +479,7 @@
+@@ -503,7 +480,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -169,7 +169,7 @@
continue;
/*
-@@ -558,7 +535,7 @@
+@@ -559,7 +536,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -178,7 +178,7 @@
goto delete_sg;
}
-@@ -570,7 +547,7 @@
+@@ -571,7 +548,7 @@
printf (_("no matching group file entry in %s\n"), grp_file);
printf (_("delete line `%s'? "), sge->line);
errors++;
@@ -187,7 +187,7 @@
goto delete_sg;
} else {
/**
-@@ -610,7 +587,7 @@
+@@ -611,7 +588,7 @@
printf (_("delete administrative member `%s'? "),
sgr->sg_adm[i]);
@@ -196,7 +196,7 @@
continue;
SYSLOG ((LOG_INFO,
-@@ -637,7 +614,7 @@
+@@ -638,7 +615,7 @@
sgr->sg_name, sgr->sg_mem[i]);
printf (_("delete member `%s'? "), sgr->sg_mem[i]);
@@ -205,11 +205,11 @@
continue;
SYSLOG ((LOG_INFO,
-Index: shadow-4.0.14/src/pwck.c
+Index: shadow-4.0.15/src/pwck.c
===================================================================
---- shadow-4.0.14.orig/src/pwck.c 2006-01-03 08:25:05.769769638 +0100
-+++ shadow-4.0.14/src/pwck.c 2006-01-03 08:25:08.111294240 +0100
-@@ -48,6 +48,8 @@
+--- shadow-4.0.15.orig/src/pwck.c 2006-03-08 19:33:37.722497059 +0100
++++ shadow-4.0.15/src/pwck.c 2006-03-08 19:33:49.251161679 +0100
+@@ -49,6 +49,8 @@
extern void __spw_del_entry (const struct commonio_entry *);
extern struct commonio_entry *__spw_get_head (void);
@@ -218,7 +218,7 @@
/*
* Exit codes
*/
-@@ -72,7 +74,6 @@
+@@ -73,7 +75,6 @@
/* local function prototypes */
static void usage (void);
@@ -226,7 +226,7 @@
/*
* usage - print syntax message and exit
-@@ -85,31 +86,6 @@
+@@ -86,31 +87,6 @@
}
/*
@@ -258,7 +258,7 @@
* pwck - verify password file integrity
*/
int main (int argc, char **argv)
-@@ -260,7 +236,7 @@
+@@ -261,7 +237,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -267,7 +267,7 @@
continue;
/*
-@@ -315,7 +291,7 @@
+@@ -316,7 +292,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -276,7 +276,7 @@
goto delete_pw;
}
-@@ -456,7 +432,7 @@
+@@ -457,7 +433,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -285,7 +285,7 @@
continue;
/*
-@@ -511,7 +487,7 @@
+@@ -512,7 +488,7 @@
/*
* prompt the user to delete the entry or not
*/
@@ -294,7 +294,7 @@
goto delete_spw;
}
-@@ -532,7 +508,7 @@
+@@ -533,7 +509,7 @@
/*
* prompt the user to delete the entry or not
*/
Modified: trunk/debian/patches/468_duplicate_passwd_struct_before_usage
===================================================================
--- trunk/debian/patches/468_duplicate_passwd_struct_before_usage 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/468_duplicate_passwd_struct_before_usage 2006-03-08 18:36:15 UTC (rev 893)
@@ -27,10 +27,10 @@
Status wrt upstream:
-Index: shadow-4.0.14/src/chfn.c
+Index: shadow-4.0.15/src/chfn.c
===================================================================
---- shadow-4.0.14.orig/src/chfn.c 2006-01-03 08:23:47.226714043 +0100
-+++ shadow-4.0.14/src/chfn.c 2006-01-03 08:25:08.500215277 +0100
+--- shadow-4.0.15.orig/src/chfn.c 2006-03-08 19:32:09.341400554 +0100
++++ shadow-4.0.15/src/chfn.c 2006-03-08 19:33:50.683871453 +0100
@@ -334,6 +334,11 @@
}
user = xstrdup (pw->pw_name);
@@ -43,11 +43,11 @@
#ifdef USE_NIS
/*
-Index: shadow-4.0.14/src/chsh.c
+Index: shadow-4.0.15/src/chsh.c
===================================================================
---- shadow-4.0.14.orig/src/chsh.c 2006-01-03 08:23:47.226714043 +0100
-+++ shadow-4.0.14/src/chsh.c 2006-01-03 08:25:08.501215074 +0100
-@@ -245,6 +245,11 @@
+--- shadow-4.0.15.orig/src/chsh.c 2006-03-08 19:32:09.342400351 +0100
++++ shadow-4.0.15/src/chsh.c 2006-03-08 19:33:50.686870845 +0100
+@@ -246,6 +246,11 @@
}
user = xstrdup (pw->pw_name);
}
Modified: trunk/debian/patches/479_chowntty_debug
===================================================================
--- trunk/debian/patches/479_chowntty_debug 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/479_chowntty_debug 2006-03-08 18:36:15 UTC (rev 893)
@@ -13,10 +13,10 @@
is_my_tty() which is failing for a reason yet unknown (I suspect
corruption of utmp file).
-Index: shadow-4.0.14/libmisc/chowntty.c
+Index: shadow-4.0.15/libmisc/chowntty.c
===================================================================
---- shadow-4.0.14.orig/libmisc/chowntty.c 2005-08-31 20:24:57.000000000 +0300
-+++ shadow-4.0.14/libmisc/chowntty.c 2006-01-07 21:13:17.000000000 +0200
+--- shadow-4.0.15.orig/libmisc/chowntty.c 2006-03-08 19:32:08.968476098 +0100
++++ shadow-4.0.15/libmisc/chowntty.c 2006-03-08 19:33:57.836422550 +0100
@@ -40,6 +40,7 @@
#include "defines.h"
#include <pwd.h>
Modified: trunk/debian/patches/480_getopt_args_reorder
===================================================================
--- trunk/debian/patches/480_getopt_args_reorder 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/480_getopt_args_reorder 2006-03-08 18:36:15 UTC (rev 893)
@@ -15,11 +15,11 @@
case (a -- would have to be added for all the su -c "command"
invocations).
-Index: shadow-4.0.14/src/su.c
+Index: shadow-4.0.15/src/su.c
===================================================================
---- shadow-4.0.14.orig/src/su.c 2006-01-08 15:40:36.000000000 +0100
-+++ shadow-4.0.14/src/su.c 2006-01-08 16:03:07.000000000 +0100
-@@ -357,19 +357,9 @@
+--- shadow-4.0.15.orig/src/su.c 2006-03-08 19:33:53.727254950 +0100
++++ shadow-4.0.15/src/su.c 2006-03-08 19:34:01.148751566 +0100
+@@ -356,19 +356,9 @@
};
while ((c =
@@ -38,9 +38,9 @@
- goto end_su_options;
- break; /* NOT REACHED */
case 'c':
- command = optarg;
- break;
-@@ -391,10 +381,9 @@
+ command = optarg;
+ break;
+@@ -390,10 +380,9 @@
shellstr = optarg;
break;
default:
Modified: trunk/debian/patches/482_libmisc_copydir_check_return_values
===================================================================
--- trunk/debian/patches/482_libmisc_copydir_check_return_values 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/482_libmisc_copydir_check_return_values 2006-03-08 18:36:15 UTC (rev 893)
@@ -2,10 +2,10 @@
Status wrt upstream: not reported yet
-Index: shadow-4.0.14/libmisc/copydir.c
+Index: shadow-4.0.15/libmisc/copydir.c
===================================================================
---- shadow-4.0.14.orig/libmisc/copydir.c 2006-01-11 21:31:39.000000000 +0100
-+++ shadow-4.0.14/libmisc/copydir.c 2006-01-11 21:58:44.000000000 +0100
+--- shadow-4.0.15.orig/libmisc/copydir.c 2006-03-08 19:33:45.042014333 +0100
++++ shadow-4.0.15/libmisc/copydir.c 2006-03-08 19:34:05.358898710 +0100
@@ -225,13 +225,12 @@
#ifdef WITH_SELINUX
selinux_file_context (dst_name);
Modified: trunk/debian/patches/483_su_fakelogin_wrong_arg0
===================================================================
--- trunk/debian/patches/483_su_fakelogin_wrong_arg0 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/483_su_fakelogin_wrong_arg0 2006-03-08 18:36:15 UTC (rev 893)
@@ -2,16 +2,16 @@
Status wrt upstream: not reported yet
-Index: shadow-4.0.14/src/su.c
+Index: shadow-4.0.15/src/su.c
===================================================================
---- shadow-4.0.14.orig/src/su.c 2006-01-12 14:35:45.000000000 +0100
-+++ shadow-4.0.14/src/su.c 2006-01-12 14:41:10.000000000 +0100
-@@ -902,7 +902,7 @@
+--- shadow-4.0.15.orig/src/su.c 2006-03-08 19:34:01.148751566 +0100
++++ shadow-4.0.15/src/su.c 2006-03-08 19:34:07.254514712 +0100
+@@ -901,7 +901,7 @@
* Use the shell and create an argv
* with the rest of the command line included.
*/
- argv[-1] = shellstr;
+ argv[-1] = cp;
#ifndef USE_PAM
- (void) execv (shellstr, &argv[-1]);
- #else
+ (void) execve (shellstr, &argv[-1], environ);
+ err = errno;
Modified: trunk/debian/patches/484_su-p_preserve_PATH
===================================================================
--- trunk/debian/patches/484_su-p_preserve_PATH 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/484_su-p_preserve_PATH 2006-03-08 18:36:15 UTC (rev 893)
@@ -9,7 +9,7 @@
Patch replaces shell() calls in su.c with shelle() ones, which explicitly
pass environment as 3rd parameter.
-Status wrt upstream: reported, but not yet accepted.
+Status wrt upstream: will be in 4.0.15
Note: On Linux, shell() doesn't provide anything significant. Just an
execv could be simplier.
Modified: trunk/debian/patches/491_configure.in_friendly_selinux_detection
===================================================================
--- trunk/debian/patches/491_configure.in_friendly_selinux_detection 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/491_configure.in_friendly_selinux_detection 2006-03-08 18:36:15 UTC (rev 893)
@@ -7,10 +7,10 @@
Status wrt upstream: reported by Mike, not applied yet
-Index: shadow-4.0.14/configure.in
+Index: shadow-4.0.15/configure.in
===================================================================
---- shadow-4.0.14.orig/configure.in 2006-01-03 00:51:44.000000000 +0100
-+++ shadow-4.0.14/configure.in 2006-02-09 21:38:45.000000000 +0100
+--- shadow-4.0.15.orig/configure.in 2006-03-08 19:32:08.271617262 +0100
++++ shadow-4.0.15/configure.in 2006-03-08 19:34:08.776206461 +0100
@@ -226,7 +226,7 @@
[with_libpam=$withval], [with_libpam=yes])
AC_ARG_WITH(selinux,
Modified: trunk/debian/patches/501_commonio_group_shadow
===================================================================
--- trunk/debian/patches/501_commonio_group_shadow 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/501_commonio_group_shadow 2006-03-08 18:36:15 UTC (rev 893)
@@ -2,10 +2,10 @@
Fixes: #166793
-Index: shadow-4.0.14/lib/commonio.c
+Index: shadow-4.0.15/lib/commonio.c
===================================================================
---- shadow-4.0.14.orig/lib/commonio.c 2006-01-03 08:23:47.372684415 +0100
-+++ shadow-4.0.14/lib/commonio.c 2006-01-03 08:25:07.454427603 +0100
+--- shadow-4.0.15.orig/lib/commonio.c 2006-03-08 19:32:10.229220707 +0100
++++ shadow-4.0.15/lib/commonio.c 2006-03-08 19:33:43.826260610 +0100
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <signal.h>
Modified: trunk/debian/patches/503_shadowconfig.8
===================================================================
--- trunk/debian/patches/503_shadowconfig.8 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/503_shadowconfig.8 2006-03-08 18:36:15 UTC (rev 893)
@@ -3,10 +3,10 @@
Status wrt upstream: The shadowconfig utility is debian specific.
It's man page also (but it used to be distributed)
-Index: shadow-4.0.14/man/shadowconfig.8
+Index: shadow-4.0.15/man/shadowconfig.8
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.14/man/shadowconfig.8 2006-01-24 01:11:01.000000000 +0100
++++ shadow-4.0.15/man/shadowconfig.8 2006-03-08 19:33:07.219676062 +0100
@@ -0,0 +1,41 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
@@ -49,10 +49,10 @@
+.PP
+Note that turning shadow passwords off and on again will lose all password aging information\&.
+
-Index: shadow-4.0.14/man/shadowconfig.8.xml
+Index: shadow-4.0.15/man/shadowconfig.8.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.14/man/shadowconfig.8.xml 2006-01-24 01:11:31.000000000 +0100
++++ shadow-4.0.15/man/shadowconfig.8.xml 2006-03-08 19:33:07.221675657 +0100
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
@@ -106,10 +106,10 @@
+ </para>
+ </refsect1>
+</refentry>
-Index: shadow-4.0.14/man/fr/shadowconfig.8
+Index: shadow-4.0.15/man/fr/shadowconfig.8
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.14/man/fr/shadowconfig.8 2006-01-24 01:11:47.000000000 +0100
++++ shadow-4.0.15/man/fr/shadowconfig.8 2006-03-08 19:33:07.223675252 +0100
@@ -0,0 +1,26 @@
+.\" This file was generated with po4a. Translate the source file.
+.\"
@@ -137,10 +137,10 @@
+.SH TRADUCTION
+Nicolas FRANÇOIS, 2004.
+Veuillez signaler toute erreur à <\fIdebian\-l10\-french at lists.debian.org\fR>.
-Index: shadow-4.0.14/man/ja/shadowconfig.8
+Index: shadow-4.0.15/man/ja/shadowconfig.8
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.14/man/ja/shadowconfig.8 2006-01-24 01:07:53.000000000 +0100
++++ shadow-4.0.15/man/ja/shadowconfig.8 2006-03-08 19:33:07.225674847 +0100
@@ -0,0 +1,25 @@
+.\" all right reserved,
+.\" Translated Tue Oct 30 11:59:11 JST 2001
@@ -167,10 +167,10 @@
+
+.I /usr/share/doc/passwd/README.debian.gz
+には shadow パスワードとそれに関する特徴の簡単な紹介が書かれている。
-Index: shadow-4.0.14/man/pl/shadowconfig.8
+Index: shadow-4.0.15/man/pl/shadowconfig.8
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ shadow-4.0.14/man/pl/shadowconfig.8 2006-01-24 01:08:10.000000000 +0100
++++ shadow-4.0.15/man/pl/shadowconfig.8 2006-03-08 19:33:07.226674644 +0100
@@ -0,0 +1,27 @@
+.\" $Id: shadowconfig.8,v 1.3 2001/08/23 23:10:51 kloczek Exp $
+.\" {PTM/WK/1999-09-14}
Modified: trunk/debian/patches/542_useradd-O_option
===================================================================
--- trunk/debian/patches/542_useradd-O_option 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/542_useradd-O_option 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,11 +5,11 @@
Status wrt upstream: not included as this is just specific
backward compatibility for Debian
-Index: shadow-4.0.14/man/useradd.8.xml
+Index: shadow-4.0.15/man/useradd.8.xml
===================================================================
---- shadow-4.0.14.orig/man/useradd.8.xml 2006-01-03 08:25:05.092907060 +0100
-+++ shadow-4.0.14/man/useradd.8.xml 2006-01-03 08:25:06.117698998 +0100
-@@ -202,6 +202,11 @@
+--- shadow-4.0.15.orig/man/useradd.8.xml 2006-03-08 19:33:33.780295636 +0100
++++ shadow-4.0.15/man/useradd.8.xml 2006-03-08 19:33:39.009236402 +0100
+@@ -203,6 +203,11 @@
<replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
doesn't work yet.
</para>
@@ -21,10 +21,10 @@
</listitem>
</varlistentry>
<varlistentry>
-Index: shadow-4.0.14/src/useradd.c
+Index: shadow-4.0.15/src/useradd.c
===================================================================
---- shadow-4.0.14.orig/src/useradd.c 2006-01-03 08:25:04.310065999 +0100
-+++ shadow-4.0.14/src/useradd.c 2006-01-03 08:25:06.119698592 +0100
+--- shadow-4.0.15.orig/src/useradd.c 2006-03-08 19:33:24.690137044 +0100
++++ shadow-4.0.15/src/useradd.c 2006-03-08 19:33:39.015235187 +0100
@@ -1017,7 +1017,7 @@
{NULL, 0, NULL, '\0'}
};
Modified: trunk/debian/patches/592_manpages_typos
===================================================================
--- trunk/debian/patches/592_manpages_typos 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/592_manpages_typos 2006-03-08 18:36:15 UTC (rev 893)
@@ -4,14 +4,14 @@
Status wrt upstream: not reported yet
-Index: shadow-4.0.14/man/passwd.1.xml
+Index: shadow-4.0.15/man/passwd.1.xml
===================================================================
---- shadow-4.0.14.orig/man/passwd.1.xml 2006-02-09 21:55:37.000000000 +0100
-+++ shadow-4.0.14/man/passwd.1.xml 2006-02-10 00:14:44.000000000 +0100
-@@ -101,8 +101,8 @@
+--- shadow-4.0.15.orig/man/passwd.1.xml 2006-03-08 19:33:41.446742632 +0100
++++ shadow-4.0.15/man/passwd.1.xml 2006-03-08 19:34:13.809186922 +0100
+@@ -88,8 +88,8 @@
<title>Hints for user passwords</title>
<para>
- The security of a password depends upon the strength of the
+ The security of a password depends upon the strength of the
- encryption algorithm and the size of the key space. The
- <emphasis>UNIX</emphasis> System encryption method is based on the
+ encryption algorithm and the size of the key space.
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-03-06 19:00:41 UTC (rev 892)
+++ trunk/debian/patches/series 2006-03-08 18:36:15 UTC (rev 893)
@@ -5,10 +5,12 @@
431_su_uid_0_not_root
008_su_no_sanitize_env
008_su_get_PAM_username
-339_su_PAM_session
+# Applied in 4.0.15
+# 339_su_PAM_session
428_grpck_add_prune_option
434_login_stop_checking_args_after--
-333_login_more_LOG_UNKFAIL_ENAB
+# Applied in 4.0.15
+# 333_login_more_LOG_UNKFAIL_ENAB
008_login_log_failure_in_FTMP
429_login_FAILLOG_ENAB
432_login_cancel_timout_after_authentication
@@ -27,33 +29,47 @@
452_doc_password_check_order
454_userdel_no_MAIL_FILE
501_commonio_group_shadow
-459_better_document_useradd_-d
+# Applied in 4.0.15
+# 459_better_document_useradd_-d
461_keep_sticky_bit_for_dirs
462_warn_to_edit_shadow
463_login_delay_obeys_to_PAM
466_useradd_-r_LSB
466_fflush-prompt
468_duplicate_passwd_struct_before_usage
-302_fix_generated_man_pages
-437_su_-c_option
+# Applied in 4.0.15
+# 302_fix_generated_man_pages
+# Applied in 4.0.15
+# 437_su_-c_option
423_su_arguments_are_concatenated
-423_su_arguments_are_no_more_concatenated_by_default
-478_nologin.8.xml
+# Not for experimental yet
+# 423_su_arguments_are_no_more_concatenated_by_default
+# Applied in 4.0.15
+# 478_nologin.8.xml
479_chowntty_debug
480_getopt_args_reorder
-381_userdel_remove_remove_group
+# Applied in 4.0.15
+# 381_userdel_remove_remove_group
482_libmisc_copydir_check_return_values
483_su_fakelogin_wrong_arg0
-484_su-p_preserve_PATH
-485_shell-env-exitcodes
-386_nowarn
-489_useradd_allow_non_uniq_uid
-390_useradd_always_unlock_group_databases
-390_link_selinux_only_when_needed
+# Applied in 4.0.15
+# 484_su-p_preserve_PATH
+# Applied in 4.0.15
+# 485_shell-env-exitcodes
+# Applied in 4.0.15
+# 386_nowarn
+# Applied in 4.0.15
+# 489_useradd_allow_non_uniq_uid
+# Applied in 4.0.15
+# 390_useradd_always_unlock_group_databases
+# Applied in 4.0.15
+# 390_link_selinux_only_when_needed
491_configure.in_friendly_selinux_detection
592_manpages_typos
-493_selinux_no_proc
-303_passwd.1-synopsis
+# Applied in 4.0.15
+# 493_selinux_no_proc
+# Applied in 4.0.15
+# 303_passwd.1-synopsis
# 999-2 is about using cdbs. It does not patch upstream files
# so shouldn't be here, but we keep it for the future
# 999-2_build_using_cdbs
More information about the Pkg-shadow-commits
mailing list