From 0ea08a396150659815bb36930e90d222cbcc0bc2 Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Thu, 21 May 2009 15:17:46 +0000
Subject: [PATCH]      - Updated patches:         +
 debian/patches/506_relaxed_usernames

---
 debian/changelog                     |  4 +++-
 debian/patches/506_relaxed_usernames | 28 ++++++++++++----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4967cf0..79e405c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ shadow (1:4.1.4.1-1) unstable; urgency=low
        Otherwise, it still check with utmp if the user is logged in and check
        if the process indicated by utmp is still running to avoid
        mis-detection of logged-in users. Closes: #528060
+     - Updated patches:
+        + debian/patches/506_relaxed_usernames
 
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Mon, 18 May 2009 18:00:33 +0200
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Thu, 21 May 2009 17:15:40 +0200
 
 shadow (1:4.1.4-3) unstable; urgency=low
 
diff --git a/debian/patches/506_relaxed_usernames b/debian/patches/506_relaxed_usernames
index 213c253e..0054b7c2 100755
--- a/debian/patches/506_relaxed_usernames
+++ b/debian/patches/506_relaxed_usernames
@@ -62,17 +62,15 @@ Index: shadow-4.1.0/man/useradd.8.xml
  	</listitem>
        </varlistentry>
        <varlistentry>
-@@ -372,9 +373,15 @@
+@@ -372,10 +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_-]*[$]?
-+      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
-+      a dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+-      Usernames must start with a lower case letter or an underscore,
++      It is usually recommended to only use usernames that begin with a lower case letter or an underscore,
+       followed by lower case letters, digits, underscores, or dashes.
+       They can end with a dollar sign.
+       In regular expression terms: [a-z_][a-z0-9_-]*[$]?
 +    </para>
 +    <para>
 +      On Debian, the only constraints are that usernames must neither start
@@ -85,17 +83,15 @@ Index: shadow-4.1.1/man/groupadd.8.xml
 ===================================================================
 --- shadow-4.1.1.orig/man/groupadd.8.xml	2008-08-15 09:07:37.033120372 -0300
 +++ shadow-4.1.1/man/groupadd.8.xml	2008-08-15 09:10:24.961112507 -0300
-@@ -170,9 +170,15 @@
+@@ -170,10 +170,15 @@
     <refsect1 id='caveats'>
       <title>CAVEATS</title>
       <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_-]*[$]?
-+       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
-+       a dollar sign. In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+-       Groupnames must start with a lower case letter or an underscore,
++       It is usually recommended to only use groupnames that begin with a lower case letter or an underscore,
+        followed by lower case letters, digits, underscores, or dashes.
+        They can end with a dollar sign.
+        In regular expression terms: [a-z_][a-z0-9_-]*[$]?
 +     </para>
 +     <para>
 +       On Debian, the only constraints are that usernames must neither start