Regenerate the cracklib dictionary in pkg_postinst from all dict files #114690 by...

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 97a264085877413d091f2dbc00aa0299928f4591..02c3c2cb1c0c3b8cd5daaf3e64e9379eec204f85 100644 (file)
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.104 2006/12/11 03:40:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.105 2006/12/30 02:21:38 vapier Exp $
+
+  30 Dec 2006; Mike Frysinger <vapier@gentoo.org> cracklib-2.8.9-r1.ebuild:
+  Regenerate the cracklib dictionary in pkg_postinst from all dict files
+  #114690 by Philippe Troin.
 
   11 Dec 2006; Mike Frysinger <vapier@gentoo.org> cracklib-2.8.9-r1.ebuild:
   Pull in python when USE=python #157787.

diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 8ad021a39d9c78d5a82c8ff4fca5f548005127f5..632faf1ae998dd6913e7bf6e79c545ef8ad7fbc4 100644 (file)
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -6,14 +6,14 @@ MD5 38ba66144a1a72859dfd05324306297e files/cracklib-2.8.9-findpw.patch 969
 RMD160 976a2d2c76c122db261f09e67c44ff92ec2b5dca files/cracklib-2.8.9-findpw.patch 969
 SHA256 2533b2701949b45f0819524b30dba495285f1beaf83f26e49d65c27730970b2a files/cracklib-2.8.9-findpw.patch 969
 DIST cracklib-2.8.9.tar.gz 575494 RMD160 97e36e1bc114ef74fae7feeb0701a7ef8ffe9a3e SHA1 22cc3c5ba5251771b3ba037d5dc8e87d17295f72 SHA256 1b58c9b03733ca4f58e417ea8bba8e1a335d2d0bf0a99caa414d0f07a9f6b7e6
-EBUILD cracklib-2.8.9-r1.ebuild 1514 RMD160 1e79a1ff2341f06a7d83104138cfe44a3e4af76c SHA1 241e25124910d25ec21b2bef9d882df7f0ef392a SHA256 90ede374a4d2f65cc8b20510a371ea88c1ca8be4bb615d2a1fcc7fe7dd091b47
-MD5 0d029fe90d905fdd0f593c6600ed1b28 cracklib-2.8.9-r1.ebuild 1514
-RMD160 1e79a1ff2341f06a7d83104138cfe44a3e4af76c cracklib-2.8.9-r1.ebuild 1514
-SHA256 90ede374a4d2f65cc8b20510a371ea88c1ca8be4bb615d2a1fcc7fe7dd091b47 cracklib-2.8.9-r1.ebuild 1514
-MISC ChangeLog 13343 RMD160 608b230eebe13f62733006a820cfa1cf633c4fb0 SHA1 f7bae77f2168dd6e3783b99c35c33113de571994 SHA256 13cd2a7002fc24e3948dc25f68263b011fae2544e9242acfff06c788d2d973bf
-MD5 70c601c3ffb60f76e01a04e7881916f4 ChangeLog 13343
-RMD160 608b230eebe13f62733006a820cfa1cf633c4fb0 ChangeLog 13343
-SHA256 13cd2a7002fc24e3948dc25f68263b011fae2544e9242acfff06c788d2d973bf ChangeLog 13343
+EBUILD cracklib-2.8.9-r1.ebuild 1406 RMD160 dc2fe1a1b808dbf18a3436226146d4db352ff9ab SHA1 4de796b9bc14d6a108e6dd917728304cd498638b SHA256 f833a801028a9f8ebbb4bb8cb5e287b21b2561cb5e5adbcd67687d534029b863
+MD5 48fcc272dee7232dda13e151029edceb cracklib-2.8.9-r1.ebuild 1406
+RMD160 dc2fe1a1b808dbf18a3436226146d4db352ff9ab cracklib-2.8.9-r1.ebuild 1406
+SHA256 f833a801028a9f8ebbb4bb8cb5e287b21b2561cb5e5adbcd67687d534029b863 cracklib-2.8.9-r1.ebuild 1406
+MISC ChangeLog 13522 RMD160 4624e620186107a5a02e1382ed67cd4832eb0f3b SHA1 1d75c1d15ce7c099930e725beb922c9f3efe59ad SHA256 7b9da83377598ca7e5950e7c6863d450cc44455796d2240996d086a3780ded29
+MD5 6619cc827c11934a1599ed1a95135b04 ChangeLog 13522
+RMD160 4624e620186107a5a02e1382ed67cd4832eb0f3b ChangeLog 13522
+SHA256 7b9da83377598ca7e5950e7c6863d450cc44455796d2240996d086a3780ded29 ChangeLog 13522
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -22,9 +22,9 @@ MD5 7508abc5789eb1e5519880407f2fd3fe files/digest-cracklib-2.8.9-r1 244
 RMD160 1735e84c3c298cc10e4efe81fbe4f3a9d0f34355 files/digest-cracklib-2.8.9-r1 244
 SHA256 c514d2cc36d140f57a271318c8d6ef7d0aa729052fc83e4c56a17a062cdfc4ec files/digest-cracklib-2.8.9-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfNQlamhnQswr0vIRAhKMAKCEFr18Qn50s5/qh6JBzpbj4wzKtQCgkEcJ
-hVVTculmry7F7C6lCjZd+n0=
-=fVQW
+iD8DBQFFlc1x8bi6rjpTunYRAtrzAJ4s2PHoIJ9hofy39tHFUuHNpf/9rACgn5zc
+iCQoa8NESW4rH76zZ28N3VI=
+=jfvL
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/cracklib/cracklib-2.8.9-r1.ebuild b/sys-libs/cracklib/cracklib-2.8.9-r1.ebuild
index a59663d7c72e1a19788b503804708acf48321365..dfd16345695100825f1377b39093024f70e8c53c 100644 (file)
--- a/sys-libs/cracklib/cracklib-2.8.9-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.9-r1.ebuild,v 1.11 2006/12/11 03:40:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.9-r1.ebuild,v 1.12 2006/12/30 02:21:38 vapier Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -34,7 +34,7 @@ src_compile() {
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
        rm -r "${D}"/usr/share/cracklib
 
        # move shared libs to /
@@ -42,14 +42,16 @@ src_install() {
        mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ || die "could not move shared"
        gen_usr_ldscript libcrack.so
 
-       echo -n "Generating cracklib dicts ... "
        insinto /usr/share/dict
        doins dicts/cracklib-small || die "word dict"
-       tc-is-cross-compiler \
-               || export PATH=${D}/usr/sbin:${PATH} LD_LIBRARY_PATH=${D}/$(get_libdir)
-       cracklib-format dicts/cracklib-small \
-               | cracklib-packer "${D}"/usr/$(get_libdir)/cracklib_dict \
-               || die "couldnt create dict"
 
        dodoc AUTHORS ChangeLog NEWS README*
 }
+
+pkg_postinst() {
+       if [[ ${ROOT} == "/" ]] ; then
+               ebegin "Regenerating cracklib dictionary"
+               create-cracklib-dict /usr/share/dict/* > /dev/null
+               eend $?
+       fi
+}