[Pkg-shadow-commits] r2419 - in debian/trunk/debian: . patches
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sun Sep 14 14:10:49 UTC 2008
Author: nekral-guest
Date: 2008-09-14 14:10:48 +0000 (Sun, 14 Sep 2008)
New Revision: 2419
Modified:
debian/trunk/debian/changelog
debian/trunk/debian/patches/401_cppw_src.dpatch
debian/trunk/debian/patches/463_login_delay_obeys_to_PAM
debian/trunk/debian/patches/506_relaxed_usernames
Log:
Updated patches for upstream 4.1.3.
Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog 2008-09-14 14:02:45 UTC (rev 2418)
+++ debian/trunk/debian/changelog 2008-09-14 14:10:48 UTC (rev 2419)
@@ -26,6 +26,9 @@
+ debian/patches/429_login_FAILLOG_ENAB
+ debian/patches/507_32char_grnames.dpatch
+ debian/patches/428_grpck_add_prune_option
+ + debian/patches/401_cppw_src.dpatch
+ + debian/patches/506_relaxed_usernames
+ + debian/patches/463_login_delay_obeys_to_PAM
* debian/patches/454_userdel_no_MAIL_FILE: Patch removed. If MAIL_FILE is
defined, the mailbox is not in MAIL_SPOOL_DIR.
* debian/patches/506_relaxed_usernames: Use an extra paragraph for the note
Modified: debian/trunk/debian/patches/401_cppw_src.dpatch
===================================================================
--- debian/trunk/debian/patches/401_cppw_src.dpatch 2008-09-14 14:02:45 UTC (rev 2418)
+++ debian/trunk/debian/patches/401_cppw_src.dpatch 2008-09-14 14:10:48 UTC (rev 2419)
@@ -221,13 +221,13 @@
chpasswd \
groupadd \
@@ -59,6 +60,7 @@
- chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
+ chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT)
chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
- chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
+ chpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT)
+cppw_LDADD = $(LDADD) $(LIBSELINUX)
gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
- groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
- groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
+ groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
+ groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
Index: shadow-4.1.0/po/POTFILES.in
===================================================================
--- shadow-4.1.0.orig/po/POTFILES.in
Modified: debian/trunk/debian/patches/463_login_delay_obeys_to_PAM
===================================================================
--- debian/trunk/debian/patches/463_login_delay_obeys_to_PAM 2008-09-14 14:02:45 UTC (rev 2418)
+++ debian/trunk/debian/patches/463_login_delay_obeys_to_PAM 2008-09-14 14:10:48 UTC (rev 2419)
@@ -47,20 +47,22 @@
PAM_FAIL_CHECK;
retcode = pam_set_item (pamh, PAM_TTY, tty);
PAM_FAIL_CHECK;
--#ifdef HAVE_PAM_FAIL_DELAY
+-#ifdef HAS_PAM_FAIL_DELAY
- retcode = pam_fail_delay (pamh, 1000000 * delay);
- PAM_FAIL_CHECK;
-#endif
/* if fflg, then the user has already been authenticated */
if (!fflg || (getuid () != 0)) {
int failcount = 0;
-@@ -645,9 +639,6 @@
+@@ -645,11 +639,6 @@
failed = 0;
failcount++;
+-#ifdef HAS_PAM_FAIL_DELAY
- if (delay > 0) {
- retcode = pam_fail_delay(pamh, 1000000*delay);
- }
+-#endif
retcode = pam_authenticate (pamh, 0);
Modified: debian/trunk/debian/patches/506_relaxed_usernames
===================================================================
--- debian/trunk/debian/patches/506_relaxed_usernames 2008-09-14 14:02:45 UTC (rev 2418)
+++ debian/trunk/debian/patches/506_relaxed_usernames 2008-09-14 14:10:48 UTC (rev 2419)
@@ -62,13 +62,13 @@
</listitem>
</varlistentry>
<varlistentry>
-@@ -372,9 +373,18 @@
+@@ -372,9 +373,15 @@
</para>
<para>
- Usernames must begin with a lower case letter or an underscore, and
- only lower case letters, underscores, dashes, and dollar signs may
-- follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
+- follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+ It is usually recommended to only use usernames that begin with
+ a lower case letter or an underscore, and are only followed by lower
+ case letters, digits, underscores, dashes, and optionally terminated by
@@ -78,9 +78,6 @@
+ On Debian, the only constraints are that usernames must neither start
+ with a dash ('-') nor contain a colon (':') or a whitespace (space:' ',
+ end of line: '\n', tabulation: '\t', etc.).
-+ </para>
-+ <para>
-+ Usernames may only be up to 32 characters long.
</para>
</refsect1>
@@ -94,7 +91,7 @@
<para>
- Groupnames must begin with a lower case letter or an underscore,
- and only lower case letters, underscores, dashes, and dollar signs
-- may follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]
+- may follow. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+ It is usually recommended to only use usernames that begin with
+ a lower case letter or an underscore, and are only followed by lower
+ case letters, digits, underscores, dashes, and optionally terminated by
More information about the Pkg-shadow-commits
mailing list