diff --git a/debian/patches/008_login_log_failure_in_FTMP b/debian/patches/008_login_log_failure_in_FTMP index a7ac7986..de845cb3 100644 --- a/debian/patches/008_login_log_failure_in_FTMP +++ b/debian/patches/008_login_log_failure_in_FTMP @@ -4,11 +4,11 @@ Notes: * 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.18.1/src/login.c +Index: shadow-4.1.0/src/login.c =================================================================== ---- shadow-4.0.18.1.orig/src/login.c 2006-09-17 12:17:54.336008314 +0200 -+++ shadow-4.0.18.1/src/login.c 2006-09-17 12:17:54.972013371 +0200 -@@ -716,6 +716,29 @@ +--- shadow-4.1.0.orig/src/login.c ++++ shadow-4.1.0/src/login.c +@@ -722,6 +722,29 @@ #endif /* WITH_AUDIT */ fprintf(stderr,"\nLogin incorrect\n"); @@ -38,11 +38,11 @@ Index: shadow-4.0.18.1/src/login.c /* Let's give it another go around */ pam_set_item(pamh,PAM_USER,NULL); -Index: shadow-4.0.18.1/lib/getdef.c +Index: shadow-4.1.0/lib/getdef.c =================================================================== ---- shadow-4.0.18.1.orig/lib/getdef.c 2006-06-24 15:17:18.000000000 +0200 -+++ shadow-4.0.18.1/lib/getdef.c 2006-09-17 12:17:54.992013530 +0200 -@@ -57,6 +57,7 @@ +--- shadow-4.1.0.orig/lib/getdef.c ++++ shadow-4.1.0/lib/getdef.c +@@ -58,6 +58,7 @@ {"ERASECHAR", NULL}, {"FAIL_DELAY", NULL}, {"FAKE_SHELL", NULL}, @@ -50,7 +50,7 @@ Index: shadow-4.0.18.1/lib/getdef.c {"GID_MAX", NULL}, {"GID_MIN", NULL}, {"HUSHLOGIN_FILE", NULL}, -@@ -88,7 +89,6 @@ +@@ -93,7 +94,6 @@ {"ENVIRON_FILE", NULL}, {"ENV_TZ", NULL}, {"FAILLOG_ENAB", NULL}, diff --git a/debian/patches/008_su_get_PAM_username b/debian/patches/008_su_get_PAM_username index 84424d25..4622ae6d 100644 --- a/debian/patches/008_su_get_PAM_username +++ b/debian/patches/008_su_get_PAM_username @@ -5,11 +5,11 @@ Notes: 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.18.1/src/su.c +Index: shadow-4.1.0/src/su.c =================================================================== ---- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:17:52.483993589 +0200 -+++ shadow-4.0.18.1/src/su.c 2006-09-17 12:17:53.099998487 +0200 -@@ -304,6 +304,8 @@ +--- shadow-4.1.0.orig/src/su.c ++++ shadow-4.1.0/src/su.c +@@ -309,6 +309,8 @@ struct passwd *pw = 0; char **envp = environ; char *shellstr = 0, *command = 0; @@ -18,7 +18,7 @@ Index: shadow-4.0.18.1/src/su.c #ifdef USE_PAM char **envcp; -@@ -669,6 +670,14 @@ +@@ -674,6 +676,14 @@ su_failure (tty); } } diff --git a/debian/patches/008_su_no_sanitize_env b/debian/patches/008_su_no_sanitize_env index f2bccac0..87733380 100644 --- a/debian/patches/008_su_no_sanitize_env +++ b/debian/patches/008_su_no_sanitize_env @@ -1,8 +1,8 @@ -Index: shadow-4.0.18.1/src/su.c +Index: shadow-4.1.0/src/su.c =================================================================== ---- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:17:47.383953038 +0200 -+++ shadow-4.0.18.1/src/su.c 2006-09-17 12:17:52.483993589 +0200 -@@ -321,7 +321,7 @@ +--- shadow-4.1.0.orig/src/su.c ++++ shadow-4.1.0/src/su.c +@@ -326,7 +326,7 @@ #endif #endif /* !USE_PAM */ diff --git a/debian/patches/401_cppw_src.dpatch b/debian/patches/401_cppw_src.dpatch index 5ee44c19..e8a61e10 100755 --- a/debian/patches/401_cppw_src.dpatch +++ b/debian/patches/401_cppw_src.dpatch @@ -5,10 +5,10 @@ ## DP: Add cppw / cpgr @DPATCH@ -Index: shadow-4.0.18.1/src/cppw.c +Index: shadow-4.1.0/src/cppw.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ shadow-4.0.18.1/src/cppw.c 2006-10-21 13:45:56.000000000 +0200 +--- /dev/null ++++ shadow-4.1.0/src/cppw.c @@ -0,0 +1,198 @@ +/* + cppw, cpgr copy with locking given file over the password or group file @@ -208,11 +208,11 @@ Index: shadow-4.0.18.1/src/cppw.c + + return 0; +} -Index: shadow-4.0.18.1/src/Makefile.am +Index: shadow-4.1.0/src/Makefile.am =================================================================== ---- shadow-4.0.18.1.orig/src/Makefile.am 2006-10-21 13:45:26.000000000 +0200 -+++ shadow-4.0.18.1/src/Makefile.am 2006-10-21 13:45:40.000000000 +0200 -@@ -24,6 +24,7 @@ +--- shadow-4.1.0.orig/src/Makefile.am ++++ shadow-4.1.0/src/Makefile.am +@@ -25,6 +25,7 @@ sbin_PROGRAMS = nologin ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd usbin_PROGRAMS = \ @@ -220,7 +220,7 @@ Index: shadow-4.0.18.1/src/Makefile.am chgpasswd \ chpasswd \ groupadd \ -@@ -58,6 +59,7 @@ +@@ -59,6 +60,7 @@ chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) @@ -228,10 +228,10 @@ Index: shadow-4.0.18.1/src/Makefile.am gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) -Index: shadow-4.0.18.1/po/POTFILES.in +Index: shadow-4.1.0/po/POTFILES.in =================================================================== ---- shadow-4.0.18.1.orig/po/POTFILES.in 2006-10-21 13:45:26.000000000 +0200 -+++ shadow-4.0.18.1/po/POTFILES.in 2006-10-21 13:45:40.000000000 +0200 +--- shadow-4.1.0.orig/po/POTFILES.in ++++ shadow-4.1.0/po/POTFILES.in @@ -61,6 +61,7 @@ src/chgpasswd.c src/chpasswd.c diff --git a/debian/patches/403_fix_PATH-MAX_hurd b/debian/patches/403_fix_PATH-MAX_hurd index d08dc47a..91c92ddc 100644 --- a/debian/patches/403_fix_PATH-MAX_hurd +++ b/debian/patches/403_fix_PATH-MAX_hurd @@ -6,11 +6,11 @@ Author: Michael Banck Status wrt upstream: should be forwarded -Index: shadow-4.0.18.1/lib/commonio.c +Index: shadow-4.1.0/lib/commonio.c =================================================================== ---- shadow-4.0.18.1/lib/commonio.c.orig 2006-12-07 06:57:01.000000000 +0000 -+++ shadow-4.0.18.1/lib/commonio.c 2006-12-07 06:57:40.000000000 +0000 -@@ -47,17 +48,31 @@ +--- shadow-4.1.0.orig/lib/commonio.c ++++ shadow-4.1.0/lib/commonio.c +@@ -50,17 +50,31 @@ int lrename (const char *old, const char *new) { diff --git a/debian/patches/406_vipw_resume_properly b/debian/patches/406_vipw_resume_properly index a64564a0..aed7a389 100644 --- a/debian/patches/406_vipw_resume_properly +++ b/debian/patches/406_vipw_resume_properly @@ -6,10 +6,10 @@ Author: dean gaudet Status wrt upstream: should be forwarded -Index: shadow-4.0.18.1/src/vipw.c +Index: shadow-4.1.0/src/vipw.c =================================================================== ---- shadow-4.0.18.1.orig/src/vipw.c 2007-04-15 14:10:37.522147236 +0200 -+++ shadow-4.0.18.1/src/vipw.c 2007-04-15 14:11:09.146401712 +0200 +--- shadow-4.1.0.orig/src/vipw.c ++++ shadow-4.1.0/src/vipw.c @@ -208,7 +208,7 @@ pid = waitpid (pid, &status, WUNTRACED); if (WIFSTOPPED (status)) { diff --git a/debian/patches/407_adduser_disable_PUG_with-n b/debian/patches/407_adduser_disable_PUG_with-n index 9aa7f577..c126a6ce 100644 --- a/debian/patches/407_adduser_disable_PUG_with-n +++ b/debian/patches/407_adduser_disable_PUG_with-n @@ -15,11 +15,11 @@ Notes: * The debian/useradd.default file had to be updated to reflect these changes. -Index: shadow-4.0.18.1/man/useradd.8.xml +Index: shadow-4.1.0/man/useradd.8.xml =================================================================== ---- shadow-4.0.18.1.orig/man/useradd.8.xml 2007-04-15 16:16:36.000000000 +0200 -+++ shadow-4.0.18.1/man/useradd.8.xml 2007-04-15 16:49:17.000000000 +0200 -@@ -145,8 +145,7 @@ +--- shadow-4.1.0.orig/man/useradd.8.xml ++++ shadow-4.1.0/man/useradd.8.xml +@@ -157,8 +157,7 @@ The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already @@ -29,7 +29,7 @@ Index: shadow-4.0.18.1/man/useradd.8.xml -@@ -195,6 +194,23 @@ +@@ -207,6 +206,23 @@ @@ -53,11 +53,11 @@ Index: shadow-4.0.18.1/man/useradd.8.xml , KEY=VALUE -Index: shadow-4.0.18.1/src/useradd.c +Index: shadow-4.1.0/src/useradd.c =================================================================== ---- shadow-4.0.18.1.orig/src/useradd.c 2007-04-15 16:15:22.000000000 +0200 -+++ shadow-4.0.18.1/src/useradd.c 2007-04-15 16:16:11.000000000 +0200 -@@ -1036,7 +1036,7 @@ +--- shadow-4.1.0.orig/src/useradd.c ++++ shadow-4.1.0/src/useradd.c +@@ -1025,7 +1025,7 @@ {NULL, 0, NULL, '\0'} }; while ((c = @@ -66,7 +66,7 @@ Index: shadow-4.0.18.1/src/useradd.c long_options, NULL)) != -1) { switch (c) { case 'b': -@@ -1177,6 +1177,9 @@ +@@ -1163,6 +1163,9 @@ case 'm': mflg++; break; diff --git a/debian/patches/408_passwd_check_arguments b/debian/patches/408_passwd_check_arguments index 3d478758..76e9a866 100644 --- a/debian/patches/408_passwd_check_arguments +++ b/debian/patches/408_passwd_check_arguments @@ -5,11 +5,11 @@ Fixes: #410268 Status wrt upstream: not reported yet. -Index: shadow-4.0.18.1/src/passwd.c +Index: shadow-4.1.0/src/passwd.c =================================================================== ---- shadow-4.0.18.1.orig/src/passwd.c 2007-04-15 17:49:31.000000000 +0200 -+++ shadow-4.0.18.1/src/passwd.c 2007-04-15 17:52:38.000000000 +0200 -@@ -740,6 +740,12 @@ +--- shadow-4.1.0.orig/src/passwd.c ++++ shadow-4.1.0/src/passwd.c +@@ -789,6 +789,12 @@ name = myname; /* diff --git a/debian/patches/412_lastlog_-u_numerical_range b/debian/patches/412_lastlog_-u_numerical_range index 207389ff..76ebcd82 100644 --- a/debian/patches/412_lastlog_-u_numerical_range +++ b/debian/patches/412_lastlog_-u_numerical_range @@ -5,10 +5,10 @@ Status wrt upstream: not reported yet. Note: It also allows to mix -u and -t -Index: shadow-4.0.18.1/man/lastlog.8.xml +Index: shadow-4.1.0/man/lastlog.8.xml =================================================================== ---- shadow-4.0.18.1.orig/man/lastlog.8.xml 2007-06-19 13:23:42.000000000 +0100 -+++ shadow-4.0.18.1/man/lastlog.8.xml 2007-06-19 14:35:26.000000000 +0100 +--- shadow-4.1.0.orig/man/lastlog.8.xml ++++ shadow-4.1.0/man/lastlog.8.xml @@ -71,22 +71,20 @@ @@ -41,10 +41,10 @@ Index: shadow-4.0.18.1/man/lastlog.8.xml -Index: shadow-4.0.18.1/src/lastlog.c +Index: shadow-4.1.0/src/lastlog.c =================================================================== ---- shadow-4.0.18.1.orig/src/lastlog.c 2007-06-19 13:23:35.000000000 +0100 -+++ shadow-4.0.18.1/src/lastlog.c 2007-06-19 14:22:21.000000000 +0100 +--- shadow-4.1.0.orig/src/lastlog.c ++++ shadow-4.1.0/src/lastlog.c @@ -51,6 +51,8 @@ */ static FILE *lastlogfile; /* lastlog file stream */ diff --git a/debian/patches/414_remove-unwise-advices b/debian/patches/414_remove-unwise-advices index 094e67e9..f1b9e0e0 100644 --- a/debian/patches/414_remove-unwise-advices +++ b/debian/patches/414_remove-unwise-advices @@ -5,11 +5,11 @@ Status wrt upstream: Forwarded without patch but ignored up to now Note: -Index: shadow-4.0.18.1/man/passwd.1.xml +Index: shadow-4.1.0/man/passwd.1.xml =================================================================== ---- shadow-4.0.18.1.orig/man/passwd.1.xml 2007-06-21 02:06:42.026632551 +0200 -+++ shadow-4.0.18.1/man/passwd.1.xml 2007-06-21 02:04:59.531851133 +0200 -@@ -104,35 +104,9 @@ +--- shadow-4.1.0.orig/man/passwd.1.xml ++++ shadow-4.1.0/man/passwd.1.xml +@@ -114,35 +114,9 @@ Your password must be easily remembered so that you will not be forced diff --git a/debian/patches/415_login_put-echoctl-back b/debian/patches/415_login_put-echoctl-back index 36d91c85..726923f2 100644 --- a/debian/patches/415_login_put-echoctl-back +++ b/debian/patches/415_login_put-echoctl-back @@ -6,10 +6,10 @@ Status wrt upstream: Not reported yet. Note: Was removed by upstream in 4.0.8 with "remove dead code" comment -Index: shadow-4.0.18.1/src/login.c +Index: shadow-4.1.0/src/login.c =================================================================== ---- shadow-4.0.18.1.orig/src/login.c 2007-06-22 19:14:00.712717643 +0200 -+++ shadow-4.0.18.1/src/login.c 2007-06-22 19:17:24.702331390 +0200 +--- shadow-4.1.0.orig/src/login.c ++++ shadow-4.1.0/src/login.c @@ -175,6 +175,16 @@ termio.c_lflag |= ISIG | ICANON | ECHO | ECHOE; termio.c_iflag |= ICRNL; diff --git a/debian/patches/428_grpck_add_prune_option b/debian/patches/428_grpck_add_prune_option index 1e0bc9f8..57d49516 100644 --- a/debian/patches/428_grpck_add_prune_option +++ b/debian/patches/428_grpck_add_prune_option @@ -5,10 +5,10 @@ Fixes: #103385 Status wrt upstream: It could certainly be submitted to upstream. -Index: shadow-4.0.18.1/src/grpck.c +Index: shadow-4.1.0/src/grpck.c =================================================================== ---- shadow-4.0.18.1.orig/src/grpck.c 2006-05-07 19:44:39.000000000 +0200 -+++ shadow-4.0.18.1/src/grpck.c 2006-09-17 12:17:53.712003353 +0200 +--- shadow-4.1.0.orig/src/grpck.c ++++ shadow-4.1.0/src/grpck.c @@ -139,6 +139,7 @@ int errors = 0; int changed = 0; diff --git a/debian/patches/429_login_FAILLOG_ENAB b/debian/patches/429_login_FAILLOG_ENAB index 2a0343e4..95b0681a 100644 --- a/debian/patches/429_login_FAILLOG_ENAB +++ b/debian/patches/429_login_FAILLOG_ENAB @@ -7,10 +7,10 @@ Fixes: #192849 Note: It could be removed if pam_tally could report the number of failures preceding a successful login. -Index: shadow-4.0.18.1/src/login.c +Index: shadow-4.1.0/src/login.c =================================================================== ---- shadow-4.0.18.1.orig/src/login.c 2006-09-17 12:17:54.972013371 +0200 -+++ shadow-4.0.18.1/src/login.c 2006-09-17 12:17:55.628018587 +0200 +--- shadow-4.1.0.orig/src/login.c ++++ shadow-4.1.0/src/login.c @@ -130,11 +130,11 @@ static void setup_tty (void); static void check_flags (int, char *const *); @@ -25,7 +25,7 @@ Index: shadow-4.0.18.1/src/login.c static void bad_time_notify (void); static void check_nologin (void); #endif -@@ -668,6 +668,8 @@ +@@ -673,6 +673,8 @@ SYSLOG ((LOG_NOTICE, "TOO MANY LOGIN TRIES (%d)%s FOR `%s'", failcount, fromhost, failent_user)); @@ -34,7 +34,7 @@ Index: shadow-4.0.18.1/src/login.c fprintf(stderr, _("Maximum number of tries exceeded (%d)\n"), failcount); -@@ -685,6 +687,13 @@ +@@ -690,6 +692,13 @@ pam_strerror (pamh, retcode))); failed = 1; } @@ -48,7 +48,7 @@ Index: shadow-4.0.18.1/src/login.c if (!failed) break; -@@ -716,6 +725,8 @@ +@@ -722,6 +731,8 @@ #endif /* WITH_AUDIT */ fprintf(stderr,"\nLogin incorrect\n"); @@ -57,7 +57,7 @@ Index: shadow-4.0.18.1/src/login.c if (getdef_str("FTMP_FILE") != NULL) { #if HAVE_UTMPX_H failent = utxent; -@@ -1075,6 +1086,7 @@ +@@ -1099,6 +1110,7 @@ */ #ifndef USE_PAM motd (); /* print the message of the day */ @@ -65,7 +65,7 @@ Index: shadow-4.0.18.1/src/login.c if (getdef_bool ("FAILLOG_ENAB") && faillog.fail_cnt != 0) { failprint (&faillog); -@@ -1088,6 +1100,7 @@ +@@ -1112,6 +1124,7 @@ username, (int) faillog.fail_cnt)); } } @@ -73,11 +73,11 @@ Index: shadow-4.0.18.1/src/login.c if (getdef_bool ("LASTLOG_ENAB") && lastlog.ll_time != 0) { time_t ll_time = lastlog.ll_time; -Index: shadow-4.0.18.1/lib/getdef.c +Index: shadow-4.1.0/lib/getdef.c =================================================================== ---- shadow-4.0.18.1.orig/lib/getdef.c 2006-09-17 12:17:54.992013530 +0200 -+++ shadow-4.0.18.1/lib/getdef.c 2006-09-17 12:17:55.628018587 +0200 -@@ -56,6 +56,7 @@ +--- shadow-4.1.0.orig/lib/getdef.c ++++ shadow-4.1.0/lib/getdef.c +@@ -57,6 +57,7 @@ {"ENV_SUPATH", NULL}, {"ERASECHAR", NULL}, {"FAIL_DELAY", NULL}, @@ -85,7 +85,7 @@ Index: shadow-4.0.18.1/lib/getdef.c {"FAKE_SHELL", NULL}, {"FTMP_FILE", NULL}, {"GID_MAX", NULL}, -@@ -88,7 +89,6 @@ +@@ -93,7 +94,6 @@ {"ENV_HZ", NULL}, {"ENVIRON_FILE", NULL}, {"ENV_TZ", NULL}, diff --git a/debian/patches/431_su_uid_0_not_root b/debian/patches/431_su_uid_0_not_root index ff10f5e0..642929cc 100644 --- a/debian/patches/431_su_uid_0_not_root +++ b/debian/patches/431_su_uid_0_not_root @@ -6,11 +6,11 @@ Status wrt upstream: It was submitted upstream upstream (3 Jun 2005). upstream (multiple uid 0 accounts). http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2005-June/001287.html -Index: shadow-4.0.18.1/src/su.c +Index: shadow-4.1.0/src/su.c =================================================================== ---- shadow-4.0.18.1.orig/src/su.c 2006-08-01 12:30:02.000000000 +0200 -+++ shadow-4.0.18.1/src/su.c 2006-09-17 12:17:47.383953038 +0200 -@@ -444,7 +444,14 @@ +--- shadow-4.1.0.orig/src/su.c ++++ shadow-4.1.0/src/su.c +@@ -449,7 +449,14 @@ optind++; } if (!name[0]) /* use default user ID */ diff --git a/debian/patches/434_login_stop_checking_args_after-- b/debian/patches/434_login_stop_checking_args_after-- index 1cd51d9a..c5a09868 100644 --- a/debian/patches/434_login_stop_checking_args_after-- +++ b/debian/patches/434_login_stop_checking_args_after-- @@ -5,10 +5,10 @@ Status wrt upstream: It could certainly be submitted to upstream. Upstream comment: "Better will be rewrite login for use getopt_long()." -Index: shadow-4.0.18.1/src/login.c +Index: shadow-4.1.0/src/login.c =================================================================== ---- shadow-4.0.18.1.orig/src/login.c 2006-07-10 06:11:32.000000000 +0200 -+++ shadow-4.0.18.1/src/login.c 2006-09-17 12:17:54.336008314 +0200 +--- shadow-4.1.0.orig/src/login.c ++++ shadow-4.1.0/src/login.c @@ -253,6 +253,8 @@ for (arg = 1; arg < argc; arg++) { if (argv[arg][0] == '-' && strlen (argv[arg]) > 2) diff --git a/debian/patches/451_login_PATH b/debian/patches/451_login_PATH index e85bee60..9ff9d88e 100644 --- a/debian/patches/451_login_PATH +++ b/debian/patches/451_login_PATH @@ -4,10 +4,10 @@ Fixes: #330803 Status wrt upstream: -Index: shadow-4.0.18.1/libmisc/setupenv.c +Index: shadow-4.1.0/libmisc/setupenv.c =================================================================== ---- shadow-4.0.18.1.orig/libmisc/setupenv.c 2006-05-13 01:13:10.000000000 +0200 -+++ shadow-4.0.18.1/libmisc/setupenv.c 2006-09-17 12:18:01.768067405 +0200 +--- shadow-4.1.0.orig/libmisc/setupenv.c ++++ shadow-4.1.0/libmisc/setupenv.c @@ -186,8 +186,8 @@ { #ifndef USE_PAM diff --git a/debian/patches/454_userdel_no_MAIL_FILE b/debian/patches/454_userdel_no_MAIL_FILE index 9b25a7fb..79b84788 100644 --- a/debian/patches/454_userdel_no_MAIL_FILE +++ b/debian/patches/454_userdel_no_MAIL_FILE @@ -6,11 +6,11 @@ Goal: do not use MAIL_FILE in userdel: Note: usermod should be checked also. Maybe MAIL_FILE can be removed from login.defs -Index: shadow-4.0.18.1/src/userdel.c +Index: shadow-4.1.0/src/userdel.c =================================================================== ---- shadow-4.0.18.1.orig/src/userdel.c 2006-09-17 12:17:58.256039482 +0200 -+++ shadow-4.0.18.1/src/userdel.c 2006-09-17 12:18:02.408072494 +0200 -@@ -550,7 +550,7 @@ +--- shadow-4.1.0.orig/src/userdel.c ++++ shadow-4.1.0/src/userdel.c +@@ -566,7 +566,7 @@ maildir = getdef_str ("MAIL_DIR"); #ifdef MAIL_SPOOL_DIR diff --git a/debian/patches/462_warn_to_edit_shadow b/debian/patches/462_warn_to_edit_shadow index 61e37bb2..3a1fa380 100644 --- a/debian/patches/462_warn_to_edit_shadow +++ b/debian/patches/462_warn_to_edit_shadow @@ -5,10 +5,10 @@ Fixes: #62821 Status wrt upstream: Forwarded but not applied yet -Index: shadow-4.0.18.1/src/vipw.c +Index: shadow-4.1.0/src/vipw.c =================================================================== ---- shadow-4.0.18.1.orig/src/vipw.c 2006-06-20 22:00:04.000000000 +0200 -+++ shadow-4.0.18.1/src/vipw.c 2006-09-17 12:18:03.644082321 +0200 +--- shadow-4.1.0.orig/src/vipw.c ++++ shadow-4.1.0/src/vipw.c @@ -41,6 +41,12 @@ #include "pwio.h" #include "sgroupio.h" diff --git a/debian/patches/463_login_delay_obeys_to_PAM b/debian/patches/463_login_delay_obeys_to_PAM index 2f2a068e..7594ffbc 100644 --- a/debian/patches/463_login_delay_obeys_to_PAM +++ b/debian/patches/463_login_delay_obeys_to_PAM @@ -7,10 +7,10 @@ Status wrt upstream: Forwarded but not applied yet Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs -Index: shadow-4.0.18.1/src/login.c +Index: shadow-4.1.0/src/login.c =================================================================== ---- shadow-4.0.18.1.orig/src/login.c 2006-09-17 12:17:55.628018587 +0200 -+++ shadow-4.0.18.1/src/login.c 2006-09-17 12:18:04.272087315 +0200 +--- shadow-4.1.0.orig/src/login.c ++++ shadow-4.1.0/src/login.c @@ -331,7 +331,6 @@ char ptime[80]; #endif @@ -19,15 +19,15 @@ Index: shadow-4.0.18.1/src/login.c int retries; int failed; int flag; -@@ -351,6 +350,7 @@ - pid_t child; +@@ -354,6 +353,7 @@ char *pam_user; + char **ptr_pam_user = &pam_user; #else + int delay; struct spwd *spwd = NULL; #endif /* -@@ -573,7 +573,6 @@ +@@ -578,7 +578,6 @@ alarm (timeout); environ = newenvp; /* make new environment active */ @@ -35,7 +35,7 @@ Index: shadow-4.0.18.1/src/login.c retries = getdef_num ("LOGIN_RETRIES", RETRIES); #ifdef USE_PAM -@@ -589,17 +588,12 @@ +@@ -594,17 +593,12 @@ /* * hostname & tty are either set to NULL or their correct values, @@ -54,7 +54,7 @@ Index: shadow-4.0.18.1/src/login.c /* if fflg == 1, then the user has already been authenticated */ if (!fflg || (getuid () != 0)) { int failcount = 0; -@@ -640,8 +634,6 @@ +@@ -645,8 +639,6 @@ failed = 0; failcount++; @@ -63,7 +63,7 @@ Index: shadow-4.0.18.1/src/login.c retcode = pam_authenticate (pamh, 0); -@@ -934,13 +926,16 @@ +@@ -956,13 +948,16 @@ if (pwent.pw_passwd[0] == '\0') pw_auth ("!", username, reason, (char *) 0); @@ -80,11 +80,11 @@ Index: shadow-4.0.18.1/src/login.c puts (_("Login incorrect")); -Index: shadow-4.0.18.1/lib/getdef.c +Index: shadow-4.1.0/lib/getdef.c =================================================================== ---- shadow-4.0.18.1.orig/lib/getdef.c 2006-09-17 12:17:58.260039514 +0200 -+++ shadow-4.0.18.1/lib/getdef.c 2006-09-17 12:18:04.276087346 +0200 -@@ -55,7 +55,6 @@ +--- shadow-4.1.0.orig/lib/getdef.c ++++ shadow-4.1.0/lib/getdef.c +@@ -56,7 +56,6 @@ {"ENV_PATH", NULL}, {"ENV_SUPATH", NULL}, {"ERASECHAR", NULL}, @@ -92,7 +92,7 @@ Index: shadow-4.0.18.1/lib/getdef.c {"FAILLOG_ENAB", NULL}, {"FAKE_SHELL", NULL}, {"FTMP_FILE", NULL}, -@@ -92,6 +91,7 @@ +@@ -94,6 +93,7 @@ {"ENV_HZ", NULL}, {"ENVIRON_FILE", NULL}, {"ENV_TZ", NULL}, diff --git a/debian/patches/466_fflush-prompt b/debian/patches/466_fflush-prompt index 61a10a8b..a350ee87 100644 --- a/debian/patches/466_fflush-prompt +++ b/debian/patches/466_fflush-prompt @@ -3,21 +3,21 @@ Goal: Fflush all prompts supposedly presented to a user, because we may Status wrt upstream: may appear in 4.0.14 -Index: shadow-4.0.18.1/libmisc/Makefile.am +Index: shadow-4.1.0/libmisc/Makefile.am =================================================================== ---- shadow-4.0.18.1.orig/libmisc/Makefile.am 2005-09-05 18:21:37.000000000 +0200 -+++ shadow-4.0.18.1/libmisc/Makefile.am 2006-09-17 12:18:05.616098001 +0200 -@@ -49,4 +49,5 @@ +--- shadow-4.1.0.orig/libmisc/Makefile.am ++++ shadow-4.1.0/libmisc/Makefile.am +@@ -55,4 +55,5 @@ xgetgrnam.c \ xgetgrgid.c \ xgetspnam.c \ - xmalloc.c + xmalloc.c \ + yesno.c -Index: shadow-4.0.18.1/libmisc/fields.c +Index: shadow-4.1.0/libmisc/fields.c =================================================================== ---- shadow-4.0.18.1.orig/libmisc/fields.c 2005-08-31 19:24:57.000000000 +0200 -+++ shadow-4.0.18.1/libmisc/fields.c 2006-09-17 12:18:05.620098032 +0200 +--- shadow-4.1.0.orig/libmisc/fields.c ++++ shadow-4.1.0/libmisc/fields.c @@ -71,6 +71,7 @@ maxsize = sizeof (newf); @@ -26,10 +26,10 @@ Index: shadow-4.0.18.1/libmisc/fields.c if (fgets (newf, maxsize, stdin) != newf) return; -Index: shadow-4.0.18.1/libmisc/yesno.c +Index: shadow-4.1.0/libmisc/yesno.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ shadow-4.0.18.1/libmisc/yesno.c 2006-09-17 12:18:05.620098032 +0200 +--- /dev/null ++++ shadow-4.1.0/libmisc/yesno.c @@ -0,0 +1,41 @@ +/* + * Common code for yes/no prompting @@ -72,10 +72,10 @@ Index: shadow-4.0.18.1/libmisc/yesno.c + + return 0; +} -Index: shadow-4.0.18.1/src/grpck.c +Index: shadow-4.1.0/src/grpck.c =================================================================== ---- shadow-4.0.18.1.orig/src/grpck.c 2006-09-17 12:17:53.712003353 +0200 -+++ shadow-4.0.18.1/src/grpck.c 2006-09-17 12:18:05.620098032 +0200 +--- shadow-4.1.0.orig/src/grpck.c ++++ shadow-4.1.0/src/grpck.c @@ -50,6 +50,8 @@ extern struct commonio_entry *__sgr_get_head (void); #endif @@ -142,7 +142,7 @@ Index: shadow-4.0.18.1/src/grpck.c goto delete_gr; } -@@ -397,7 +374,7 @@ +@@ -398,7 +375,7 @@ grp->gr_name, grp->gr_mem[i]); printf (_("delete member '%s'? "), grp->gr_mem[i]); @@ -151,7 +151,7 @@ Index: shadow-4.0.18.1/src/grpck.c continue; SYSLOG ((LOG_INFO, "delete member '%s' group '%s'", -@@ -422,7 +399,7 @@ +@@ -423,7 +400,7 @@ printf (_("add group '%s' in %s ?"), grp->gr_name, sgr_file); errors++; @@ -160,7 +160,7 @@ Index: shadow-4.0.18.1/src/grpck.c struct sgrp sg; struct group gr; static char *empty = NULL; -@@ -509,7 +486,7 @@ +@@ -510,7 +487,7 @@ /* * prompt the user to delete the entry or not */ @@ -169,7 +169,7 @@ Index: shadow-4.0.18.1/src/grpck.c continue; /* -@@ -565,7 +542,7 @@ +@@ -566,7 +543,7 @@ /* * prompt the user to delete the entry or not */ @@ -178,7 +178,7 @@ Index: shadow-4.0.18.1/src/grpck.c goto delete_sg; } -@@ -578,7 +555,7 @@ +@@ -579,7 +556,7 @@ grp_file); printf (_("delete line '%s'? "), sge->line); errors++; @@ -187,7 +187,7 @@ Index: shadow-4.0.18.1/src/grpck.c goto delete_sg; } else { /** -@@ -619,7 +596,7 @@ +@@ -621,7 +598,7 @@ printf (_("delete administrative member '%s'? "), sgr->sg_adm[i]); @@ -196,7 +196,7 @@ Index: shadow-4.0.18.1/src/grpck.c continue; SYSLOG ((LOG_INFO, -@@ -646,7 +623,7 @@ +@@ -649,7 +626,7 @@ sgr->sg_name, sgr->sg_mem[i]); printf (_("delete member '%s'? "), sgr->sg_mem[i]); @@ -205,10 +205,10 @@ Index: shadow-4.0.18.1/src/grpck.c continue; SYSLOG ((LOG_INFO, -Index: shadow-4.0.18.1/src/pwck.c +Index: shadow-4.1.0/src/pwck.c =================================================================== ---- shadow-4.0.18.1.orig/src/pwck.c 2006-05-07 19:44:39.000000000 +0200 -+++ shadow-4.0.18.1/src/pwck.c 2006-10-21 16:26:23.000000000 +0200 +--- shadow-4.1.0.orig/src/pwck.c ++++ shadow-4.1.0/src/pwck.c @@ -49,6 +49,8 @@ extern void __spw_del_entry (const struct commonio_entry *); extern struct commonio_entry *__spw_get_head (void); @@ -276,7 +276,7 @@ Index: shadow-4.0.18.1/src/pwck.c goto delete_pw; } -@@ -382,7 +358,7 @@ +@@ -383,7 +359,7 @@ printf (_("add user '%s' in %s? "), pwd->pw_name, spw_file); errors++; diff --git a/debian/patches/467_useradd_-r_LSB b/debian/patches/467_useradd_-r_LSB index 73240daf..041b78c4 100644 --- a/debian/patches/467_useradd_-r_LSB +++ b/debian/patches/467_useradd_-r_LSB @@ -6,10 +6,10 @@ Status wrt upstream: Forwarded but not applied yet. Not sure that upstream is really ready to apply it. We apply it anyway because LSB compliance is important for Debian -Index: shadow-4.0.18.2/src/useradd.c +Index: shadow-4.1.0/src/useradd.c =================================================================== ---- shadow-4.0.18.2.orig/src/useradd.c 2007-10-28 17:20:37.000000000 +0100 -+++ shadow-4.0.18.2/src/useradd.c 2007-10-28 18:04:50.000000000 +0100 +--- shadow-4.1.0.orig/src/useradd.c ++++ shadow-4.1.0/src/useradd.c @@ -127,6 +127,7 @@ mflg = 0, /* create user's home directory if it doesn't exist */ nflg = 0, /* create a group having the same name as the user */ @@ -18,7 +18,7 @@ Index: shadow-4.0.18.2/src/useradd.c sflg = 0, /* shell program for new account */ uflg = 0; /* specify user ID for new account */ -@@ -639,6 +640,7 @@ +@@ -637,6 +638,7 @@ " (non-unique) UID\n" " -p, --password PASSWORD use encrypted password for the new user\n" " account\n" @@ -26,7 +26,7 @@ Index: shadow-4.0.18.2/src/useradd.c " -s, --shell SHELL the login shell for the new user account\n" " -u, --uid UID force use the UID for the new user account\n" "\n")); -@@ -687,11 +689,19 @@ +@@ -685,11 +687,19 @@ spent->sp_namp = (char *) user_name; spent->sp_pwdp = (char *) user_pass; spent->sp_lstchg = time ((time_t *) 0) / SCALE; @@ -51,7 +51,7 @@ Index: shadow-4.0.18.2/src/useradd.c spent->sp_flag = -1; } -@@ -839,8 +849,13 @@ +@@ -822,8 +832,13 @@ const struct passwd *pwd; uid_t uid_min, uid_max; @@ -67,7 +67,7 @@ Index: shadow-4.0.18.2/src/useradd.c /* * Start with some UID value if the user didn't provide us with -@@ -1019,12 +1034,13 @@ +@@ -1004,12 +1019,13 @@ {"create-home", no_argument, NULL, 'm'}, {"non-unique", no_argument, NULL, 'o'}, {"password", required_argument, NULL, 'p'}, @@ -82,7 +82,7 @@ Index: shadow-4.0.18.2/src/useradd.c long_options, NULL)) != -1) { switch (c) { case 'b': -@@ -1178,6 +1194,9 @@ +@@ -1160,6 +1176,9 @@ } user_pass = optarg; break; @@ -92,7 +92,7 @@ Index: shadow-4.0.18.2/src/useradd.c case 's': if (!VALID (optarg) || (optarg[0] -@@ -1570,6 +1589,8 @@ +@@ -1553,6 +1572,8 @@ */ static void create_home (void) { @@ -101,7 +101,7 @@ Index: shadow-4.0.18.2/src/useradd.c if (access (user_home, F_OK)) { /* XXX - create missing parent directories. --marekm */ if (mkdir (user_home, 0)) { -@@ -1593,6 +1614,7 @@ +@@ -1576,6 +1597,7 @@ "adding home directory", user_name, user_id, 1); #endif } diff --git a/debian/patches/480_getopt_args_reorder b/debian/patches/480_getopt_args_reorder index e7a8b640..b86586cf 100644 --- a/debian/patches/480_getopt_args_reorder +++ b/debian/patches/480_getopt_args_reorder @@ -15,11 +15,11 @@ This was a problem when -c was not an su option, but it is no more the case (a -- would have to be added for all the su -c "command" invocations). -Index: shadow-4.0.18.1/src/su.c +Index: shadow-4.1.0/src/su.c =================================================================== ---- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:18:07.616113902 +0200 -+++ shadow-4.0.18.1/src/su.c 2006-09-17 12:18:08.884123984 +0200 -@@ -373,19 +373,9 @@ +--- shadow-4.1.0.orig/src/su.c ++++ shadow-4.1.0/src/su.c +@@ -379,19 +379,9 @@ }; while ((c = @@ -40,7 +40,7 @@ Index: shadow-4.0.18.1/src/su.c case 'c': command = optarg; break; -@@ -407,10 +397,9 @@ +@@ -413,10 +403,9 @@ shellstr = optarg; break; default: diff --git a/debian/patches/483_su_fakelogin_wrong_arg0 b/debian/patches/483_su_fakelogin_wrong_arg0 index 69ce2edc..e21edb88 100644 --- a/debian/patches/483_su_fakelogin_wrong_arg0 +++ b/debian/patches/483_su_fakelogin_wrong_arg0 @@ -2,11 +2,11 @@ Goal: shell's name must be -su when a su fakes a login Status wrt upstream: not reported yet -Index: shadow-4.0.18.1/src/su.c +Index: shadow-4.1.0/src/su.c =================================================================== ---- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:18:08.884123984 +0200 -+++ shadow-4.0.18.1/src/su.c 2006-09-17 12:18:09.492128818 +0200 -@@ -916,7 +916,7 @@ +--- shadow-4.1.0.orig/src/su.c ++++ shadow-4.1.0/src/su.c +@@ -924,7 +924,7 @@ * Use the shell and create an argv * with the rest of the command line included. */ diff --git a/debian/patches/487_passwd_chauthtok_failed_message b/debian/patches/487_passwd_chauthtok_failed_message index e760869e..0184adf4 100644 --- a/debian/patches/487_passwd_chauthtok_failed_message +++ b/debian/patches/487_passwd_chauthtok_failed_message @@ -6,10 +6,10 @@ Fixes: #352137 Status wrt upstream: not forwarded yet -Index: shadow-4.0.18.1/libmisc/pam_pass.c +Index: shadow-4.1.0/libmisc/pam_pass.c =================================================================== ---- shadow-4.0.18.1.orig/libmisc/pam_pass.c 2005-10-19 17:21:07.000000000 +0200 -+++ shadow-4.0.18.1/libmisc/pam_pass.c 2006-09-17 12:18:12.028148982 +0200 +--- shadow-4.1.0.orig/libmisc/pam_pass.c ++++ shadow-4.1.0/libmisc/pam_pass.c @@ -38,6 +38,7 @@ ret = pam_chauthtok (pamh, flags); if (ret != PAM_SUCCESS) { diff --git a/debian/patches/491_configure.in_friendly_selinux_detection b/debian/patches/491_configure.in_friendly_selinux_detection index 1c2d2c19..6d0be300 100644 --- a/debian/patches/491_configure.in_friendly_selinux_detection +++ b/debian/patches/491_configure.in_friendly_selinux_detection @@ -7,11 +7,11 @@ Author: Mike Frysinger Status wrt upstream: reported by Mike, not applied yet -Index: shadow-4.0.18.1/configure.in +Index: shadow-4.1.0/configure.in =================================================================== ---- shadow-4.0.18.1.orig/configure.in 2006-08-03 12:17:21.000000000 +0200 -+++ shadow-4.0.18.1/configure.in 2006-09-17 12:18:10.116133780 +0200 -@@ -220,7 +220,7 @@ +--- shadow-4.1.0.orig/configure.in ++++ shadow-4.1.0/configure.in +@@ -221,7 +221,7 @@ [with_libpam=$withval], [with_libpam=yes]) AC_ARG_WITH(selinux, [AC_HELP_STRING([--with-selinux], [use SELinux support @<:@default=autodetect@:>@])], @@ -20,7 +20,7 @@ Index: shadow-4.0.18.1/configure.in AC_ARG_WITH(skey, [AC_HELP_STRING([--with-skey], [use S/Key support @<:@default=no@:>@])], [with_skey=$withval], [with_skey=no]) -@@ -282,15 +282,22 @@ +@@ -292,15 +292,22 @@ AC_DEFINE(HAVE_LIBCRACK_PW, 1, [Defined if it includes *Pw functions.])) fi diff --git a/debian/patches/496_login_init_session b/debian/patches/496_login_init_session index e1ee8ff6..4b976d52 100644 --- a/debian/patches/496_login_init_session +++ b/debian/patches/496_login_init_session @@ -8,10 +8,10 @@ Author: Samuel Thibault Status wrt upstream: reported, not applied yet -Index: shadow-4.0.18.1/src/login.c +Index: shadow-4.1.0/src/login.c =================================================================== ---- shadow-4.0.18.1.orig/src/login.c 2006-09-17 12:18:04.272087315 +0200 -+++ shadow-4.0.18.1/src/login.c 2006-09-17 12:18:14.632169686 +0200 +--- shadow-4.1.0.orig/src/login.c ++++ shadow-4.1.0/src/login.c @@ -41,6 +41,7 @@ #include #include @@ -20,7 +20,7 @@ Index: shadow-4.0.18.1/src/login.c #include "defines.h" #include "faillog.h" #include "failure.h" -@@ -1046,6 +1047,12 @@ +@@ -1070,6 +1071,12 @@ } /* child */ #endif @@ -33,10 +33,10 @@ Index: shadow-4.0.18.1/src/login.c /* We call set_groups() above because this clobbers pam_groups.so */ #ifndef USE_PAM -Index: shadow-4.0.18.1/src/sulogin.c +Index: shadow-4.1.0/src/sulogin.c =================================================================== ---- shadow-4.0.18.1.orig/src/sulogin.c 2006-05-13 01:13:10.000000000 +0200 -+++ shadow-4.0.18.1/src/sulogin.c 2006-09-17 12:18:14.632169686 +0200 +--- shadow-4.1.0.orig/src/sulogin.c ++++ shadow-4.1.0/src/sulogin.c @@ -35,6 +35,7 @@ #include #include diff --git a/debian/patches/501_commonio_group_shadow b/debian/patches/501_commonio_group_shadow index 1df4a1d2..ef5df94e 100644 --- a/debian/patches/501_commonio_group_shadow +++ b/debian/patches/501_commonio_group_shadow @@ -2,10 +2,10 @@ Goal: save the [g]shadow files with the 'shadow' group and mode 0440 Fixes: #166793 -Index: shadow-4.0.18.1/lib/commonio.c +Index: shadow-4.1.0/lib/commonio.c =================================================================== ---- shadow-4.0.18.1.orig/lib/commonio.c 2006-06-08 15:36:11.000000000 +0200 -+++ shadow-4.0.18.1/lib/commonio.c 2006-09-17 12:18:03.020077360 +0200 +--- shadow-4.1.0.orig/lib/commonio.c ++++ shadow-4.1.0/lib/commonio.c @@ -13,6 +13,7 @@ #include #include @@ -14,7 +14,7 @@ Index: shadow-4.0.18.1/lib/commonio.c #include #ifdef HAVE_SHADOW_H #include -@@ -699,13 +700,20 @@ +@@ -712,13 +713,20 @@ goto fail; } } else { diff --git a/debian/patches/503_shadowconfig.8 b/debian/patches/503_shadowconfig.8 index babe0b9e..bda5dfc2 100644 --- a/debian/patches/503_shadowconfig.8 +++ b/debian/patches/503_shadowconfig.8 @@ -3,10 +3,10 @@ Goal: Document the shadowconfig utility Status wrt upstream: The shadowconfig utility is debian specific. It's man page also (but it used to be distributed) -Index: shadow-4.0.18.1/man/shadowconfig.8 +Index: shadow-4.1.0/man/shadowconfig.8 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ shadow-4.0.18.1/man/shadowconfig.8 2006-09-17 12:17:46.003942066 +0200 +--- /dev/null ++++ shadow-4.1.0/man/shadowconfig.8 @@ -0,0 +1,41 @@ +.\"Generated by db2man.xsl. Don't modify this, modify the source. +.de Sh \" Subsection @@ -49,10 +49,10 @@ Index: shadow-4.0.18.1/man/shadowconfig.8 +.PP +Note that turning shadow passwords off and on again will lose all password aging information\&. + -Index: shadow-4.0.18.1/man/shadowconfig.8.xml +Index: shadow-4.1.0/man/shadowconfig.8.xml =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ shadow-4.0.18.1/man/shadowconfig.8.xml 2006-09-17 12:17:46.007942098 +0200 +--- /dev/null ++++ shadow-4.1.0/man/shadowconfig.8.xml @@ -0,0 +1,52 @@ + + + + -Index: shadow-4.0.18.1/man/fr/shadowconfig.8 +Index: shadow-4.1.0/man/fr/shadowconfig.8 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ shadow-4.0.18.1/man/fr/shadowconfig.8 2006-09-17 12:17:46.079942670 +0200 +--- /dev/null ++++ shadow-4.1.0/man/fr/shadowconfig.8 @@ -0,0 +1,26 @@ +.\" This file was generated with po4a. Translate the source file. +.\" @@ -137,10 +137,10 @@ Index: shadow-4.0.18.1/man/fr/shadowconfig.8 +.SH TRADUCTION +Nicolas FRANÇOIS, 2004. +Veuillez signaler toute erreur à <\fIdebian\-l10\-french@lists.debian.org\fR>. -Index: shadow-4.0.18.1/man/ja/shadowconfig.8 +Index: shadow-4.1.0/man/ja/shadowconfig.8 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ shadow-4.0.18.1/man/ja/shadowconfig.8 2006-09-17 12:17:46.079942670 +0200 +--- /dev/null ++++ shadow-4.1.0/man/ja/shadowconfig.8 @@ -0,0 +1,25 @@ +.\" all right reserved, +.\" Translated Tue Oct 30 11:59:11 JST 2001 @@ -167,10 +167,10 @@ Index: shadow-4.0.18.1/man/ja/shadowconfig.8 + +.I /usr/share/doc/passwd/README.debian.gz +には shadow パスワードとそれに関する特徴の簡単な紹介が書かれている。 -Index: shadow-4.0.18.1/man/pl/shadowconfig.8 +Index: shadow-4.1.0/man/pl/shadowconfig.8 =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ shadow-4.0.18.1/man/pl/shadowconfig.8 2006-09-17 12:17:46.083942702 +0200 +--- /dev/null ++++ shadow-4.1.0/man/pl/shadowconfig.8 @@ -0,0 +1,27 @@ +.\" $Id: shadowconfig.8,v 1.3 2001/08/23 23:10:51 kloczek Exp $ +.\" {PTM/WK/1999-09-14} diff --git a/debian/patches/504_undef_USE_PAM.dpatch b/debian/patches/504_undef_USE_PAM.dpatch index bb99ae99..b059a08d 100755 --- a/debian/patches/504_undef_USE_PAM.dpatch +++ b/debian/patches/504_undef_USE_PAM.dpatch @@ -2,123 +2,123 @@ Goal: Do not use PAM for chage, chpasswd, groupadd, groupdel, groupmod newusers, useradd, userdel, usermod, chgpasswd (keep them low-level) Fixes: #283961, #162181, #162199, #162228, #369806. -Index: shadow-4.0.18.1/src/chage.c +Index: shadow-4.1.0/src/chage.c =================================================================== ---- shadow-4.0.18.1.orig/src/chage.c 2006-07-19 18:38:57.000000000 +0200 -+++ shadow-4.0.18.1/src/chage.c 2006-09-17 12:17:58.228039259 +0200 +--- shadow-4.1.0.orig/src/chage.c ++++ shadow-4.1.0/src/chage.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: chage.c,v 1.73 2006/07/11 13:15:41 kloczek Exp $" + #ident "$Id: chage.c 1460 2007-11-24 22:41:24Z nekral-guest $" -Index: shadow-4.0.18.1/src/chpasswd.c +Index: shadow-4.1.0/src/chpasswd.c =================================================================== ---- shadow-4.0.18.1.orig/src/chpasswd.c 2006-06-24 12:18:55.000000000 +0200 -+++ shadow-4.0.18.1/src/chpasswd.c 2006-09-17 12:17:58.228039259 +0200 +--- shadow-4.1.0.orig/src/chpasswd.c ++++ shadow-4.1.0/src/chpasswd.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: chpasswd.c,v 1.37 2006/06/24 10:18:55 kloczek Exp $" + #ident "$Id: chpasswd.c 1460 2007-11-24 22:41:24Z nekral-guest $" -Index: shadow-4.0.18.1/src/groupadd.c +Index: shadow-4.1.0/src/groupadd.c =================================================================== ---- shadow-4.0.18.1.orig/src/groupadd.c 2006-07-28 19:38:52.000000000 +0200 -+++ shadow-4.0.18.1/src/groupadd.c 2006-09-17 12:17:58.232039291 +0200 +--- shadow-4.1.0.orig/src/groupadd.c ++++ shadow-4.1.0/src/groupadd.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: groupadd.c,v 1.56 2006/08/15 17:25:58 kloczek Exp $" + #ident "$Id: groupadd.c 1460 2007-11-24 22:41:24Z nekral-guest $" -Index: shadow-4.0.18.1/src/groupdel.c +Index: shadow-4.1.0/src/groupdel.c =================================================================== ---- shadow-4.0.18.1.orig/src/groupdel.c 2006-01-18 20:55:15.000000000 +0100 -+++ shadow-4.0.18.1/src/groupdel.c 2006-09-17 12:17:58.244039386 +0200 +--- shadow-4.1.0.orig/src/groupdel.c ++++ shadow-4.1.0/src/groupdel.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: groupdel.c,v 1.32 2006/08/15 17:25:58 kloczek Exp $" + #ident "$Id: groupdel.c 1397 2007-11-18 23:15:26Z nekral-guest $" -Index: shadow-4.0.18.1/src/groupmod.c +Index: shadow-4.1.0/src/groupmod.c =================================================================== ---- shadow-4.0.18.1.orig/src/groupmod.c 2006-07-28 19:38:52.000000000 +0200 -+++ shadow-4.0.18.1/src/groupmod.c 2006-09-17 12:17:58.248039418 +0200 +--- shadow-4.1.0.orig/src/groupmod.c ++++ shadow-4.1.0/src/groupmod.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: groupmod.c,v 1.42 2006/08/15 17:25:58 kloczek Exp $" + #ident "$Id: groupmod.c 1460 2007-11-24 22:41:24Z nekral-guest $" -Index: shadow-4.0.18.1/src/newusers.c +Index: shadow-4.1.0/src/newusers.c =================================================================== ---- shadow-4.0.18.1.orig/src/newusers.c 2006-03-07 16:50:33.000000000 +0100 -+++ shadow-4.0.18.1/src/newusers.c 2006-09-17 12:17:58.248039418 +0200 +--- shadow-4.1.0.orig/src/newusers.c ++++ shadow-4.1.0/src/newusers.c @@ -34,6 +34,7 @@ */ #include +#undef USE_PAM - #ident "$Id: newusers.c,v 1.33 2006/03/07 15:47:32 kloczek Exp $" + #ident "$Id: newusers.c 1460 2007-11-24 22:41:24Z nekral-guest $" -Index: shadow-4.0.18.1/src/useradd.c +Index: shadow-4.1.0/src/useradd.c =================================================================== ---- shadow-4.0.18.1.orig/src/useradd.c 2006-07-28 19:42:48.000000000 +0200 -+++ shadow-4.0.18.1/src/useradd.c 2006-09-17 12:17:58.252039450 +0200 +--- shadow-4.1.0.orig/src/useradd.c ++++ shadow-4.1.0/src/useradd.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: useradd.c,v 1.103 2006/11/04 00:55:00 kloczek Exp $" + #ident "$Id: useradd.c 1460 2007-11-24 22:41:24Z nekral-guest $" -Index: shadow-4.0.18.1/src/userdel.c +Index: shadow-4.1.0/src/userdel.c =================================================================== ---- shadow-4.0.18.1.orig/src/userdel.c 2006-07-10 06:11:32.000000000 +0200 -+++ shadow-4.0.18.1/src/userdel.c 2006-09-17 12:17:58.256039482 +0200 +--- shadow-4.1.0.orig/src/userdel.c ++++ shadow-4.1.0/src/userdel.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: userdel.c,v 1.67 2006/08/15 17:25:58 kloczek Exp $" + #ident "$Id: userdel.c 1460 2007-11-24 22:41:24Z nekral-guest $" -Index: shadow-4.0.18.1/src/usermod.c +Index: shadow-4.1.0/src/usermod.c =================================================================== ---- shadow-4.0.18.1.orig/src/usermod.c 2006-07-28 19:42:48.000000000 +0200 -+++ shadow-4.0.18.1/src/usermod.c 2006-09-17 12:17:58.256039482 +0200 +--- shadow-4.1.0.orig/src/usermod.c ++++ shadow-4.1.0/src/usermod.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: usermod.c,v 1.74 2007/01/16 12:51:50 kloczek Exp $" + #ident "$Id: usermod.c 1460 2007-11-24 22:41:24Z nekral-guest $" -Index: shadow-4.0.18.1/src/chgpasswd.c +Index: shadow-4.1.0/src/chgpasswd.c =================================================================== ---- shadow-4.0.18.1.orig/src/chgpasswd.c 2006-06-20 22:00:04.000000000 +0200 -+++ shadow-4.0.18.1/src/chgpasswd.c 2006-09-17 12:17:58.260039514 +0200 +--- shadow-4.1.0.orig/src/chgpasswd.c ++++ shadow-4.1.0/src/chgpasswd.c @@ -28,6 +28,7 @@ */ #include +#undef USE_PAM - #ident "$Id: chgpasswd.c,v 1.5 2006/06/20 20:00:04 kloczek Exp $" + #ident "$Id: chgpasswd.c 1485 2007-12-09 22:54:53Z nekral-guest $" diff --git a/debian/patches/504_undef_USE_PAM.nolibpam b/debian/patches/504_undef_USE_PAM.nolibpam index a95ecf73..91675baa 100644 --- a/debian/patches/504_undef_USE_PAM.nolibpam +++ b/debian/patches/504_undef_USE_PAM.nolibpam @@ -1,8 +1,8 @@ -Index: shadow-4.0.18.1/src/Makefile.am +Index: shadow-4.1.0/src/Makefile.am =================================================================== ---- shadow-4.0.18.1.orig/src/Makefile.am 2006-09-17 12:17:57.524033662 +0200 -+++ shadow-4.0.18.1/src/Makefile.am 2006-09-17 12:17:59.228047210 +0200 -@@ -54,17 +54,17 @@ +--- shadow-4.1.0.orig/src/Makefile.am ++++ shadow-4.1.0/src/Makefile.am +@@ -55,17 +55,17 @@ $(top_builddir)/lib/libshadow.la AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" @@ -26,7 +26,7 @@ Index: shadow-4.0.18.1/src/Makefile.am grpck_LDADD = $(LDADD) $(LIBSELINUX) grpconv_LDADD = $(LDADD) $(LIBSELINUX) grpunconv_LDADD = $(LDADD) $(LIBSELINUX) -@@ -73,7 +73,7 @@ +@@ -74,7 +74,7 @@ login_nopam.c login_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) newgrp_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) @@ -35,7 +35,7 @@ Index: shadow-4.0.18.1/src/Makefile.am nologin_LDADD = passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX) pwck_LDADD = $(LDADD) $(LIBSELINUX) -@@ -83,9 +83,9 @@ +@@ -84,9 +84,9 @@ su.c \ suauth.c su_LDADD = $(LDADD) $(LIBPAM) diff --git a/debian/patches/505_useradd_recommend_adduser b/debian/patches/505_useradd_recommend_adduser index 860a848c..2e4da42f 100644 --- a/debian/patches/505_useradd_recommend_adduser +++ b/debian/patches/505_useradd_recommend_adduser @@ -4,11 +4,11 @@ Fixes: #406046 Status wrt upstream: Debian specific patch. -Index: shadow-4.0.18.2/man/useradd.8.xml +Index: shadow-4.1.0/man/useradd.8.xml =================================================================== ---- shadow-4.0.18.2.orig/man/useradd.8.xml 2007-10-28 17:27:18.000000000 +0100 -+++ shadow-4.0.18.2/man/useradd.8.xml 2007-10-28 17:28:32.000000000 +0100 -@@ -34,6 +34,12 @@ +--- shadow-4.1.0.orig/man/useradd.8.xml ++++ shadow-4.1.0/man/useradd.8.xml +@@ -45,6 +45,12 @@ DESCRIPTION @@ -21,11 +21,11 @@ Index: shadow-4.0.18.2/man/useradd.8.xml When invoked without the option, the useradd command creates a new user account using the values specified on the command line plus the default values from -Index: shadow-4.0.18.2/man/userdel.8.xml +Index: shadow-4.1.0/man/userdel.8.xml =================================================================== ---- shadow-4.0.18.2.orig/man/userdel.8.xml 2007-10-28 16:43:10.000000000 +0100 -+++ shadow-4.0.18.2/man/userdel.8.xml 2007-10-28 17:28:32.000000000 +0100 -@@ -23,6 +23,12 @@ +--- shadow-4.1.0.orig/man/userdel.8.xml ++++ shadow-4.1.0/man/userdel.8.xml +@@ -30,6 +30,12 @@ DESCRIPTION diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames index 96161497..6494fc11 100755 --- a/debian/patches/506_relaxed_usernames +++ b/debian/patches/506_relaxed_usernames @@ -15,10 +15,10 @@ Details: than '-' as the leading character). Thus, the maintenance tools don't anymore. closes: #79682, #166798, #171179 -Index: shadow-4.0.18.1/libmisc/chkname.c +Index: shadow-4.1.0/libmisc/chkname.c =================================================================== ---- shadow-4.0.18.1.orig/libmisc/chkname.c 2005-08-31 18:24:57.000000000 +0100 -+++ shadow-4.0.18.1/libmisc/chkname.c 2007-06-18 22:06:29.000000000 +0100 +--- shadow-4.1.0.orig/libmisc/chkname.c ++++ shadow-4.1.0/libmisc/chkname.c @@ -17,6 +17,7 @@ #endif static int good_name (const char *name) @@ -48,11 +48,11 @@ Index: shadow-4.0.18.1/libmisc/chkname.c return 1; } -Index: shadow-4.0.18.1/man/useradd.8.xml +Index: shadow-4.1.0/man/useradd.8.xml =================================================================== ---- shadow-4.0.18.1.orig/man/useradd.8.xml 2006-07-24 06:48:36.000000000 +0100 -+++ shadow-4.0.18.1/man/useradd.8.xml 2007-06-18 22:10:15.000000000 +0100 -@@ -183,6 +183,7 @@ +--- shadow-4.1.0.orig/man/useradd.8.xml ++++ shadow-4.1.0/man/useradd.8.xml +@@ -195,6 +195,7 @@ valid in conjunction with the option. The default is to not create the directory and to not copy any files. @@ -60,7 +60,7 @@ Index: shadow-4.0.18.1/man/useradd.8.xml -@@ -360,9 +361,13 @@ +@@ -372,9 +373,13 @@ diff --git a/debian/patches/507_32char_grnames.dpatch b/debian/patches/507_32char_grnames.dpatch index 3b665604..6148dde5 100755 --- a/debian/patches/507_32char_grnames.dpatch +++ b/debian/patches/507_32char_grnames.dpatch @@ -31,10 +31,10 @@ exit 0 @DPATCH@ -Index: shadow-4.0.18.1/libmisc/chkname.c +Index: shadow-4.1.0/libmisc/chkname.c =================================================================== ---- shadow-4.0.18.1.orig/libmisc/chkname.c 2006-09-17 12:17:59.836052044 +0200 -+++ shadow-4.0.18.1/libmisc/chkname.c 2006-09-17 12:18:00.496057292 +0200 +--- shadow-4.1.0.orig/libmisc/chkname.c ++++ shadow-4.1.0/libmisc/chkname.c @@ -70,10 +70,10 @@ int check_group_name (const char *name) { diff --git a/debian/patches/508_nologin_in_usr_sbin b/debian/patches/508_nologin_in_usr_sbin index a033f699..f93642ea 100644 --- a/debian/patches/508_nologin_in_usr_sbin +++ b/debian/patches/508_nologin_in_usr_sbin @@ -1,8 +1,8 @@ -Index: shadow-4.0.18.1/src/Makefile.am +Index: shadow-4.1.0/src/Makefile.am =================================================================== ---- shadow-4.0.18.1.orig/src/Makefile.am 2006-09-17 12:17:59.228047210 +0200 -+++ shadow-4.0.18.1/src/Makefile.am 2006-09-17 12:18:13.284158968 +0200 -@@ -21,7 +21,6 @@ +--- shadow-4.1.0.orig/src/Makefile.am ++++ shadow-4.1.0/src/Makefile.am +@@ -22,7 +22,6 @@ # $prefix/bin and $prefix/sbin, no install-data hacks...) bin_PROGRAMS = groups login su @@ -10,7 +10,7 @@ Index: shadow-4.0.18.1/src/Makefile.am ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd usbin_PROGRAMS = \ cppw \ -@@ -36,6 +35,7 @@ +@@ -37,6 +36,7 @@ grpunconv \ logoutd \ newusers \ diff --git a/debian/patches/523_su_arguments_are_concatenated b/debian/patches/523_su_arguments_are_concatenated index db7a7009..f9d0653a 100644 --- a/debian/patches/523_su_arguments_are_concatenated +++ b/debian/patches/523_su_arguments_are_concatenated @@ -8,11 +8,11 @@ Status wrt upstream: This is a Debian specific patch. Note: the fix of the man page is still missing. (to be taken from the trunk) -Index: shadow-4.0.18.1/src/su.c +Index: shadow-4.1.0/src/su.c =================================================================== ---- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:17:56.308023993 +0200 -+++ shadow-4.0.18.1/src/su.c 2006-09-17 12:18:07.008109068 +0200 -@@ -879,6 +879,35 @@ +--- shadow-4.1.0.orig/src/su.c ++++ shadow-4.1.0/src/su.c +@@ -887,6 +887,35 @@ argv[0] = "-c"; argv[1] = command; } diff --git a/debian/patches/523_su_arguments_are_no_more_concatenated_by_default b/debian/patches/523_su_arguments_are_no_more_concatenated_by_default index 30d610b8..40213c6b 100644 --- a/debian/patches/523_su_arguments_are_no_more_concatenated_by_default +++ b/debian/patches/523_su_arguments_are_no_more_concatenated_by_default @@ -8,10 +8,10 @@ Etch. Status wrt upstream: This patch is Debian specific. -Index: shadow-4.0.18.1/src/su.c +Index: shadow-4.1.0/src/su.c =================================================================== ---- shadow-4.0.18.1.orig/src/su.c 2006-09-17 12:18:07.008109068 +0200 -+++ shadow-4.0.18.1/src/su.c 2006-09-17 12:18:07.616113902 +0200 +--- shadow-4.1.0.orig/src/su.c ++++ shadow-4.1.0/src/su.c @@ -76,6 +76,19 @@ /* If nonzero, change some environment vars to indicate the user su'd to. */ static int change_environment; @@ -32,7 +32,7 @@ Index: shadow-4.0.18.1/src/su.c #ifdef USE_PAM static pam_handle_t *pamh = NULL; static int caught = 0; -@@ -322,6 +335,8 @@ +@@ -328,6 +341,8 @@ #endif #endif /* !USE_PAM */ @@ -41,7 +41,7 @@ Index: shadow-4.0.18.1/src/su.c /* sanitize_env (); */ setlocale (LC_ALL, ""); -@@ -883,7 +898,7 @@ +@@ -891,7 +906,7 @@ * resulted string is always given to the shell with its * -c option. */ diff --git a/debian/patches/542_useradd-O_option b/debian/patches/542_useradd-O_option index e5990c4a..c36e0a8c 100644 --- a/debian/patches/542_useradd-O_option +++ b/debian/patches/542_useradd-O_option @@ -5,11 +5,11 @@ Note: useradd.8 needs to be regenerated. Status wrt upstream: not included as this is just specific backward compatibility for Debian -Index: shadow-4.0.18.1/man/useradd.8.xml +Index: shadow-4.1.0/man/useradd.8.xml =================================================================== ---- shadow-4.0.18.1.orig/man/useradd.8.xml 2006-09-17 12:17:59.836052044 +0200 -+++ shadow-4.0.18.1/man/useradd.8.xml 2006-09-17 12:18:01.136062380 +0200 -@@ -212,6 +212,11 @@ +--- shadow-4.1.0.orig/man/useradd.8.xml ++++ shadow-4.1.0/man/useradd.8.xml +@@ -224,6 +224,11 @@ UID_MIN=10,UID_MAX=499 doesn't work yet. @@ -21,11 +21,11 @@ Index: shadow-4.0.18.1/man/useradd.8.xml -Index: shadow-4.0.18.1/src/useradd.c +Index: shadow-4.1.0/src/useradd.c =================================================================== ---- shadow-4.0.18.1.orig/src/useradd.c 2006-09-17 12:17:58.252039450 +0200 -+++ shadow-4.0.18.1/src/useradd.c 2006-09-17 12:18:01.140062412 +0200 -@@ -1024,7 +1024,7 @@ +--- shadow-4.1.0.orig/src/useradd.c ++++ shadow-4.1.0/src/useradd.c +@@ -1009,7 +1009,7 @@ {NULL, 0, NULL, '\0'} }; while ((c = @@ -34,7 +34,7 @@ Index: shadow-4.0.18.1/src/useradd.c long_options, NULL)) != -1) { switch (c) { case 'b': -@@ -1143,6 +1143,7 @@ +@@ -1125,6 +1125,7 @@ kflg++; break; case 'K': diff --git a/debian/patches/579_chowntty_debug b/debian/patches/579_chowntty_debug index 97a851e2..5b4e9f6f 100644 --- a/debian/patches/579_chowntty_debug +++ b/debian/patches/579_chowntty_debug @@ -13,10 +13,10 @@ and in fact it's misleading, because tty name is detected OK, it's is_my_tty() which is failing for a reason yet unknown (I suspect corruption of utmp file). -Index: shadow-4.0.18.1/libmisc/chowntty.c +Index: shadow-4.1.0/libmisc/chowntty.c =================================================================== ---- shadow-4.0.18.1.orig/libmisc/chowntty.c 2005-08-31 19:24:57.000000000 +0200 -+++ shadow-4.0.18.1/libmisc/chowntty.c 2006-09-17 12:18:08.256118991 +0200 +--- shadow-4.1.0.orig/libmisc/chowntty.c ++++ shadow-4.1.0/libmisc/chowntty.c @@ -40,6 +40,7 @@ #include "defines.h" #include diff --git a/debian/patches/592_manpages_typos b/debian/patches/592_manpages_typos index 211caef8..13847014 100644 --- a/debian/patches/592_manpages_typos +++ b/debian/patches/592_manpages_typos @@ -6,11 +6,11 @@ Status wrt upstream: Debian specific. It is probably a bug of docbook-xsl 1.68.1-0.1 -Index: shadow-4.0.18.1/man/passwd.1.xml +Index: shadow-4.1.0/man/passwd.1.xml =================================================================== ---- shadow-4.0.18.1.orig/man/passwd.1.xml 2006-07-24 07:48:36.000000000 +0200 -+++ shadow-4.0.18.1/man/passwd.1.xml 2006-09-17 12:18:10.728138646 +0200 -@@ -87,8 +87,8 @@ +--- shadow-4.1.0.orig/man/passwd.1.xml ++++ shadow-4.1.0/man/passwd.1.xml +@@ -97,8 +97,8 @@ Hints for user passwords The security of a password depends upon the strength of the @@ -21,11 +21,11 @@ Index: shadow-4.0.18.1/man/passwd.1.xml NBS DES algorithm and is very secure. The size of the key space depends upon the randomness of the password which is selected. -Index: shadow-4.0.18.1/man/useradd.8.xml +Index: shadow-4.1.0/man/useradd.8.xml =================================================================== ---- shadow-4.0.18.1.orig/man/useradd.8.xml 2006-09-17 12:18:01.136062380 +0200 -+++ shadow-4.0.18.1/man/useradd.8.xml 2006-09-17 12:18:10.728138646 +0200 -@@ -35,7 +35,7 @@ +--- shadow-4.1.0.orig/man/useradd.8.xml ++++ shadow-4.1.0/man/useradd.8.xml +@@ -46,7 +46,7 @@ DESCRIPTION When invoked without the option, the