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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-13 16:30:37 +0000 (Sun, 13 Nov 2011)
New Revision: 3577

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/401_cppw_src.dpatch
Log:
  * debian/patches/401_cppw_src.dpatch: Detect as well too many and too
    few arguments.
  * Fix section of debian changelog where update of patches are documented


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2011-11-13 16:24:57 UTC (rev 3576)
+++ debian/trunk/debian/changelog	2011-11-13 16:30:37 UTC (rev 3577)
@@ -44,17 +44,9 @@
       + debian/patches/523_su_arguments_are_concatenated
       + debian/patches/542_useradd-O_option
       + debian/patches/428_grpck_add_prune_option
-    - debian/patches/506_relaxed_usernames: Really check if the user/group
-      name starts with a dash. Also forbid names starting with '+' or '~'.
-      Document the naming policy in useradd.8 / groupadd.8.
     - debian/patches/008_su_get_PAM_username: Removed, feature supported
       upstream.
     - debian/patches/300_CVE-2011-0721: Removed, applied upstream.
-    - debian/patches/401_cppw_src.dpatch: Replace progname by Prog. Rename
-      create_backup_file to create_copy. The lock functions do not ser errno.
-      Do not report the error string on cppwexit.
-    - debian/patches/401_cppw_src.dpatch, debian/patches/402_cppw_selinux:
-      Synchronize with coding style.
     - Upstream translation updates from Debian BTS:
       + Brazilian Portuguese. Closes: #622834
       + Catalan. Closes: #627526
@@ -80,12 +72,22 @@
   * debian/rules, debian/man.insert, debian/man.insert.sed: Bug #507673 has
     been closed. It is no more needed to patch the generated manpages. This
     also fix failures to build twice is a row. Closes: #636047
+  * debian/patches/401_cppw_src.dpatch: Replace progname by Prog. Rename
+    create_backup_file to create_copy. The lock functions do not set errno.
+    Do not report the error string on cppwexit.
+  * debian/patches/401_cppw_src.dpatch, debian/patches/402_cppw_selinux:
+    Synchronize with coding style.
+  * debian/patches/401_cppw_src.dpatch: Detect as well too many and too
+    few arguments.
+  * debian/patches/506_relaxed_usernames: Really check if the user/group
+    name starts with a dash. Also forbid names starting with '+' or '~'.
+    Document the naming policy in useradd.8 / groupadd.8.
 
   [ Christian Perrier ]
   * Use "linux-any" instead of a negated list of architectures in
     Build-Depends. Closes: #634465
 
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sun, 06 Nov 2011 20:02:00 +0100
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sun, 13 Nov 2011 17:26:12 +0100
 
 shadow (1:4.1.4.2+svn3283-3) unstable; urgency=high
 

Modified: debian/trunk/debian/patches/401_cppw_src.dpatch
===================================================================
--- debian/trunk/debian/patches/401_cppw_src.dpatch	2011-11-13 16:24:57 UTC (rev 3576)
+++ debian/trunk/debian/patches/401_cppw_src.dpatch	2011-11-13 16:30:37 UTC (rev 3577)
@@ -220,11 +220,11 @@
 +		}
 +	}
 +
-+	if (optind >= argc) {
-+		cppwexit (_("missing file argument, -h for usage"),0,1);
++	if (argc != optind + 1) {
++		cppwexit (_("wrong number of arguments, -h for usage"),0,1);
 +	}
 +
-+	in_file = argv[argc - 1];
++	in_file = argv[optind];
 +
 +	if (do_cppw) {
 +		if (cpshadow) {