[Pkg-shadow-commits] r3522 - debian/trunk/debian/patches
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Tue Oct 18 21:29:56 UTC 2011
Author: nekral-guest
Date: 2011-10-18 21:29:56 +0000 (Tue, 18 Oct 2011)
New Revision: 3522
Modified:
debian/trunk/debian/patches/008_login_log_failure_in_FTMP
debian/trunk/debian/patches/401_cppw_src.dpatch
debian/trunk/debian/patches/429_login_FAILLOG_ENAB
debian/trunk/debian/patches/463_login_delay_obeys_to_PAM
debian/trunk/debian/patches/501_commonio_group_shadow
debian/trunk/debian/patches/505_useradd_recommend_adduser
debian/trunk/debian/patches/506_relaxed_usernames
debian/trunk/debian/patches/523_su_arguments_are_concatenated
debian/trunk/debian/patches/523_su_arguments_are_no_more_concatenated_by_default
debian/trunk/debian/patches/542_useradd-O_option
Log:
Refresh patches.
Modified: debian/trunk/debian/patches/008_login_log_failure_in_FTMP
===================================================================
--- debian/trunk/debian/patches/008_login_log_failure_in_FTMP 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/008_login_log_failure_in_FTMP 2011-10-18 21:29:56 UTC (rev 3522)
@@ -6,7 +6,7 @@
--- a/src/login.c
+++ b/src/login.c
-@@ -831,6 +831,24 @@
+@@ -835,6 +835,24 @@
(void) puts ("");
(void) puts (_("Login incorrect"));
Modified: debian/trunk/debian/patches/401_cppw_src.dpatch
===================================================================
--- debian/trunk/debian/patches/401_cppw_src.dpatch 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/401_cppw_src.dpatch 2011-10-18 21:29:56 UTC (rev 3522)
@@ -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
Modified: debian/trunk/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- debian/trunk/debian/patches/429_login_FAILLOG_ENAB 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/429_login_FAILLOG_ENAB 2011-10-18 21:29:56 UTC (rev 3522)
@@ -9,9 +9,9 @@
--- 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 @@
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 @@
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 @@
if (!failed) {
break;
-@@ -831,6 +842,10 @@
+@@ -835,6 +846,10 @@
(void) puts ("");
(void) puts (_("Login incorrect"));
@@ -56,7 +56,7 @@
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 @@
if ( getdef_bool ("FAILLOG_ENAB")
&& (0 != faillog.fail_cnt)) {
failprint (&faillog);
-@@ -1294,6 +1310,7 @@
+@@ -1300,6 +1316,7 @@
username, (int) faillog.fail_cnt));
}
}
Modified: debian/trunk/debian/patches/463_login_delay_obeys_to_PAM
===================================================================
--- debian/trunk/debian/patches/463_login_delay_obeys_to_PAM 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/463_login_delay_obeys_to_PAM 2011-10-18 21:29:56 UTC (rev 3522)
@@ -9,7 +9,7 @@
--- 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 @@
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 @@
struct spwd *spwd = NULL;
#endif
/*
-@@ -705,7 +705,6 @@
+@@ -709,7 +709,6 @@
}
environ = newenvp; /* make new environment active */
@@ -33,7 +33,7 @@
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 @@
*
* 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 @@
/* 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 @@
retcode = pam_authenticate (pamh, 0);
-@@ -1100,14 +1088,17 @@
+@@ -1104,14 +1092,17 @@
free (username);
username = NULL;
Modified: debian/trunk/debian/patches/501_commonio_group_shadow
===================================================================
--- debian/trunk/debian/patches/501_commonio_group_shadow 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/501_commonio_group_shadow 2011-10-18 21:29:56 UTC (rev 3522)
@@ -12,7 +12,7 @@
#include "nscd.h"
#ifdef WITH_SELINUX
#include <selinux/selinux.h>
-@@ -925,13 +926,20 @@
+@@ -988,13 +989,20 @@
goto fail;
}
} else {
Modified: debian/trunk/debian/patches/505_useradd_recommend_adduser
===================================================================
--- debian/trunk/debian/patches/505_useradd_recommend_adduser 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/505_useradd_recommend_adduser 2011-10-18 21:29:56 UTC (rev 3522)
@@ -6,7 +6,7 @@
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
-@@ -81,6 +81,12 @@
+@@ -84,6 +84,12 @@
<refsect1 id='description'>
<title>DESCRIPTION</title>
<para>
@@ -21,7 +21,7 @@
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 @@
<refsect1 id='description'>
<title>DESCRIPTION</title>
<para>
Modified: debian/trunk/debian/patches/506_relaxed_usernames
===================================================================
--- debian/trunk/debian/patches/506_relaxed_usernames 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/506_relaxed_usernames 2011-10-18 21:29:56 UTC (rev 3522)
@@ -48,7 +48,7 @@
}
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
-@@ -615,12 +615,19 @@
+@@ -618,12 +618,19 @@
</para>
<para>
@@ -71,7 +71,7 @@
</refsect1>
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
-@@ -222,12 +222,17 @@
+@@ -224,12 +224,17 @@
<refsect1 id='caveats'>
<title>CAVEATS</title>
<para>
Modified: debian/trunk/debian/patches/523_su_arguments_are_concatenated
===================================================================
--- debian/trunk/debian/patches/523_su_arguments_are_concatenated 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/523_su_arguments_are_concatenated 2011-10-18 21:29:56 UTC (rev 3522)
@@ -10,7 +10,7 @@
--- a/src/su.c
+++ b/src/su.c
-@@ -1137,6 +1137,35 @@
+@@ -1151,6 +1151,35 @@
argv[0] = "-c";
argv[1] = command;
}
Modified: debian/trunk/debian/patches/523_su_arguments_are_no_more_concatenated_by_default
===================================================================
--- debian/trunk/debian/patches/523_su_arguments_are_no_more_concatenated_by_default 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/523_su_arguments_are_no_more_concatenated_by_default 2011-10-18 21:29:56 UTC (rev 3522)
@@ -30,7 +30,7 @@
#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 @@
(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.
*/
Modified: debian/trunk/debian/patches/542_useradd-O_option
===================================================================
--- debian/trunk/debian/patches/542_useradd-O_option 2011-10-18 20:28:01 UTC (rev 3521)
+++ debian/trunk/debian/patches/542_useradd-O_option 2011-10-18 21:29:56 UTC (rev 3522)
@@ -7,7 +7,7 @@
--- 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.
</para>
@@ -21,7 +21,7 @@
<varlistentry>
--- 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 @@
#endif
long_options, NULL)) != -1) {
switch (c) {
-@@ -1124,6 +1124,7 @@
+@@ -1132,6 +1132,7 @@
kflg = true;
break;
case 'K':
More information about the Pkg-shadow-commits
mailing list