use_authtok does not have a fallback, so disable that pam_unix call and replace with a clean one when not using pam_cracklib.

Package-Manager: portage-2.1.3_rc8

5 files changed, 30 insertions, 21 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 03c58e910611..945e0da8ff08 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.164 2007/07/12 09:28:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.165 2007/07/12 14:38:39 flameeyes Exp $
+
+*pam-0.99.8.0-r2 (12 Jul 2007)
+
+  12 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  files/system-auth.pamd.epam, -pam-0.99.8.0-r1.ebuild,
+  +pam-0.99.8.0-r2.ebuild:
+  use_authtok does not have a fallback, so disable that pam_unix call and
+  replace with a clean one when not using pam_cracklib.
 
   12 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> pam-0.78-r5.ebuild:
   Block the split modules to avoid collisions.
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 22c5ed72e85b..c79d1765887f 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -17,10 +17,10 @@ AUX system-auth.pamd.0.78 402 RMD160 88a97f51351d0a76c940d3ba032fae133f33a584 SH
 MD5 c3d3871612bfb718a50454c8fba54b64 files/system-auth.pamd.0.78 402
 RMD160 88a97f51351d0a76c940d3ba032fae133f33a584 files/system-auth.pamd.0.78 402
 SHA256 40d7b8409becd389a2ed4b751b85564f03b566ac33ed21c787289da0c4344aeb files/system-auth.pamd.0.78 402
-AUX system-auth.pamd.epam 473 RMD160 10d2728461840f3089778bf2535f1c11c7abe8a4 SHA1 fb500e4d9f1b7409e69af2009abfc55ab83bd5cc SHA256 67cc7386b321cf71879bfdd7bcf10bb60153f7fbd825de30423f008ebdc9626e
-MD5 30f2e7976c64d115b9ab913951bda755 files/system-auth.pamd.epam 473
-RMD160 10d2728461840f3089778bf2535f1c11c7abe8a4 files/system-auth.pamd.epam 473
-SHA256 67cc7386b321cf71879bfdd7bcf10bb60153f7fbd825de30423f008ebdc9626e files/system-auth.pamd.epam 473
+AUX system-auth.pamd.epam 592 RMD160 3eaf2af2f50b5dd19ef700d0a0acf0b25db65924 SHA1 befa052b3fd418abaf9fa3ebd5526f4847e9460c SHA256 13b1c18fe5248d5662c0750b5af11d5d5a6e8935bddbabfac99d9bfca3f29e77
+MD5 088b5d486b4f87647792a8e15502cd59 files/system-auth.pamd.epam 592
+RMD160 3eaf2af2f50b5dd19ef700d0a0acf0b25db65924 files/system-auth.pamd.epam 592
+SHA256 13b1c18fe5248d5662c0750b5af11d5d5a6e8935bddbabfac99d9bfca3f29e77 files/system-auth.pamd.epam 592
 DIST Linux-PAM-0.78.tar.gz 488936 RMD160 51643a8942267449b884f79804102fad61567df8 SHA1 fee3e519ac19dff64f7b14ecfa69c09d34411ebe SHA256 a18b9f7b45344a4e49d2647c036894cc6578f249fa0cf024763f1140df684d3e
 DIST Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554 RMD160 734f41e1e040f737ae9a229ce15c3a14caeb8922 SHA1 20095fa64eb87644efc7ae41ca87d9a42065fbe2 SHA256 f79f52e60390c1d131d4b590097ccb9e9705a4842c3b63de24f9867c6ea55336
 DIST Linux-PAM-0.99.8.0.tar.bz2 903366 RMD160 9e2c9bc00318ef711a2af4561a1c763c2ca28db5 SHA1 c344c7887d80eae5dc1ab7ac3ebfb412d555c4cf SHA256 4b42990b4cada5ad0abefd6048b8646b17813448fbf13d758cbce605908f02a2
@@ -31,14 +31,14 @@ EBUILD pam-0.78-r5.ebuild 11451 RMD160 f84bd53ec0ec785daa1fcb30e75bd74f34756bc6
 MD5 cd735d06cb79a845230d9ea583f1db81 pam-0.78-r5.ebuild 11451
 RMD160 f84bd53ec0ec785daa1fcb30e75bd74f34756bc6 pam-0.78-r5.ebuild 11451
 SHA256 5f787f710e23bed236bfa8a03b2b0c4804ea61904069e6edd804e6e898be9899 pam-0.78-r5.ebuild 11451
-EBUILD pam-0.99.8.0-r1.ebuild 4990 RMD160 4297297100857eaad3fad07402d62eeaea7dd337 SHA1 911b66a996ec74744078dc2611abb3ef942960b5 SHA256 d7fccae56b000a1c9f4eb87f08c4e9749bf0c94b21c1cd252617d3e792951984
-MD5 a86bbc0fc931e48e3901c55d8d16113c pam-0.99.8.0-r1.ebuild 4990
-RMD160 4297297100857eaad3fad07402d62eeaea7dd337 pam-0.99.8.0-r1.ebuild 4990
-SHA256 d7fccae56b000a1c9f4eb87f08c4e9749bf0c94b21c1cd252617d3e792951984 pam-0.99.8.0-r1.ebuild 4990
-MISC ChangeLog 26864 RMD160 a66bc97960bc78be0085f5dd3f1ac1cc82e41e7a SHA1 61c5d7a5ff141eb389794823c503c98a15edeaf5 SHA256 16ab87cbcc37d9947a9b73124aff84acd7db745954eaa135c1b8c9936e660688
-MD5 43065f1c5b2fcd2f1feb0275f546710d ChangeLog 26864
-RMD160 a66bc97960bc78be0085f5dd3f1ac1cc82e41e7a ChangeLog 26864
-SHA256 16ab87cbcc37d9947a9b73124aff84acd7db745954eaa135c1b8c9936e660688 ChangeLog 26864
+EBUILD pam-0.99.8.0-r2.ebuild 4990 RMD160 6e9448923f3eabb07e32bdf0b9c9cf6d837a9a7f SHA1 f9ca60fbe979c6f31ad634fe36676a6b1f7e261b SHA256 52882dc862307d32af2313845acd2ea4fda22d07966f76c239ddf16231c1e9fb
+MD5 c9908b5a553a0097ab13c01e35a8b1f1 pam-0.99.8.0-r2.ebuild 4990
+RMD160 6e9448923f3eabb07e32bdf0b9c9cf6d837a9a7f pam-0.99.8.0-r2.ebuild 4990
+SHA256 52882dc862307d32af2313845acd2ea4fda22d07966f76c239ddf16231c1e9fb pam-0.99.8.0-r2.ebuild 4990
+MISC ChangeLog 27163 RMD160 675482d808e639c33389b45ad2ffa7f3aa752692 SHA1 dd7ce9ef285e4067e9cd2e58f1a9f5cf9146b8f7 SHA256 c3784434b20c17a44860ba178b6f384e6db3a11df6b4548f8261a15db32a7f31
+MD5 866f76b9e05ac3467ac370a44b521aaf ChangeLog 27163
+RMD160 675482d808e639c33389b45ad2ffa7f3aa752692 ChangeLog 27163
+SHA256 c3784434b20c17a44860ba178b6f384e6db3a11df6b4548f8261a15db32a7f31 ChangeLog 27163
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -46,13 +46,13 @@ SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c metadata
 MD5 4acd467a58a6a83f640e9540babb2be6 files/digest-pam-0.78-r5 976
 RMD160 f272466c7321cec1715f9dd69818b7b79ca3582f files/digest-pam-0.78-r5 976
 SHA256 48f4d33093f701c4ac0ae848f7c51efb85d363679529908a980970bc861050c3 files/digest-pam-0.78-r5 976
-MD5 53b6bc418321f8a2c39abffbf7a34fa9 files/digest-pam-0.99.8.0-r1 572
-RMD160 9480c4d4df0fcbabf3f486d6e3a390949b148825 files/digest-pam-0.99.8.0-r1 572
-SHA256 ab8db2c0eae109c483b93689c682916ae8161cfcd4917a8b68a53f870d018240 files/digest-pam-0.99.8.0-r1 572
+MD5 53b6bc418321f8a2c39abffbf7a34fa9 files/digest-pam-0.99.8.0-r2 572
+RMD160 9480c4d4df0fcbabf3f486d6e3a390949b148825 files/digest-pam-0.99.8.0-r2 572
+SHA256 ab8db2c0eae109c483b93689c682916ae8161cfcd4917a8b68a53f870d018240 files/digest-pam-0.99.8.0-r2 572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGlfR8AiZjviIA2XgRAi8xAJ9PkKLIZPIVBEmHkr1JTdR5UMxvvQCbBbuq
-eR0AuA1MiPyUTd4ln1qzCE0=
-=HU/k
+iD8DBQFGlj0gAiZjviIA2XgRAqNsAJsEGpv/Tdd8w5FrrSLu0zUzQyoY+gCaAn8D
+Sqk3QcdWVc6LgZqftK8d3rs=
+=C/wz
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/digest-pam-0.99.8.0-r1 b/sys-libs/pam/files/digest-pam-0.99.8.0-r2
index 0ae5144edf74..0ae5144edf74 100644
--- a/sys-libs/pam/files/digest-pam-0.99.8.0-r1
+++ b/sys-libs/pam/files/digest-pam-0.99.8.0-r2
diff --git a/sys-libs/pam/files/system-auth.pamd.epam b/sys-libs/pam/files/system-auth.pamd.epam
index b2c432ec7fd7..b515d84fc640 100644
--- a/sys-libs/pam/files/system-auth.pamd.epam
+++ b/sys-libs/pam/files/system-auth.pamd.epam
@@ -7,7 +7,8 @@ auth       required	pam_deny.so
 account    required	pam_unix.so
 
 #%EPAM-Use-Flag:cracklib%#password   required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 try_first_pass retry=3
-password   sufficient	pam_unix.so try_first_pass use_authtok nullok md5 shadow
+#%EPAM-Use-Flag:cracklib%#password   sufficient	pam_unix.so try_first_pass use_authtok nullok md5 shado
+#%EPAM-Use-Flag:!cracklib%#password   sufficient	pam_unix.so try_first_pass nullok md5 shadow
 password   required	pam_deny.so
 
 session    required	pam_limits.so
diff --git a/sys-libs/pam/pam-0.99.8.0-r1.ebuild b/sys-libs/pam/pam-0.99.8.0-r2.ebuild
index 43b78a46cea1..e55ffdca1f6a 100644
--- a/sys-libs/pam/pam-0.99.8.0-r1.ebuild
+++ b/sys-libs/pam/pam-0.99.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.0-r1.ebuild,v 1.3 2007/07/12 09:22:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.0-r2.ebuild,v 1.1 2007/07/12 14:38:39 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"