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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2012-02-16 20:28:21 +0000 (Thu, 16 Feb 2012)
New Revision: 3712

Removed:
   debian/trunk/debian/patches/428_grpck_add_prune_option
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/shadowconfig.sh
Log:
  * debian/patches/428_grpck_add_prune_option: removed -p option. The option
    was not documented and was meant to fix consequences of a bug now fixed
    more than 10 years ago.
Note that debian/patches/428_grpck_add_prune_option was broken by the
refresh in 4.1.5-1
  * debian/shadowconfig.sh: Display issues, but dot not prompt interactively
    to fix passwd/group/shadow/gshadow issues. Closes: #638263


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2012-02-13 20:33:28 UTC (rev 3711)
+++ debian/trunk/debian/changelog	2012-02-16 20:28:21 UTC (rev 3712)
@@ -1,3 +1,17 @@
+shadow (1:4.1.5.1-1) unstable; urgency=low
+
+  * The "Gruyère" release.
+
+  * New upstream release:
+    - 
+  * debian/patches/428_grpck_add_prune_option: removed -p option. The option
+    was not documented and was meant to fix consequences of a bug now fixed
+    more than 10 years ago.
+  * debian/shadowconfig.sh: Display issues, but dot not prompt interactively
+    to fix passwd/group/shadow/gshadow issues. Closes: #638263
+
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Thu, 16 Feb 2012 20:58:49 +0100
+
 shadow (1:4.1.5-1) unstable; urgency=low
 
   * The "Charolais" release.

Deleted: debian/trunk/debian/patches/428_grpck_add_prune_option
===================================================================
--- debian/trunk/debian/patches/428_grpck_add_prune_option	2012-02-13 20:33:28 UTC (rev 3711)
+++ debian/trunk/debian/patches/428_grpck_add_prune_option	2012-02-16 20:28:21 UTC (rev 3712)
@@ -1,26 +0,0 @@
-Goal: grpck now has an (otherwise undocumented) -p option, so that
-      shadowconfig can clean up the results of the above, so the config
-      script will fail randomly less often.
-Fixes: #103385
-
-Status wrt upstream: It could certainly be submitted to upstream.
-
---- a/src/grpck.c
-+++ b/src/grpck.c
-@@ -81,6 +81,7 @@
- /* Options */
- static bool read_only = false;
- static bool sort_mode = false;
-+static bool prune = false;
- 
- /* local function prototypes */
- static void fail_exit (int status);
-@@ -203,7 +204,7 @@
- 	/*
- 	 * Parse the command line arguments
- 	 */
--	while ((c = getopt_long (argc, argv, "hqrR:s",
-+	while ((c = getopt_long (argc, argv, "hqprR:s",
- 	                         long_options, NULL)) != -1) {
- 		switch (c) {
- 		case 'h':

Modified: debian/trunk/debian/shadowconfig.sh
===================================================================
--- debian/trunk/debian/shadowconfig.sh	2012-02-13 20:33:28 UTC (rev 3711)
+++ debian/trunk/debian/shadowconfig.sh	2012-02-16 20:28:21 UTC (rev 3712)
@@ -5,8 +5,8 @@
 
 shadowon () {
     set -e
-    pwck -q
-    grpck -p
+    pwck -q -r
+    grpck -r
     pwconv
     grpconv
     chown root:root /etc/passwd /etc/group
@@ -17,8 +17,8 @@
 
 shadowoff () {
     set -e
-    pwck -q
-    grpck -p
+    pwck -q -r
+    grpck -r
     pwunconv
     grpunconv
     # sometimes the passwd perms get munged