[Pkg-shadow-commits] r740 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-12-20 21:06:23 +0000 (Tue, 20 Dec 2005)
New Revision: 740

Removed:
   trunk/debian/patches/005_manpages.dpatch
Modified:
   trunk/debian/patches/406_good_name.dpatch
   trunk/debian/patches/series
Log:
Merge 005 in 406, since it documents a behavior introduced by 406.


Deleted: trunk/debian/patches/005_manpages.dpatch
===================================================================
--- trunk/debian/patches/005_manpages.dpatch	2005-12-20 20:49:22 UTC (rev 739)
+++ trunk/debian/patches/005_manpages.dpatch	2005-12-20 21:06:23 UTC (rev 740)
@@ -1,21 +0,0 @@
-Note: * The small useradd.8.xml change seems to be the only one
-        not applied upstream
-
-Status wrt upstream: Debian specific
-
-Note: Upstream is more restrictive on the username.
-      See 406_good_name.dpatch.
-      Maybe those patches should be merged.
-
-Index: shadow-4.0.14/man/useradd.8.xml
-===================================================================
---- shadow-4.0.14.orig/man/useradd.8.xml	2005-12-14 20:13:30.000000000 +0100
-+++ shadow-4.0.14/man/useradd.8.xml	2005-12-14 20:13:33.000000000 +0100
-@@ -173,6 +173,7 @@
- 	    valid in conjunction with the <option>-m</option> option. The
- 	    default is to not create the directory and to not copy any
- 	    files.
-+            This option may not function correctly if the username has a / in it.
- 	  </para>
- 	</listitem>
-       </varlistentry>

Modified: trunk/debian/patches/406_good_name.dpatch
===================================================================
--- trunk/debian/patches/406_good_name.dpatch	2005-12-20 20:49:22 UTC (rev 739)
+++ trunk/debian/patches/406_good_name.dpatch	2005-12-20 21:06:23 UTC (rev 740)
@@ -36,8 +36,8 @@
 @DPATCH@
 Index: shadow-4.0.14/libmisc/chkname.c
 ===================================================================
---- shadow-4.0.14.orig/libmisc/chkname.c	2005-08-31 19:24:57.000000000 +0200
-+++ shadow-4.0.14/libmisc/chkname.c	2005-12-20 21:33:09.000000000 +0100
+--- shadow-4.0.14.orig/libmisc/chkname.c	2005-12-20 21:50:31.000000000 +0100
++++ shadow-4.0.14/libmisc/chkname.c	2005-12-20 21:51:54.000000000 +0100
 @@ -17,6 +17,7 @@
  #endif
  static int good_name (const char *name)
@@ -65,9 +65,17 @@
  }
 Index: shadow-4.0.14/man/useradd.8.xml
 ===================================================================
---- shadow-4.0.14.orig/man/useradd.8.xml	2005-12-20 21:33:08.000000000 +0100
-+++ shadow-4.0.14/man/useradd.8.xml	2005-12-20 21:43:09.000000000 +0100
-@@ -352,9 +352,13 @@
+--- shadow-4.0.14.orig/man/useradd.8.xml	2005-12-20 21:50:50.000000000 +0100
++++ shadow-4.0.14/man/useradd.8.xml	2005-12-20 21:54:17.000000000 +0100
+@@ -173,6 +173,7 @@
+ 	    valid in conjunction with the <option>-m</option> option. The
+ 	    default is to not create the directory and to not copy any
+ 	    files.
++	    This option may not function correctly if the username has a / in it.
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
+@@ -351,9 +352,13 @@
      </para>
  
      <para>

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-12-20 20:49:22 UTC (rev 739)
+++ trunk/debian/patches/series	2005-12-20 21:06:23 UTC (rev 740)
@@ -1,7 +1,6 @@
 # Tomasz suggests it's probably useless as this is a workaround for 
 # wrongly linked PAM
 # 004_configure.in.dpatch
-005_manpages.dpatch
 503_shadowconfig.8
 431_su_uid_0_not_root
 008_su_no_sanitize_env