Bug #189669, fix non-deterministic inclusion of libaudit. USE=audit is masked on alpha, arm, hppa, ppc64, s390, sh until they have keyworded it per bug #184563.

Package-Manager: portage-2.1.3.7

4 files changed, 198 insertions, 15 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index d74c58c8b8ed..27e3588a6cca 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.167 2007/07/26 16:59:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.168 2007/09/18 23:59:24 robbat2 Exp $
+
+*pam-0.99.8.1-r1 (18 Sep 2007)
+
+  18 Sep 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +pam-0.99.8.1-r1.ebuild:
+  Bug #189669, fix non-deterministic inclusion of libaudit. USE=audit is
+  masked on alpha, arm, hppa, ppc64, s390, sh until they have keyworded it per
+  bug #184563.
 
 *pam-0.99.8.1 (26 Jul 2007)
 
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index db00b3248922..89d9e9d5239a 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667 RMD160 ad4b61f010ec6f3e8bd9ff137375c64ec594f438 SHA1 7b578fedf5ee73f82575feadfeea7a8d5b98bda0 SHA256 e4deb0732039dd29774248bb33271d578c69b76f86c015e8ffd296fa2bb6be3b
 MD5 19573ee9b3a013175631941519534900 files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667
 RMD160 ad4b61f010ec6f3e8bd9ff137375c64ec594f438 files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch 667
@@ -27,14 +24,18 @@ 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.1-r1.ebuild 5001 RMD160 4f69fb4df664fac186b92b0dd019c044b8ce2e08 SHA1 0e71dc5f8316995139090ab03f50c1f13795261e SHA256 1f41a7aa068c274e6fb0b282763937542121aac0dacf630c47ca3b35dc88435c
+MD5 1b6949e6d90409bfd6baf86e887ffb39 pam-0.99.8.1-r1.ebuild 5001
+RMD160 4f69fb4df664fac186b92b0dd019c044b8ce2e08 pam-0.99.8.1-r1.ebuild 5001
+SHA256 1f41a7aa068c274e6fb0b282763937542121aac0dacf630c47ca3b35dc88435c pam-0.99.8.1-r1.ebuild 5001
 EBUILD pam-0.99.8.1.ebuild 4940 RMD160 23852327ffb08c3f41954bb881eb44f270b9e274 SHA1 3d590f75641f670e0a09410d40adda3095ec723e SHA256 5a4ed7372b77fecfbef922634f23f3479f811660acbc5ad63201fde20fae1133
 MD5 93d775b9de0ac4c0e19e812ed2fe0ab4 pam-0.99.8.1.ebuild 4940
 RMD160 23852327ffb08c3f41954bb881eb44f270b9e274 pam-0.99.8.1.ebuild 4940
 SHA256 5a4ed7372b77fecfbef922634f23f3479f811660acbc5ad63201fde20fae1133 pam-0.99.8.1.ebuild 4940
-MISC ChangeLog 27492 RMD160 3b5d3b3a9e64b8b2a2d3e9fada9b6ec961366732 SHA1 8d5df457e03bb46094b3f59c5500e437a254b063 SHA256 31df700117d567f2b7516979d3a3cba8d8a7ae181801947902bccb67a8bdf190
-MD5 7dde4c8ac7aaceb9d1066f12784dcec7 ChangeLog 27492
-RMD160 3b5d3b3a9e64b8b2a2d3e9fada9b6ec961366732 ChangeLog 27492
-SHA256 31df700117d567f2b7516979d3a3cba8d8a7ae181801947902bccb67a8bdf190 ChangeLog 27492
+MISC ChangeLog 27770 RMD160 d74ee2cf07dad505170d94dc3ca0eba2b93eb945 SHA1 ac796fe9672a92cfe16e27795d5a118da5422e4b SHA256 5b2b8c2f73786c789f612261608ab9288f0e783bc09fd26b9ec9fe9dc2b1a6af
+MD5 0cd15e0c104a87075786213fbce09057 ChangeLog 27770
+RMD160 d74ee2cf07dad505170d94dc3ca0eba2b93eb945 ChangeLog 27770
+SHA256 5b2b8c2f73786c789f612261608ab9288f0e783bc09fd26b9ec9fe9dc2b1a6af ChangeLog 27770
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -45,10 +46,6 @@ SHA256 48f4d33093f701c4ac0ae848f7c51efb85d363679529908a980970bc861050c3 files/di
 MD5 12f5aae84df52512f8f6974e24fa4975 files/digest-pam-0.99.8.1 572
 RMD160 5497daf31e6a6c22666436adb16ca7d6668058c1 files/digest-pam-0.99.8.1 572
 SHA256 1358afedddbaf1ad62f0ff02b2bf6ade5be96d36de8c7559fcaadaa25fb0a18d files/digest-pam-0.99.8.1 572
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGqNNIAiZjviIA2XgRAtcOAJ9Mtu1+U88b8Lq0KwVcAW0mCi1odACgkxZZ
-X8a3WtXwsPijaPapC2x5fX0=
-=ZWuZ
------END PGP SIGNATURE-----
+MD5 12f5aae84df52512f8f6974e24fa4975 files/digest-pam-0.99.8.1-r1 572
+RMD160 5497daf31e6a6c22666436adb16ca7d6668058c1 files/digest-pam-0.99.8.1-r1 572
+SHA256 1358afedddbaf1ad62f0ff02b2bf6ade5be96d36de8c7559fcaadaa25fb0a18d files/digest-pam-0.99.8.1-r1 572
diff --git a/sys-libs/pam/files/digest-pam-0.99.8.1-r1 b/sys-libs/pam/files/digest-pam-0.99.8.1-r1
new file mode 100644
index 000000000000..aa8ca976bf09
--- /dev/null
+++ b/sys-libs/pam/files/digest-pam-0.99.8.1-r1
@@ -0,0 +1,6 @@
+MD5 c4b775bf151291f84fd3166e8845e6c9 Linux-PAM-0.99.8.1-ldflags-to-libadd.patch.bz2 2556
+RMD160 e15c0cccb05e32c5a5bf3946525c65044b7ac627 Linux-PAM-0.99.8.1-ldflags-to-libadd.patch.bz2 2556
+SHA256 2017cbe72cc3440061446e4edd0cd48ae431a99ba6db2b80e1a19e8e8aebf3a6 Linux-PAM-0.99.8.1-ldflags-to-libadd.patch.bz2 2556
+MD5 a6472db4afe13850cb401922211bba4e Linux-PAM-0.99.8.1.tar.bz2 903827
+RMD160 bac7908aebb4671bdf95d0c31086f2ed2d879ef8 Linux-PAM-0.99.8.1.tar.bz2 903827
+SHA256 47abe93a4d451ff6403c04898d386fb568ba7578520c4cf2687122a12e286cd2 Linux-PAM-0.99.8.1.tar.bz2 903827
diff --git a/sys-libs/pam/pam-0.99.8.1-r1.ebuild b/sys-libs/pam/pam-0.99.8.1-r1.ebuild
new file mode 100644
index 000000000000..0a8966a6ec89
--- /dev/null
+++ b/sys-libs/pam/pam-0.99.8.1-r1.ebuild
@@ -0,0 +1,172 @@
+# 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.1-r1.ebuild,v 1.1 2007/09/18 23:59:24 robbat2 Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit libtool multilib eutils autotools pam toolchain-funcs
+
+MY_PN="Linux-PAM"
+MY_P="${MY_PN}-${PV}"
+
+HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+
+SRC_URI="mirror://kernel/linux/libs/pam/pre/library/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-ldflags-to-libadd.patch.bz2"
+
+LICENSE="PAM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit"
+
+RDEPEND="nls? ( virtual/libintl )
+	cracklib? ( >=sys-libs/cracklib-2.8.3 )
+	audit? ( sys-process/audit )
+	sys-libs/pwdb
+	selinux? ( >=sys-libs/libselinux-1.28 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+PDEPEND="vim-syntax? ( app-vim/pam-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+PROVIDE="virtual/pam"
+
+check_old_modules() {
+	local retval="0"
+
+	if sed -e 's:#.*::' /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 more supported, and since version"
+		eerror "0.99 is no more installed, nor provided by any other package."
+		eerror "The package will be built (to allow binary package builds), but will"
+		eerror "not be installed."
+		eerror "Please replace pam_stack usage with proper include directive usage,"
+		eerror "following the PAM Upgrade guide at the following URL"
+		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
+		eerror ""
+		ebeep 15
+
+		retval=1
+	fi
+
+	if sed -e 's:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp)'; then
+		eerror ""
+		eerror "Your current setup is using one or more of the following modules,"
+		eerror "that are not built or supported anymore:"
+		eerror "pam_pwdb, pam_radius, pam_timestamp"
+		eerror "If you are in real need for these modules, please contact the maintainers"
+		eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
+		eerror "use cases."
+		ebeep 10
+
+		retval=1
+	fi
+
+	# Produce the warnings only during upgrade, for the following two
+	has_version '<sys-libs/pam-0.99' || return $retval
+
+	# 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_console pam_userdb; do
+		if sed -e 's:#.*::' /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"
+			ewarn "anymore; if you want to continue using this module, you should install"
+			ewarn "sys-auth/${module}."
+			ewarn ""
+			ebeep 5
+		fi
+	done
+
+	return $retval
+}
+
+pkg_setup() {
+	check_old_modules
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	mkdir -p doc/txts
+	for readme in modules/pam_*/README; do
+		cp -f "${readme}" doc/txts/README.$(dirname "${readme}" | \
+			sed -e 's|^modules/||')
+	done
+
+	epatch "${DISTDIR}/${MY_P}-ldflags-to-libadd.patch.bz2"
+	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
+
+	AT_M4DIR="m4" eautoreconf
+
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+
+	if use hppa || use elibc_FreeBSD; then
+		myconf="${myconf} --disable-pie"
+	fi
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		$(use_enable cracklib) \
+		$(use_enable audit) \
+		--libdir=/usr/$(get_libdir) \
+		--disable-db \
+		--enable-securedir=/$(get_libdir)/security \
+		--enable-isadir=/$(get_libdir)/security \
+		--disable-dependency-tracking \
+		--disable-prelude \
+		--enable-docdir=/usr/share/doc/${PF} \
+		--disable-regenerate-man \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# Need to be suid
+	fperms u+s /sbin/unix_chkpwd
+
+	dodir /$(get_libdir)
+	mv "${D}/usr/$(get_libdir)/libpam.so"* "${D}/$(get_libdir)/"
+	mv "${D}/usr/$(get_libdir)/libpamc.so"* "${D}/$(get_libdir)/"
+	mv "${D}/usr/$(get_libdir)/libpam_misc.so"* "${D}/$(get_libdir)/"
+	gen_usr_ldscript libpam.so libpamc.so libpam_misc.so
+
+	# No, we don't really need .la files for PAM modules.
+	rm -f "${D}/$(get_libdir)/security/"*.la
+
+	dodoc CHANGELOG ChangeLog README AUTHORS Copyright
+	docinto modules ; dodoc doc/txts/README.*
+
+	newpamd "${FILESDIR}/system-auth.pamd.epam" system-auth
+	newpamd "${FILESDIR}/other.pamd" other
+
+	# Remove the wrongly installed manpages
+	rm "${D}"/usr/share/man/man8/pam_userdb.8*
+	use cracklib || rm "${D}"/usr/share/man/man8/pam_cracklib.8*
+}
+
+pkg_preinst() {
+	check_old_modules || die "deprecated PAM modules still used"
+
+	pam_epam_expand "${D}"/etc/pam.d/*
+}
+
+pkg_postinst() {
+	if ! use cracklib; then
+		ewarn "You chosen not to enable cracklib. Make sure you run etc-update or"
+		ewarn "you won't be able to change users' passwords."
+	fi
+}