From 1ce22b1adc5da67a1c130fb1118ed1069d2a4813 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Tue, 18 Oct 2011 21:29:56 +0000 Subject: [PATCH] Refresh patches. --- debian/patches/008_login_log_failure_in_FTMP | 2 +- debian/patches/401_cppw_src.dpatch | 2 +- debian/patches/429_login_FAILLOG_ENAB | 14 +++++++------- debian/patches/463_login_delay_obeys_to_PAM | 14 +++++++------- debian/patches/501_commonio_group_shadow | 2 +- debian/patches/505_useradd_recommend_adduser | 4 ++-- debian/patches/506_relaxed_usernames | 4 ++-- debian/patches/523_su_arguments_are_concatenated | 2 +- ...u_arguments_are_no_more_concatenated_by_default | 4 ++-- debian/patches/542_useradd-O_option | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/debian/patches/008_login_log_failure_in_FTMP b/debian/patches/008_login_log_failure_in_FTMP index c0706c85..b2851cca 100644 --- a/debian/patches/008_login_log_failure_in_FTMP +++ b/debian/patches/008_login_log_failure_in_FTMP @@ -6,7 +6,7 @@ Notes: --- a/src/login.c +++ b/src/login.c -@@ -831,6 +831,24 @@ +@@ -835,6 +835,24 @@ (void) puts (""); (void) puts (_("Login incorrect")); diff --git a/debian/patches/401_cppw_src.dpatch b/debian/patches/401_cppw_src.dpatch index 2ec84b44..5413472d 100755 --- a/debian/patches/401_cppw_src.dpatch +++ b/debian/patches/401_cppw_src.dpatch @@ -227,7 +227,7 @@ groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) --- a/po/POTFILES.in +++ b/po/POTFILES.in -@@ -81,6 +81,7 @@ +@@ -82,6 +82,7 @@ src/chgpasswd.c src/chpasswd.c src/chsh.c diff --git a/debian/patches/429_login_FAILLOG_ENAB b/debian/patches/429_login_FAILLOG_ENAB index 9b8978d9..fe752f71 100644 --- a/debian/patches/429_login_FAILLOG_ENAB +++ b/debian/patches/429_login_FAILLOG_ENAB @@ -9,9 +9,9 @@ Note: It could be removed if pam_tally could report the number of failures --- a/src/login.c +++ b/src/login.c -@@ -131,9 +131,9 @@ - const char *host, +@@ -133,9 +133,9 @@ /*@null@*/const struct utmp *utent); + #endif /* ! USE_PAM */ -#ifndef USE_PAM static struct faillog faillog; @@ -20,7 +20,7 @@ Note: It could be removed if pam_tally could report the number of failures static void bad_time_notify (void); static void check_nologin (bool login_to_root); #else -@@ -791,6 +791,9 @@ +@@ -795,6 +795,9 @@ SYSLOG ((LOG_NOTICE, "TOO MANY LOGIN TRIES (%u)%s FOR '%s'", failcount, fromhost, failent_user)); @@ -30,7 +30,7 @@ Note: It could be removed if pam_tally could report the number of failures fprintf(stderr, _("Maximum number of tries exceeded (%u)\n"), failcount); -@@ -808,6 +811,14 @@ +@@ -812,6 +815,14 @@ pam_strerror (pamh, retcode))); failed = true; } @@ -45,7 +45,7 @@ Note: It could be removed if pam_tally could report the number of failures if (!failed) { break; -@@ -831,6 +842,10 @@ +@@ -835,6 +846,10 @@ (void) puts (""); (void) puts (_("Login incorrect")); @@ -56,7 +56,7 @@ Note: It could be removed if pam_tally could report the number of failures if (getdef_str("FTMP_FILE") != NULL) { #ifdef USE_UTMPX struct utmpx *failent = -@@ -1282,6 +1297,7 @@ +@@ -1288,6 +1303,7 @@ */ #ifndef USE_PAM motd (); /* print the message of the day */ @@ -64,7 +64,7 @@ Note: It could be removed if pam_tally could report the number of failures if ( getdef_bool ("FAILLOG_ENAB") && (0 != faillog.fail_cnt)) { failprint (&faillog); -@@ -1294,6 +1310,7 @@ +@@ -1300,6 +1316,7 @@ username, (int) faillog.fail_cnt)); } } diff --git a/debian/patches/463_login_delay_obeys_to_PAM b/debian/patches/463_login_delay_obeys_to_PAM index 5dee9027..081d63df 100644 --- a/debian/patches/463_login_delay_obeys_to_PAM +++ b/debian/patches/463_login_delay_obeys_to_PAM @@ -9,7 +9,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs --- a/src/login.c +++ b/src/login.c -@@ -525,7 +525,6 @@ +@@ -529,7 +529,6 @@ #if defined(HAVE_STRFTIME) && !defined(USE_PAM) char ptime[80]; #endif @@ -17,7 +17,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs unsigned int retries; bool subroot = false; #ifndef USE_PAM -@@ -545,6 +544,7 @@ +@@ -549,6 +548,7 @@ pid_t child; char *pam_user = NULL; #else @@ -25,7 +25,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs struct spwd *spwd = NULL; #endif /* -@@ -705,7 +705,6 @@ +@@ -709,7 +709,6 @@ } environ = newenvp; /* make new environment active */ @@ -33,7 +33,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs retries = getdef_unum ("LOGIN_RETRIES", RETRIES); #ifdef USE_PAM -@@ -721,8 +720,7 @@ +@@ -725,8 +724,7 @@ /* * hostname & tty are either set to NULL or their correct values, @@ -43,7 +43,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs * * PAM_RHOST and PAM_TTY are used for authentication, only use * information coming from login or from the caller (e.g. no utmp) -@@ -731,10 +729,6 @@ +@@ -735,10 +733,6 @@ PAM_FAIL_CHECK; retcode = pam_set_item (pamh, PAM_TTY, tty); PAM_FAIL_CHECK; @@ -54,7 +54,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs /* if fflg, then the user has already been authenticated */ if (!fflg) { unsigned int failcount = 0; -@@ -775,12 +769,6 @@ +@@ -779,12 +773,6 @@ bool failed = false; failcount++; @@ -67,7 +67,7 @@ Note: If removed, FAIL_DELAY must be re-added to /etc/login.defs retcode = pam_authenticate (pamh, 0); -@@ -1100,14 +1088,17 @@ +@@ -1104,14 +1092,17 @@ free (username); username = NULL; diff --git a/debian/patches/501_commonio_group_shadow b/debian/patches/501_commonio_group_shadow index 0aff3911..a52f09f6 100644 --- a/debian/patches/501_commonio_group_shadow +++ b/debian/patches/501_commonio_group_shadow @@ -12,7 +12,7 @@ Fixes: #166793 #include "nscd.h" #ifdef WITH_SELINUX #include -@@ -925,13 +926,20 @@ +@@ -988,13 +989,20 @@ goto fail; } } else { diff --git a/debian/patches/505_useradd_recommend_adduser b/debian/patches/505_useradd_recommend_adduser index ad8ffa2e..c5c35874 100644 --- a/debian/patches/505_useradd_recommend_adduser +++ b/debian/patches/505_useradd_recommend_adduser @@ -6,7 +6,7 @@ Status wrt upstream: Debian specific patch. --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -81,6 +81,12 @@ +@@ -84,6 +84,12 @@ DESCRIPTION @@ -21,7 +21,7 @@ Status wrt upstream: Debian specific patch. the values specified on the command line plus the default values from --- a/man/userdel.8.xml +++ b/man/userdel.8.xml -@@ -61,6 +61,12 @@ +@@ -64,6 +64,12 @@ DESCRIPTION diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames index 9bf64f8d..c4a512e2 100755 --- a/debian/patches/506_relaxed_usernames +++ b/debian/patches/506_relaxed_usernames @@ -48,7 +48,7 @@ Details: } --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -615,12 +615,19 @@ +@@ -618,12 +618,19 @@ @@ -71,7 +71,7 @@ Details: --- a/man/groupadd.8.xml +++ b/man/groupadd.8.xml -@@ -222,12 +222,17 @@ +@@ -224,12 +224,17 @@ CAVEATS diff --git a/debian/patches/523_su_arguments_are_concatenated b/debian/patches/523_su_arguments_are_concatenated index a44f20b4..97704877 100644 --- a/debian/patches/523_su_arguments_are_concatenated +++ b/debian/patches/523_su_arguments_are_concatenated @@ -10,7 +10,7 @@ Note: the fix of the man page is still missing. --- a/src/su.c +++ b/src/su.c -@@ -1137,6 +1137,35 @@ +@@ -1151,6 +1151,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 9fe19f9e..ebcdc92b 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 @@ -30,7 +30,7 @@ Status wrt upstream: This patch is Debian specific. #ifdef USE_PAM static pam_handle_t *pamh = NULL; static int caught = 0; -@@ -937,6 +950,8 @@ +@@ -951,6 +964,8 @@ int ret; #endif /* USE_PAM */ @@ -39,7 +39,7 @@ Status wrt upstream: This patch is Debian specific. (void) setlocale (LC_ALL, ""); (void) bindtextdomain (PACKAGE, LOCALEDIR); (void) textdomain (PACKAGE); -@@ -1141,7 +1156,7 @@ +@@ -1155,7 +1170,7 @@ * resulting 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 2166296f..c116e732 100644 --- a/debian/patches/542_useradd-O_option +++ b/debian/patches/542_useradd-O_option @@ -7,7 +7,7 @@ Status wrt upstream: not included as this is just specific --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -318,6 +318,11 @@ +@@ -321,6 +321,11 @@ databases are resetted to avoid reusing the entry from a previously deleted user. @@ -21,7 +21,7 @@ Status wrt upstream: not included as this is just specific --- a/src/useradd.c +++ b/src/useradd.c -@@ -1000,9 +1000,9 @@ +@@ -1007,9 +1007,9 @@ }; while ((c = getopt_long (argc, argv, #ifdef WITH_SELINUX @@ -33,7 +33,7 @@ Status wrt upstream: not included as this is just specific #endif long_options, NULL)) != -1) { switch (c) { -@@ -1124,6 +1124,7 @@ +@@ -1132,6 +1132,7 @@ kflg = true; break; case 'K':