Fix path to cracklib dict in python module #123913 by Frido Ferdinand.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 29 insertions, 17 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 27d6c6b68008..a14f2176c3fa 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.85 2006/01/17 00:42:54 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.86 2006/02/25 05:35:29 vapier Exp $
+
+*cracklib-2.8.5-r1 (25 Feb 2006)
+
+  25 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  files/cracklib-2.8.3-dictname.patch, -cracklib-2.8.5.ebuild,
+  +cracklib-2.8.5-r1.ebuild:
+  Fix path to cracklib dict in python module #123913 by Frido Ferdinand.
 
   17 Jan 2006; Stuart Longland <redhatter@gentoo.org> cracklib-2.8.5.ebuild:
   Marked stable on MIPS as per bug #118945
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 27fb25b8a081..66dc12787189 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5be7269746dbeccd184f0a9395b6cbb2 ChangeLog 11040
-RMD160 a5b568725d3ba506465ace2c7ca0d6400a9f88bd ChangeLog 11040
-SHA256 da45cd3c2280ed26cfab0cbb765a7891157490098a6e3d57d723ec98e8fa618c ChangeLog 11040
-MD5 852460433be408f4b0b4474141d28638 cracklib-2.8.5.ebuild 1442
-RMD160 1c37eb72cd7bedfe81f26c696d623e33dd4fad5c cracklib-2.8.5.ebuild 1442
-SHA256 3aacca9d03a500983722dbaee227a3cd0b5b27a4562da28ea0f3a92d1a04cb07 cracklib-2.8.5.ebuild 1442
-MD5 f078a8fa2074250986d685cac2b0b271 files/cracklib-2.8.3-dictname.patch 528
-RMD160 7759bf9439b1c1dcba21246148fd160a7936215f files/cracklib-2.8.3-dictname.patch 528
-SHA256 94bd7f042f999f9454d4eb7123b5ce44c707b8d2c23d0706c3fcd53a7c22ccf9 files/cracklib-2.8.3-dictname.patch 528
-MD5 44e1c89acbadcbd16e795bb6b7cce486 files/digest-cracklib-2.8.5 66
-RMD160 2c8efe928bbf2f600fa0f8e5954638dbf8401a4b files/digest-cracklib-2.8.5 66
-SHA256 0137d500ef0ba5f64badf0f4356ecada0903afdfc07bc56b1e147e40c2244879 files/digest-cracklib-2.8.5 66
+MD5 345e2d04ee58ae5eb501e5910dd6b8d5 ChangeLog 11287
+RMD160 320c09b3d49ad30113a33e26a2dab8b5a4fef00e ChangeLog 11287
+SHA256 5698c3790486c73e05e2b213f67224d11ff21125c2f572986f56455fa5c32fb3 ChangeLog 11287
+MD5 599c050af05d00bf8fa7fa9e95793fee cracklib-2.8.5-r1.ebuild 1441
+RMD160 8366137043c3654b3a79e55a46d0955c782e120f cracklib-2.8.5-r1.ebuild 1441
+SHA256 3c21a60235b5f6c8c95f0a79d36910214dd14d03ba51be3207746c304a021162 cracklib-2.8.5-r1.ebuild 1441
+MD5 bc2dca0a03c583e9a9dfcc343179a54a files/cracklib-2.8.3-dictname.patch 764
+RMD160 31a6a768e998979d7b544cd4f58f92de82788b62 files/cracklib-2.8.3-dictname.patch 764
+SHA256 a040ca605c8132afcde100a53730544535b07b6660c8d50e5ff071b94811cb72 files/cracklib-2.8.3-dictname.patch 764
+MD5 44e1c89acbadcbd16e795bb6b7cce486 files/digest-cracklib-2.8.5-r1 66
+RMD160 2c8efe928bbf2f600fa0f8e5954638dbf8401a4b files/digest-cracklib-2.8.5-r1 66
+SHA256 0137d500ef0ba5f64badf0f4356ecada0903afdfc07bc56b1e147e40c2244879 files/digest-cracklib-2.8.5-r1 66
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD/+oe2+ySkm8kpY0RAoPrAJsHXBnv4NVg+yNpccQ4DVhWzfsmiACeLbEH
-cM5RwkD+mfwyANESPCDDet0=
-=noxI
+iD8DBQFD/+zT2+ySkm8kpY0RAiIfAJ4ot13G7ixXHGrrJDlwSA3WgG7GwACfet5D
+/SI+zHw0h8pjdbfP81oJcQA=
+=WenW
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/cracklib/cracklib-2.8.5.ebuild b/sys-libs/cracklib/cracklib-2.8.5-r1.ebuild
index cb19dacc8b50..ab615f9f5df1 100644
--- a/sys-libs/cracklib/cracklib-2.8.5.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.5-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.5.ebuild,v 1.10 2006/01/17 00:42:54 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.5-r1.ebuild,v 1.1 2006/02/25 05:35:29 vapier Exp $
 
 inherit eutils toolchain-funcs multilib
 
diff --git a/sys-libs/cracklib/files/cracklib-2.8.3-dictname.patch b/sys-libs/cracklib/files/cracklib-2.8.3-dictname.patch
index ac2af270eb8b..5820bcfe3138 100644
--- a/sys-libs/cracklib/files/cracklib-2.8.3-dictname.patch
+++ b/sys-libs/cracklib/files/cracklib-2.8.3-dictname.patch
@@ -8,3 +8,8 @@
 @@ -103,1 +103,1 @@
 -AM_CPPFLAGS = -I. -I.. -I$(top_srcdir)/lib -DIN_CRACKLIB '-DDEFAULT_CRACKLIB_DICT="$(pkgdatadir)/pw_dict"'
 +AM_CPPFLAGS = -I. -I.. -I$(top_srcdir)/lib -DIN_CRACKLIB '-DDEFAULT_CRACKLIB_DICT="$(libdir)/cracklib_dict"'
+--- python/Makefile.in
++++ python/Makefile.in
+@@ -41 +41 @@
+-@BUILD_PYTHON_TRUE@am__append_1 = '-DDEFAULT_CRACKLIB_DICT="$(pkgdatadir)/pw_dict"' \
++@BUILD_PYTHON_TRUE@am__append_1 = '-DDEFAULT_CRACKLIB_DICT="$(libdir)/cracklib_dict"' \
diff --git a/sys-libs/cracklib/files/digest-cracklib-2.8.5 b/sys-libs/cracklib/files/digest-cracklib-2.8.5-r1
index 9e7250089b66..9e7250089b66 100644
--- a/sys-libs/cracklib/files/digest-cracklib-2.8.5
+++ b/sys-libs/cracklib/files/digest-cracklib-2.8.5-r1