[Pkg-cracklib-commits] r72 - in cracklib2/trunk/debian: . patches

[jandd-guest at alioth.debian.org]

Author: jandd-guest
Date: 2008-12-09 21:20:49 +0000 (Tue, 09 Dec 2008)
New Revision: 72

Modified:
   cracklib2/trunk/debian/changelog
   cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch
   cracklib2/trunk/debian/patches/02-ccwarnings.patch
   cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch
   cracklib2/trunk/debian/patches/04-enable-gettext.patch
   cracklib2/trunk/debian/update-cracklib
Log:
fix for #508255 (LP: #304307) and lintian warnings

Modified: cracklib2/trunk/debian/changelog
===================================================================
--- cracklib2/trunk/debian/changelog	2008-10-28 19:54:28 UTC (rev 71)
+++ cracklib2/trunk/debian/changelog	2008-12-09 21:20:49 UTC (rev 72)
@@ -1,3 +1,12 @@
+cracklib2 (2.8.13-4) unstable; urgency=low
+
+  * debian/update-cracklib: add a check whether all installed
+    dictionaries were used to create the existing cracklib dictionary
+    (Closes: #508255 and LP: #304307)
+  * add descriptions to the quilt patches (fixes lintian warnings)
+
+ -- Jan Dittberner <jan at dittberner.info>  Tue, 09 Dec 2008 22:13:20 +0100
+
 cracklib2 (2.8.13-3) unstable; urgency=low
 
   * debian/patches/04-enable-gettext.patch fixes gettext not correctly

Modified: cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch
===================================================================
--- cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch	2008-10-28 19:54:28 UTC (rev 71)
+++ cracklib2/trunk/debian/patches/01-cracklib-format-optim.patch	2008-12-09 21:20:49 UTC (rev 72)
@@ -1,3 +1,4 @@
+optimize normalization in cracklib-format
 --- a/util/cracklib-format
 +++ b/util/cracklib-format
 @@ -4,9 +4,7 @@

Modified: cracklib2/trunk/debian/patches/02-ccwarnings.patch
===================================================================
--- cracklib2/trunk/debian/patches/02-ccwarnings.patch	2008-10-28 19:54:28 UTC (rev 71)
+++ cracklib2/trunk/debian/patches/02-ccwarnings.patch	2008-12-09 21:20:49 UTC (rev 72)
@@ -1,3 +1,4 @@
+fixes for cc warnings
 --- a/lib/packlib.c
 +++ b/lib/packlib.c
 @@ -15,7 +15,7 @@

Modified: cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch
===================================================================
--- cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch	2008-10-28 19:54:28 UTC (rev 71)
+++ cracklib2/trunk/debian/patches/03-packer-dont-print-skipping-line.patch	2008-12-09 21:20:49 UTC (rev 72)
@@ -1,3 +1,4 @@
+remove unnecessary output of skipped lines
 --- a/util/packer.c
 +++ b/util/packer.c
 @@ -57,7 +57,6 @@

Modified: cracklib2/trunk/debian/patches/04-enable-gettext.patch
===================================================================
--- cracklib2/trunk/debian/patches/04-enable-gettext.patch	2008-10-28 19:54:28 UTC (rev 71)
+++ cracklib2/trunk/debian/patches/04-enable-gettext.patch	2008-12-09 21:20:49 UTC (rev 72)
@@ -1,4 +1,4 @@
---- a/util/check.c
+enable gettext support--- a/util/check.c
 +++ b/util/check.c
 @@ -20,6 +20,9 @@
  	const char *why;

Modified: cracklib2/trunk/debian/update-cracklib
===================================================================
--- cracklib2/trunk/debian/update-cracklib	2008-10-28 19:54:28 UTC (rev 71)
+++ cracklib2/trunk/debian/update-cracklib	2008-12-09 21:20:49 UTC (rev 72)
@@ -22,14 +22,22 @@
 
 if [ -n "${cracklib_dictpath_src}"  -a  -n "${cracklib_dictpath}" ]
 then
+    processed=0
     for i in ${cracklib_dictpath_src}
     do
-        if ! [ -e "${cracklib_dictpath}.pwd" ] \
-	   || [ "$i" -nt "${cracklib_dictpath}.pwd" ]
+        if ! [ -e /var/cache/cracklib/src-dicts ] \
+            || ! grep -q "$i" /var/cache/cracklib/src-dicts \
+            || ! [ -e "${cracklib_dictpath}.pwd" ] \
+            || [ "$i" -nt "${cracklib_dictpath}.pwd" ]
         then
-            /usr/sbin/cracklib-format ${cracklib_dictpath_src} | \
-            /usr/sbin/cracklib-packer
-            exit 0
+            if [ $processed = 0 ]
+            then
+                /usr/sbin/cracklib-format ${cracklib_dictpath_src} | \
+                /usr/sbin/cracklib-packer
+                processed=1
+                echo "${cracklib_dictpath_src}" > \
+                    /var/cache/cracklib/src-dicts
+            fi
         fi
     done
 fi