[Pkg-cracklib-commits] [SCM] Git repository for pkg-cracklib branch, master, updated. debian/2.8.18-2-6-g4f3f211

Fri Jan 27 15:32:39 UTC 2012

The following commit has been merged in the master branch:
commit 34579077f5be8285f6f242fae6043f2d00ef4080
Author: Jan Dittberner <jandd at debian.org>
Date:   Fri Jan 27 15:23:20 2012 +0100

    Patch for 65736 by Fabian Greffrath
    
    * Non-maintainer upload.
    * Extend the tiny example wordlist included with the cracklib package
      itself with the words from the list of "The Top 500 Worst Passwords
      of All Time" [1], modulo the ones that fail the regular cracklib tests
      anyway (Closes: 657464).
      [1] <http://www.whatsmypass.com/the-top-500-worst-passwords-of-all-time>
    * Move the /usr/share/cracklib/cracklib-small wordlist file from the
      libcrack2 to the cracklib-runtime package and install it into
      /usr/share/dict. So there will always be at least the tiny example
      wordlist to compile a database from, even if no other package providing
      a wordlist (though recommended) is installed.
    * Do not install the /usr/share/cracklib/cracklib.magic file anymore.
      It was installed in the wrong location anyway and the file(1) tool
      is able to independently detect cracklib databases since at least 2005.
    * Remove config.h.in in the clean rule in debian/rules,
      fixes FTBFS twice in a row.

diff --git a/debian/changelog b/debian/changelog
index 29c4295..7b89eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+cracklib2 (2.8.18-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Extend the tiny example wordlist included with the cracklib package
+    itself with the words from the list of "The Top 500 Worst Passwords
+    of All Time" [1], modulo the ones that fail the regular cracklib tests
+    anyway (Closes: 657464).
+    [1] <http://www.whatsmypass.com/the-top-500-worst-passwords-of-all-time>
+  * Move the /usr/share/cracklib/cracklib-small wordlist file from the
+    libcrack2 to the cracklib-runtime package and install it into
+    /usr/share/dict. So there will always be at least the tiny example
+    wordlist to compile a database from, even if no other package providing
+    a wordlist (though recommended) is installed.
+  * Do not install the /usr/share/cracklib/cracklib.magic file anymore.
+    It was installed in the wrong location anyway and the file(1) tool
+    is able to independently detect cracklib databases since at least 2005.
+  * Remove config.h.in in the clean rule in debian/rules,
+    fixes FTBFS twice in a row.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Fri, 27 Jan 2012 10:51:50 +0100
+
 cracklib2 (2.8.18-3) unstable; urgency=low
 
   * switch from python-support to dh_python2
diff --git a/debian/cracklib-runtime.install b/debian/cracklib-runtime.install
index 5e57b68..b01261e 100644
--- a/debian/cracklib-runtime.install
+++ b/debian/cracklib-runtime.install
@@ -5,3 +5,4 @@ debian/tmp/usr/sbin/cracklib-format usr/sbin
 debian/tmp/usr/sbin/cracklib-packer usr/sbin
 debian/tmp/usr/sbin/cracklib-unpacker usr/sbin
 debian/tmp/usr/sbin/create-cracklib-dict usr/sbin
+debian/tmp/usr/share/cracklib/cracklib-small usr/share/dict
diff --git a/debian/libcrack2.install b/debian/libcrack2.install
index 779448f..b784046 100644
--- a/debian/libcrack2.install
+++ b/debian/libcrack2.install
@@ -1,4 +1,2 @@
 debian/tmp/usr/lib/libcrack.so.2.8.1 usr/lib
-debian/tmp/usr/share/cracklib/cracklib-small usr/share/cracklib
-debian/tmp/usr/share/cracklib/cracklib.magic usr/share/cracklib
 debian/tmp/usr/share/locale/* usr/share/locale
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ce1daa9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+top-500-worst-passwords.patch
diff --git a/debian/patches/top-500-worst-passwords.patch b/debian/patches/top-500-worst-passwords.patch
new file mode 100644
index 0000000..67d9c79
--- /dev/null
+++ b/debian/patches/top-500-worst-passwords.patch
@@ -0,0 +1,169 @@
+Description: Extend the tiny example wordlist included with the cracklib
+ package itself with the words from the list of "The Top 500 Worst Passwords
+ of All Time", modulo the ones that fail the regular cracklib tests anyway. 
+Origin: http://www.whatsmypass.com/the-top-500-worst-passwords-of-all-time
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657464
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+
+--- cracklib2-2.8.18.orig/dicts/cracklib-small
++++ cracklib2-2.8.18/dicts/cracklib-small
+@@ -6,6 +6,7 @@
+ 5th
+ 6th
+ 7th
++8675309
+ 8th
+ 9th
+ a
+@@ -90,6 +91,7 @@ abetter
+ abetting
+ abeyance
+ abeyant
++abgrtyu
+ abhor
+ abhorred
+ abhorrent
+@@ -3228,6 +3230,7 @@ ascribed
+ ascribes
+ ascribing
+ ascription
++asdfgh
+ aseptic
+ asexual
+ ash
+@@ -7685,6 +7688,7 @@ butternut
+ butters
+ buttery
+ buttes
++butthead
+ butting
+ buttock
+ buttock's
+@@ -19308,6 +19312,7 @@ fire
+ firearm
+ firearm's
+ firearms
++firebird
+ fireboat
+ firebreak
+ firebug
+@@ -20770,6 +20775,7 @@ gamin
+ gaming
+ gamma
+ gamut
++gandalf
+ gander
+ gang
+ ganges
+@@ -22572,6 +22578,7 @@ hardbake
+ hardboard
+ hardboiled
+ hardcopy
++hardcore
+ harden
+ harder
+ hardest
+@@ -24288,6 +24295,7 @@ illustrious
+ illustriousness
+ illy
+ ilona
++iloveyou
+ ilyushin
+ i'm
+ image
+@@ -26413,6 +26421,7 @@ ivies
+ ivory
+ ivy
+ ivy's
++iwantu
+ ix
+ izvestia
+ j
+@@ -28036,6 +28045,7 @@ lethargic
+ lethargy
+ lethe
+ letitia
++letmein
+ let's
+ lets
+ letter
+@@ -31899,6 +31909,7 @@ nbs
+ nc
+ ncaa
+ ncar
++ncc1701
+ nco
+ ncr
+ nd
+@@ -36095,6 +36106,7 @@ pony's
+ pooch
+ poodle
+ pooh
++pookie
+ pool
+ poole
+ pooled
+@@ -37815,6 +37827,7 @@ pythagorean
+ python
+ q
+ qatar
++qazwsx
+ qed
+ q's
+ qua
+@@ -38088,6 +38101,8 @@ quotes
+ quoth
+ quotient
+ quoting
++qwerty
++qwertyui
+ r
+ rabat
+ rabbet
+@@ -41054,6 +41069,7 @@ rural
+ rurally
+ ruse
+ rush
++rush2112
+ rushed
+ rusher
+ rushes
+@@ -41774,6 +41790,7 @@ scold
+ scolded
+ scolding
+ scolds
++scooby
+ scoop
+ scooped
+ scooping
+@@ -44957,6 +44974,7 @@ squirrels
+ squirt
+ squishy
+ sri
++srinivas
+ s's
+ sse
+ sst
+@@ -45161,6 +45179,7 @@ starve
+ starved
+ starves
+ starving
++starwars
+ stash
+ stasis
+ state
+@@ -48107,6 +48126,7 @@ thwack
+ thwart
+ thwarted
+ thwarting
++thx1138
+ thy
+ thyme
+ thymine
+@@ -52845,4 +52865,6 @@ zounds
+ z's
+ zucchini
+ zurich
++zxcvbn
++zxcvbnm
+ zygote
diff --git a/debian/rules b/debian/rules
index 7252a5b..496bb42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ override_dh_auto_clean:
 	 dicts/Makefile.in doc/Makefile.in lib/Makefile.in m4/Makefile.in	\
 	 py-compile python/Makefile.in util/Makefile.in ltmain.sh			\
 	 m4/ltoptions.m4 m4/ltversion.m4 m4/libtool.m4 m4/ltsugar.m4		\
-	 m4/lt~obsolete.m4
+	 m4/lt~obsolete.m4 config.h.in
 
 override_dh_auto_install:
 	$(MAKE) -C debian/tmpbuild DESTDIR=`pwd`/debian/tmp install

-- 
Git repository for pkg-cracklib

