*** empty log message ***

git-svn-id: file:///tmp/cracklib-svn/trunk@8 4175fe1e-86d5-4fdc-8e6a-506fab9d8533

diff --git a/cracklib/util/.cvsignore b/cracklib/util/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..97c5746a5d366dbe982c9882eb5fcc853157d92c 100644 (file)
--- a/cracklib/util/.cvsignore
+++ b/cracklib/util/.cvsignore
@@ -1 +1,13 @@
 Makefile.in
+cracklib-unpacker
+unpacker
+teststr
+testnum
+testlib
+testcheck
+packer
+cracklib-packer
+create-cracklib-dict
+Makefile
+.libs
+.deps

diff --git a/cracklib/util/Makefile.am b/cracklib/util/Makefile.am
index 63d7cccff9830d041516d06ad99a3de2440f9ed3..12d40bbaf41c20d5c83e4554e1135d0fa5087d68 100644 (file)
--- a/cracklib/util/Makefile.am
+++ b/cracklib/util/Makefile.am
@@ -1,6 +1,8 @@
-noinst_PROGRAMS = testcheck packer testlib testnum teststr unpacker
+sbin_PROGRAMS = cracklib-packer
 
-sbin_SCRIPTS = mkdict
+noinst_PROGRAMS = testcheck cracklib-packer testlib testnum teststr unpacker
+
+sbin_SCRIPTS = create-cracklib-dict cracklib-format
 
 LDADD = ../lib/libcrack.la
 AM_CPPFLAGS = -I. -I.. -I$(top_srcdir)/lib 
@@ -8,8 +10,8 @@ AM_CPPFLAGS = -I. -I.. -I$(top_srcdir)/lib
 testcheck_SOURCES = testcheck.c
 testcheck_LDADD = $(LDADD)
 
-packer_SOURCES = packer.c
-packer_LDADD = $(LDADD)
+cracklib-packer_SOURCES = packer.c
+cracklib-packer_LDADD = $(LDADD)
 
 testlib_SOURCES = testlib.c
 testlib_LDADD = $(LDADD)

diff --git a/cracklib/util/cracklib-format b/cracklib/util/cracklib-format
new file mode 100644 (file)
index 0000000..01238a1
--- /dev/null
+++ b/cracklib/util/cracklib-format
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# This preprocesses a set of word lists into a suitable form for input
+# into cracklib-packer
+#
+gzip -cdf $* |
+    tr '[A-Z]' '[a-z]' |
+    tr -cd '\012[a-z][0-9]' |
+    sort |
+    uniq |
+    grep -v '^#' |
+    grep -v '^$'

diff --git a/cracklib/util/create-cracklib-dict.in b/cracklib/util/create-cracklib-dict.in
deleted file mode 100644 (file)
index 6ca61e7..0000000
--- a/cracklib/util/create-cracklib-dict.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-if [ -z "$*" ]; then
-    echo "Usage:"
-    echo "  /usr/sbin/create-cracklib-dict wordlist ..."
-    echo
-    echo "This script takes one or more word list files as arguments"
-    echo "and converts them into cracklib dictionaries for use"
-    echo "by password checking programs. The results are placed in"
-    echo "/lib/cracklib_dict.*"
-    echo
-    echo "Example:"
-    echo "/usr/sbin/create-cracklib-dict /usr/dict/words"
-else
-    /usr/sbin/mkdict $* | /usr/sbin/packer /usr/share/cracklib/pw_dict
-fi
-