[Pkg-cracklib-commits] r65 - cracklib2/branches/2.8.12-8lenny/debian

[jandd-guest at alioth.debian.org]

Author: jandd-guest
Date: 2008-10-16 19:56:35 +0000 (Thu, 16 Oct 2008)
New Revision: 65

Modified:
   cracklib2/branches/2.8.12-8lenny/debian/changelog
   cracklib2/branches/2.8.12-8lenny/debian/cracklib-runtime.preinst
   cracklib2/branches/2.8.12-8lenny/debian/update-cracklib
Log:
fix for LP: #278743 and a Lintian warning

Modified: cracklib2/branches/2.8.12-8lenny/debian/changelog
===================================================================
--- cracklib2/branches/2.8.12-8lenny/debian/changelog	2008-10-16 19:09:29 UTC (rev 64)
+++ cracklib2/branches/2.8.12-8lenny/debian/changelog	2008-10-16 19:56:35 UTC (rev 65)
@@ -1,3 +1,17 @@
+cracklib2 (2.8.12-8lenny1) testing-proposed-updates; urgency=low
+
+  [ Steve Langasek ]
+  * debian/update-cracklib: don't rely on [ -nt ] to return true when
+    the second file is non-existent, since this fails under dash.
+    LP: #278743.
+
+  [ Jan Dittberner ]
+  * integrate Ubuntu bugfix
+  * use set -e in debian/cracklib-runtime.preinst to fix lintian warning
+    maintainer-script-ignores-errors
+
+ -- Jan Dittberner <jan at dittberner.info>  Thu, 16 Oct 2008 21:04:24 +0200
+
 cracklib2 (2.8.12-8) unstable; urgency=low
 
   * provide a python-crack wrapper to mimic the behavior of the python-

Modified: cracklib2/branches/2.8.12-8lenny/debian/cracklib-runtime.preinst
===================================================================
--- cracklib2/branches/2.8.12-8lenny/debian/cracklib-runtime.preinst	2008-10-16 19:09:29 UTC (rev 64)
+++ cracklib2/branches/2.8.12-8lenny/debian/cracklib-runtime.preinst	2008-10-16 19:56:35 UTC (rev 65)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 case "$1" in
 install|upgrade)
     # /etc/cron.daily/cracklib -> cracklib-runtime transition

Modified: cracklib2/branches/2.8.12-8lenny/debian/update-cracklib
===================================================================
--- cracklib2/branches/2.8.12-8lenny/debian/update-cracklib	2008-10-16 19:09:29 UTC (rev 64)
+++ cracklib2/branches/2.8.12-8lenny/debian/update-cracklib	2008-10-16 19:56:35 UTC (rev 65)
@@ -24,7 +24,8 @@
 then
     for i in ${cracklib_dictpath_src}
     do
-        if [ "$i" -nt "${cracklib_dictpath}.pwd" ]
+        if ! [ -e "${cracklib_dictpath}.pwd" ] \
+	   || [ "$i" -nt "${cracklib_dictpath}.pwd" ]
         then
             /usr/sbin/cracklib-format ${cracklib_dictpath_src} | \
             /usr/sbin/cracklib-packer