make sure CRACKLIB_DICTPATH is set properly #72871

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index f5bc7d6e6164788d31cba29dd76b90e773134918..be74d2317a9b55de5f3d5766eb73fac81b6a7124 100644 (file)
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,45 +1,45 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bcf82330e90bd6ccbdb35832f4515c38 shadow-4.0.6.ebuild 5124
-MD5 f51a14bf24b80a22cffde108b8926bfa shadow-4.0.4.1-r4.ebuild 5946
-MD5 ce9da667eed1ff6355e78620af4724b2 shadow-4.0.5-r3.ebuild 5508
 MD5 223a20d6185f22ed41f0e4c1d837e862 ChangeLog 16599
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 f51a14bf24b80a22cffde108b8926bfa shadow-4.0.4.1-r4.ebuild 5946
+MD5 bcf82330e90bd6ccbdb35832f4515c38 shadow-4.0.6.ebuild 5124
 MD5 4125cc2058868a022961911926760349 shadow-4.0.5-r2.ebuild 5422
-MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
-MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
+MD5 ce9da667eed1ff6355e78620af4724b2 shadow-4.0.5-r3.ebuild 5508
+MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
 MD5 2d2faa6b9a837f9319de52a780485743 files/securetty 243
-MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
+MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
+MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
+MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6 66
+MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
+MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
+MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
 MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
-MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
 MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
-MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
-MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
 MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
+MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
+MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
+MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
+MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
+MD5 20fd2dc35b8671b91e120b90281b4cf3 files/shadow-4.0.5-hack-X-envvars.patch 521
 MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r2 66
+MD5 d14e133da535d64d1b397784e17c213a files/shadow-4.0.5-login.defs.patch 766
 MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5-r3 66
-MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
-MD5 391991f50203bd8b7738474051befdee files/shadow-4.0.5-remove-else.patch 531
-MD5 e9ac6a566b65499773437ce98911a046 files/digest-shadow-4.0.6 66
-MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
-MD5 7aa1ebe82ada7f6de9b855a2226a49e4 files/shadow-4.0.5-login.defs.patch 752
-MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
-MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
-MD5 90e2ab53494f677dc23b5137d6e39110 files/shadow-4.0.6-fix-configure.patch 3047
-MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
+MD5 c5e9081ed43837797e2f1617b7ce1c24 files/shadow-4.0.5-fix-adding-of-pam_env-set-env-vars.patch 285
+MD5 fda41657b856ffaeec5a2734b312409b files/shadow-4.0.5-fix-mail-configure.patch 5452
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
-MD5 942190363cb06bd4cf1b3acdcca6c513 files/pam.d/su 1296
+MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
 MD5 344d17a865edc40adebe07797853c839 files/pam.d/other 198
-MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
 MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214
 MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
-MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
+MD5 942190363cb06bd4cf1b3acdcca6c513 files/pam.d/su 1296
+MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBpfyB94CCfB4KcwwRAtIEAJ9QU4KN0G2wvLAz4LSIapmZ+ZNDvgCfbS27
-h8rLtpTRbQxYxAaCSgjVIM0=
-=U6LC
+iD8DBQFBrctxroRuSHgZdywRAqaPAJ9gTYvcLOAd9gGK97YI+flCYsWdbwCfUP2p
+NtzBWygrz8tQCk928OSR9vE=
+=46ip
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch b/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch
index 9e18b123284ee235f7d84a1ec258bd1761a4acc6..02a8e55d27e3154bf8ac2ad6cfe80bdea6c45ea9 100644 (file)
--- a/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch
+++ b/sys-apps/shadow/files/shadow-4.0.5-login.defs.patch
@@ -16,7 +16,7 @@ diff -u -B -U0 -r1.14 login.defs.linux
 +SU_WHEEL_ONLY yes
 @@ -228 +228 @@
 -CRACKLIB_DICTPATH     /var/cache/cracklib/cracklib_dict
-+CRACKLIB_DICTPATH     /usr/lib
++CRACKLIB_DICTPATH     /usr/lib/cracklib_dict
 @@ -245 +245 @@
 -LOGIN_RETRIES         5
 +LOGIN_RETRIES         3