[Pkg-shadow-commits] r2970 - in debian/trunk/debian: . patches

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-05-21 15:17:46 +0000 (Thu, 21 May 2009)
New Revision: 2970

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/506_relaxed_usernames
Log:
     - Updated patches:
        + debian/patches/506_relaxed_usernames


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2009-05-21 15:15:22 UTC (rev 2969)
+++ debian/trunk/debian/changelog	2009-05-21 15:17:46 UTC (rev 2970)
@@ -8,8 +8,10 @@
        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 at centraliens.net>  Mon, 18 May 2009 18:00:33 +0200
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Thu, 21 May 2009 17:15:40 +0200
 
 shadow (1:4.1.4-3) unstable; urgency=low
 

Modified: debian/trunk/debian/patches/506_relaxed_usernames
===================================================================
--- debian/trunk/debian/patches/506_relaxed_usernames	2009-05-21 15:15:22 UTC (rev 2969)
+++ debian/trunk/debian/patches/506_relaxed_usernames	2009-05-21 15:17:46 UTC (rev 2970)
@@ -62,17 +62,15 @@
  	</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 @@
 ===================================================================
 --- 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