Added pam & uclibc to IUSE. Removed executable bit from libcrack.a, if pam is in not in USE we remove libcrack.a all together. Fixed long what appears to be long standing bug with libcrack that nobody noticed (it was looking for the words file at /usr/dict/words vs /usr/share/dict/words) If uclibc is set in IUSE we use the compressed dict provided by miscfiles.

4 files changed, 49 insertions, 8 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index a6a2b57092e3..5b13d0c48437 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.44 2004/06/02 04:36:07 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.45 2004/06/22 19:41:32 solar Exp $
+
+  22 Jun 2004; <solar@gentoo.org> cracklib-2.7-r9.ebuild,
+  files/cracklib-2.7-gzip.patch:
+  Added pam & uclibc to IUSE. Removed executable bit from libcrack.a, if pam is
+  in not in USE we remove libcrack.a all together. Fixed long what appears to be
+  long standing bug with libcrack that nobody noticed (it was looking for the
+  words file at /usr/dict/words vs /usr/share/dict/words) If uclibc is set in
+  IUSE we use the compressed dict provided by miscfiles.
 
   02 Jun 2004; Travis Tilley <lv@gentoo.org> cracklib-2.7-r9.ebuild:
   stable on amd64
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 5728104164ab..2371143e9f84 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,9 +1,10 @@
-MD5 ad98e2068719fd9770bad47a2d02b8d5 cracklib-2.7-r7.ebuild 1426
-MD5 7c4dd450f4daf34db9bfa52d6b3998ff cracklib-2.7-r9.ebuild 1830
-MD5 bcb4a1f16fe5ed02f07eac816d5dd629 cracklib-2.7-r8.ebuild 1700
-MD5 ab5e66ef43fc47ea8b4363df12a29bce ChangeLog 5960
+MD5 170795901d6242b98a8dc4f3badd6531 cracklib-2.7-r7.ebuild 1425
+MD5 d9c2510978dae627fab18128c2e16265 cracklib-2.7-r9.ebuild 2253
+MD5 ffe9aa403bf12c5d4eddf4343d17da24 cracklib-2.7-r8.ebuild 1699
+MD5 633b5f6c06e09591ab566ff07f567297 ChangeLog 6425
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
+MD5 336ab4f8ce8e3a3955ec8722d32076b4 files/cracklib-2.7-gzip.patch 521
 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224
 MD5 cd32ee2bf36a5facd5b5eb5d99aa66ee files/cracklib-2.7-static-lib.patch 1346
 MD5 9c566d6a249f8d02ad419aac76fffd66 files/cracklib-2.7-gentoo-new.diff 4244
diff --git a/sys-libs/cracklib/cracklib-2.7-r9.ebuild b/sys-libs/cracklib/cracklib-2.7-r9.ebuild
index b59282302bda..f5c7d1ac833d 100644
--- a/sys-libs/cracklib/cracklib-2.7-r9.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r9.ebuild,v 1.5 2004/06/02 04:36:07 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r9.ebuild,v 1.6 2004/06/22 19:41:32 solar Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,11 +13,12 @@ SRC_URI="http://www.crypticide.org/users/alecm/security/${MY_P}.tar.gz"
 LICENSE="CRACKLIB"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa amd64 ~ia64 ~ppc64 s390"
-IUSE=""
+IUSE="pam uclibc"
 
 RDEPEND="sys-apps/miscfiles
 	>=sys-apps/portage-2.0.47-r10"
 DEPEND="${RDEPEND}
+	uclibc? ( app-arch/gzip )
 	sys-devel/gcc-config"
 
 src_unpack() {
@@ -28,6 +29,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo-new.diff
 	epatch ${FILESDIR}/${P}-static-lib.patch
 
+	# add compressed dict support, taken from shadow-4.0.4.1
+	use uclibc && epatch ${FILESDIR}/${PN}-${PV}-gzip.patch
+
+	sed -e 's|/usr/dict/words|/usr/share/dict/words|' -i util/create-cracklib-dict
+
 	[ "${ARCH}" = "alpha" -a "${CC}" = "ccc" ] && \
 		sed -i -e 's:CFLAGS += -g :CFLAGS += -g3 :' ${S}/cracklib/Makefile
 }
@@ -45,18 +51,25 @@ src_install() {
 	make DESTDIR=${D} install || die
 
 	# Needed by pam
-	if [ ! -f "${D}/usr/lib/libcrack.a" ]
+	if ( [ ! -f "${D}/usr/lib/libcrack.a" ] && use pam )
 	then
 		eerror "Could not find libcrack.a which is needed by core components!"
 		die "Could not find libcrack.a which is needed by core components!"
 	fi
 
+	# correct permissions on static lib
+	[ -x ${D}/usr/lib/libcrack.a ] && fperms 644 usr/lib/libcrack.a
+
 	# put libcrack.so.2.7 in /lib for cases where /usr isn't available yet
 	mv ${D}/usr/lib/libcrack.so* ${D}/lib
 
 	# This link is needed and not created. :| bug #9611
 	cd ${D}/lib
 	dosym libcrack.so.2.7 /lib/libcrack.so.2
+
+	# remove it, if not needed
+	use pam || rm -f ${D}/usr/lib/libcrack.a
+
 	cd ${S}
 
 	cp ${S}/cracklib/packer.h ${D}/usr/include
diff --git a/sys-libs/cracklib/files/cracklib-2.7-gzip.patch b/sys-libs/cracklib/files/cracklib-2.7-gzip.patch
new file mode 100644
index 000000000000..1caf7dca4258
--- /dev/null
+++ b/sys-libs/cracklib/files/cracklib-2.7-gzip.patch
@@ -0,0 +1,19 @@
+diff -ur orig/cracklib26_small/util/mkdict cracklib26_small/util/mkdict
+--- orig/cracklib26_small/util/mkdict	Fri Jul  9 22:23:03 1993
++++ cracklib26_small/util/mkdict	Sat Apr  4 22:31:45 1998
+@@ -14,7 +14,14 @@
+ SORT="sort"
+ ###SORT="sort -T /tmp"
+ 
+-cat $* |
++### Use zcat to read compressed (as well as uncompressed) dictionaries.
++### Compressed dictionaries can save quite a lot of disk space.
++
++CAT="gzip -cdf"
++###CAT="zcat"
++###CAT="cat"
++
++$CAT $* |
+ 	tr '[A-Z]' '[a-z]' |
+ 	tr -cd '\012[a-z][0-9]' |
+ 	$SORT |