Check for /etc/pam.d files in $ROOT, add missing flex build-time dependency. Fixes bug #203929.

Package-Manager: portage-2.1.4_rc13

3 files changed, 24 insertions, 19 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 1997133770a6..9cfa84e75045 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,10 @@
 # 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.188 2007/12/20 15:45:36 flameeyes Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.189 2008/01/01 02:32:51 flameeyes Exp $
+
+  01 Jan 2008; Diego Pettenò <flameeyes@gentoo.org> pam-0.99.9.0.ebuild:
+  Check for /etc/pam.d files in $ROOT, add missing flex build-time dependency.
+  Fixes bug #203929.
 
   20 Dec 2007; Diego Pettenò <flameeyes@gentoo.org> pam-0.78-r5.ebuild:
   Remove pam_console USE flag so that it's always disabled.
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 03dcd1d7fa7d..7ef47e34c322 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -35,14 +35,14 @@ EBUILD pam-0.99.8.1-r1.ebuild 5115 RMD160 31355f6429f95ff7afabeab24106e20a664031
 MD5 b4ebf49a1e6e3ad66729daaa2e6926ee pam-0.99.8.1-r1.ebuild 5115
 RMD160 31355f6429f95ff7afabeab24106e20a664031ff pam-0.99.8.1-r1.ebuild 5115
 SHA256 3d9dcdf0469978c1999cb5043b6adadfcfc6e0b055087469bb70afe338154ba6 pam-0.99.8.1-r1.ebuild 5115
-EBUILD pam-0.99.9.0.ebuild 5181 RMD160 ea7be6653f7192f6ec78d4b0a55b578c59fe20c5 SHA1 092edc0bc55995ffc3c628610b3edd62295b4b5f SHA256 b09aaf78037d71e44c9e22d89b50e2edc365ec4a9cafe0d0eb03ad595946f936
-MD5 6059a5d7b8d6015790cfdd81ee70a0a3 pam-0.99.9.0.ebuild 5181
-RMD160 ea7be6653f7192f6ec78d4b0a55b578c59fe20c5 pam-0.99.9.0.ebuild 5181
-SHA256 b09aaf78037d71e44c9e22d89b50e2edc365ec4a9cafe0d0eb03ad595946f936 pam-0.99.9.0.ebuild 5181
-MISC ChangeLog 30422 RMD160 018be2141f4f47b719916bd7d8b53adb29a469b1 SHA1 a520133696dc955dffa85044ee20c45376e654a9 SHA256 85e37fb180418321321a1f1d9215457767ae08576cc6075cfe1d0463eb4c2e50
-MD5 0b2132f295606c5cef9a44c5724fb69d ChangeLog 30422
-RMD160 018be2141f4f47b719916bd7d8b53adb29a469b1 ChangeLog 30422
-SHA256 85e37fb180418321321a1f1d9215457767ae08576cc6075cfe1d0463eb4c2e50 ChangeLog 30422
+EBUILD pam-0.99.9.0.ebuild 5224 RMD160 786ce8879581ae27ce46737875dbe317f5b97b2d SHA1 68c56277f17f6bd0e57361a4d0e1c9e2d93f0d3c SHA256 cbc0d040c0eb6e803deb64ab7e606b9ec014e918f73686a14cc485d302dd01d9
+MD5 c19147222d24a66e7d8a5ea2f8f48d36 pam-0.99.9.0.ebuild 5224
+RMD160 786ce8879581ae27ce46737875dbe317f5b97b2d pam-0.99.9.0.ebuild 5224
+SHA256 cbc0d040c0eb6e803deb64ab7e606b9ec014e918f73686a14cc485d302dd01d9 pam-0.99.9.0.ebuild 5224
+MISC ChangeLog 30597 RMD160 4429c0899b8474a5b0defbb4019faf2ba3cce166 SHA1 b85330bf12e59b8d35ddbd97e4c3c2247072188a SHA256 c3a1e7e70e145a82a1fc24b8055c1ee17ae9849042c998030432f7ccce81e021
+MD5 8c9bae93990c4cf5f857ca0c8a4d3e62 ChangeLog 30597
+RMD160 4429c0899b8474a5b0defbb4019faf2ba3cce166 ChangeLog 30597
+SHA256 c3a1e7e70e145a82a1fc24b8055c1ee17ae9849042c998030432f7ccce81e021 ChangeLog 30597
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -57,9 +57,9 @@ MD5 82bffd37a6ec0bf449714acb6fd9b378 files/digest-pam-0.99.9.0 259
 RMD160 e63ecd0cb90f7cb8ac23f197c1090a4d1603db39 files/digest-pam-0.99.9.0 259
 SHA256 0ff0abf40c054b597a873b33cef50f2caae4f49b0056c736134b522332a5a371 files/digest-pam-0.99.9.0 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHao4mAiZjviIA2XgRAk40AJ9mPsS51PCknzo9O8W2MEovj8zriACgvUZv
-8XNEFc09/p+SwRZIgSwsyCs=
-=LPip
+iEYEARECAAYFAkd5plgACgkQAiZjviIA2XiYGgCfTWpdIoXd9oVd0ppCxp1bHYTV
+wRkAoLmFXOnMpJaq2JP8MoniKnGnxghp
+=A3g4
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/pam-0.99.9.0.ebuild b/sys-libs/pam/pam-0.99.9.0.ebuild
index 32afe8b94286..121a13b8db66 100644
--- a/sys-libs/pam/pam-0.99.9.0.ebuild
+++ b/sys-libs/pam/pam-0.99.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.9.0.ebuild,v 1.11 2007/11/24 11:27:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.9.0.ebuild,v 1.12 2008/01/01 02:32:51 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -26,6 +26,7 @@ RDEPEND="nls? ( virtual/libintl )
 	sys-libs/pwdb
 	selinux? ( >=sys-libs/libselinux-1.28 )"
 DEPEND="${RDEPEND}
+	sys-devel/flex
 	test? ( elibc_glibc? ( >=sys-libs/glibc-2.4 ) )
 	nls? ( sys-devel/gettext )"
 PDEPEND="vim-syntax? ( app-vim/pam-syntax )"
@@ -37,7 +38,7 @@ PROVIDE="virtual/pam"
 check_old_modules() {
 	local retval="0"
 
-	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_stack.so; then
+	if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* | fgrep -q pam_stack.so; then
 		eerror ""
 		eerror "Your current setup is using the pam_stack module."
 		eerror "This module is deprecated and no longer supported, and since version"
@@ -53,7 +54,7 @@ check_old_modules() {
 		retval=1
 	fi
 
-	if sed -e 's:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp|console)'; then
+	if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp|console)'; then
 		eerror ""
 		eerror "Your current setup is using one or more of the following modules,"
 		eerror "that are not built or supported anymore:"
@@ -75,7 +76,7 @@ check_old_modules() {
 	# This works only for those modules that are moved to sys-auth/$module, or the
 	# message will be wrong.
 	for module in pam_chroot pam_userdb; do
-		if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q ${module}.so; then
+		if sed -e 's:#.*::' "${ROOT}"/etc/pam.d/* | fgrep -q ${module}.so; then
 			ewarn ""
 			ewarn "Your current setup is using the ${module} module."
 			ewarn "Since version 0.99, ${CATEGORY}/${PN} does not provide this module"