Add patch to build with glibc 2.16. Thanks to Stevan Bajić in bug #424920 for the patch. Also remove old version.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

5 files changed, 39 insertions, 191 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 5fbe6f97230e..dbd14270ccce 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.309 2012/05/04 07:33:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.310 2012/07/05 16:17:52 flameeyes Exp $
+
+  05 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-1.1.5+glibc-2.16.patch, -pam-1.1.3.ebuild, pam-1.1.5.ebuild:
+  Add patch to build with glibc 2.16. Thanks to Stevan Bajić in bug #424920 for
+  the patch. Also remove old version.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> pam-1.1.5.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -1273,5 +1278,3 @@
   17 Feb 2002; Bruce A. Locke <blocke@shivan.org> pam-0.75-r2.ebuild :
 
   Part 1 of PAM revamp.  Ebuild is masked out...  FOR DEVELOPER TESTING ONLY
-
-
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 2d876446eae8..6c5f2b473eda 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,8 +1,20 @@
-DIST Linux-PAM-1.1.3-docs.tar.bz2 495577 RMD160 d080055e8b2e2c213293e42d42d64082cd112915 SHA1 88024b6c99f1d5e9da1d12f7c04ca97779125d56 SHA256 4afc3c02f295ed1a3e09876da7eb8738ce48a3c8ea1bc0861e4999730489df12
-DIST Linux-PAM-1.1.3.tar.bz2 1132898 RMD160 626d8deabe5fb8fcc333b3b52fe5653e901bf352 SHA1 97d36d2b9af3211b4818ea8e6fcc6893ca1b6722 SHA256 17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652
-DIST Linux-PAM-1.1.5-docs.tar.bz2 498228 RMD160 1cd6e49a8d69a3f35179210b6b060d0767c9b2fa SHA1 5a34185fd7749a8adfb61e617708304fa9cabea4 SHA256 e4b10ffebe2e5cc355bd37c4e17a2288eb90d1396b06961738a7e7ef848c754c
-DIST Linux-PAM-1.1.5.tar.bz2 1123524 RMD160 00a313e890892ad85fb69c828cfaef8c2c00cf94 SHA1 662a769f66708c3b9b5a41d62802ed69bf489e09 SHA256 65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116
-EBUILD pam-1.1.3.ebuild 5622 RMD160 8304a160cd029a730960cfb66b57ea6d8b6cedcf SHA1 4c7fd78d51bd5b0b3dfc851db4ebc01c31176ed5 SHA256 cdb43130a75c0ba779e98272a23435ef283d6037a58bcb8bc62698037e0a6041
-EBUILD pam-1.1.5.ebuild 5733 RMD160 5b8514f441ce49a37666347b477844c8d9347f77 SHA1 35b285a64885ba6e802026737ec3babed1c95102 SHA256 e6a47dc5273ab077ea81eaac22e446e2e073539dc98442a23b5965cf33d8d4e6
-MISC ChangeLog 49329 RMD160 248005eee541c9a82b09beedfdbdb461a6a36a53 SHA1 0dfb5a1463aa0dc8f92b15c99043ff95fff0a592 SHA256 c51291ea2f7756a04613ae2832c9acaa2312b9ec6011bf825e9e6172a9572fc5
-MISC metadata.xml 1129 RMD160 a800f5ac4255ca20c26791ff0b57c3c923666623 SHA1 99e58550271cf1c3e23c4547387469a0d211ae55 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX Linux-PAM-1.1.5+glibc-2.16.patch 321 SHA256 549e5d017398e9d84230f4df40609eeb307f39657527246f294ecd2245642978 SHA512 7f7232acdedf606fa03b0c7bc9763b7f46fa508ecc752e0b7f1718aa7f0a401e8bc9ca6c8ea7ee31b377b93d8b76eac3eddd6582a7dbdae83c97e38e8ddd98f7 WHIRLPOOL 6e91c38f314f5df4d47006716f2eea2faf7169d3f9dd17ae97017ae47d47b60b9b1e0c0b9a07dc221404c0a80742ac735a8add54ff181f018c26e4ca0bc2fa17
+DIST Linux-PAM-1.1.5-docs.tar.bz2 498228 SHA256 e4b10ffebe2e5cc355bd37c4e17a2288eb90d1396b06961738a7e7ef848c754c SHA512 6209b3d1936e0c0aef3a7bf24d497b867995261ad227f7d0c4b28796c0b1f9262c99e3e12d7e1d37e286af39367f6e2d79e06915dff77c65b547d62ee8772c5b WHIRLPOOL a26c778be99b21c6701260871ffd7348f7a302c5e4358b8419e9436131b83650bdf0f5bc1d845dba419bab6c50c89733bea4518f619b7b75d66b2f02408c3df1
+DIST Linux-PAM-1.1.5.tar.bz2 1123524 SHA256 65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116 SHA512 c898c3db3da1856b1b16c2bfe19963c30696345982253888c2edf85317cf82ab4daaf9d105a162975d4cfd818b7bbca3d0e63ea7267af435e8f88b8fdc83ddd0 WHIRLPOOL 29ad881f6b1d908fb84e8d5802cceff70838bd0e29f6c700ad64d3c5d43c189f0c122fdddfa4333f008a8ef2828bb0e2fd68cdd479b43efac9456b6d6a5bb25a
+EBUILD pam-1.1.5.ebuild 5784 SHA256 a003975168a13a6ddd06fe26ce33e0da007bcd26ca145786abd525abd9fe72e3 SHA512 647b6c5c9aad340fbbf32efc0988e5678cef8175297eb921ce36b097838aa1bd8cfef6f96157235ff0e9017f938b72429d741b01ea1692f7134f2871473d9fa3 WHIRLPOOL 7296e3adcb6e04eacc61b563a2f00f40b84f4f3f247b77acc3c79d4c87ae61513c20eca12d2b442d10dadda40963387343d87a54c03ce74a06c06a521d1b6f8b
+MISC ChangeLog 49586 SHA256 c21376042aa9aa88d05ba088bc5cd667cb0d79eca612ee781630453dc799658f SHA512 17b8d5944bb01ff6320f8391ef3605737f443da5d3af93858eb5e1747c5f031c4429622ae84efb5fb2cba768de2cb19da1b8a118ab942a116213b4306e9ce963 WHIRLPOOL 67bf340aa7406a02d6be12b9eaa0f7f4539290d249fa98155880dcb64339c8c70922440c59dd12156d81be6f3a9228d6b4fce4990946bb0833a0fce601ea6d53
+MISC metadata.xml 1129 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b SHA512 ad3fa4cbe664d992849c7ef17fbf49519289d1a8d2e568014ae5c08eec1030eb2d6874c5b6f877d311cb9f920c5f78b1199aa7d778ffbffea377a7f539281362 WHIRLPOOL 69d3406bd7f903292a3c84e806fe9ae5ee0e63473c4c7005449dba7af09e7d405209b66c25ef8369a53aaa92626bea8dc84ad1e34da1a717d6926ee9925e2c62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP9b5bAAoJEBzRPIrUMBNCoGYIAJNbD+whp+xotT4bmFq1HuWc
+uniPWJygFhf9sHccyl3B/yooQbve50hd3VPqRadN9LMjbxGCVCoyGf7UUCRkYS+C
+Ru0AWfd74Y0/2XpXpQf0NRhb+kg5YwAGn9Y+dhbjATaJ157M3LMvKQQSjaI3eOg9
+3Z1CWLwLwEqGuasTVsT4Nomv4C3rGduMCl+VNV747PyhIcuAOsdXbCU20PFP0YJe
+Q499qmCjfqol+fWKS9E89E0FMWNM/F+tfo0AGIzdF/LXSKU+etpamvkGPHLccU+X
+1so4Dz4b2CV06KsY+5bPRQbMRrnrj7svpXcXv/VTglOtc6y+UAUwBpoX11bJpzk=
+=FKGm
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.5+glibc-2.16.patch b/sys-libs/pam/files/Linux-PAM-1.1.5+glibc-2.16.patch
new file mode 100644
index 000000000000..507cf8d466f2
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.5+glibc-2.16.patch
@@ -0,0 +1,10 @@
+--- a/modules/pam_unix/pam_unix_acct.c	2011-06-21 11:04:56.000000000 +0200
++++ b/modules/pam_unix/pam_unix_acct.c	2012-07-05 16:04:35.643727485 +0200
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/resource.h>
+ #include <syslog.h>
+ #include <pwd.h>
+ #include <shadow.h>
diff --git a/sys-libs/pam/pam-1.1.3.ebuild b/sys-libs/pam/pam-1.1.3.ebuild
deleted file mode 100644
index 91c36b2433c1..000000000000
--- a/sys-libs/pam/pam-1.1.3.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.3.ebuild,v 1.16 2011/06/13 23:44:13 flameeyes Exp $
-
-EAPI="3"
-
-inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use
-
-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/library/${MY_P}.tar.bz2
-	mirror://kernel/linux/libs/pam/documentation/${MY_P}-docs.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb"
-
-RDEPEND="nls? ( virtual/libintl )
-	cracklib? ( >=sys-libs/cracklib-2.8.3 )
-	audit? ( sys-process/audit )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	berkdb? ( sys-libs/db )
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2
-	sys-devel/flex
-	nls? ( sys-devel/gettext )"
-PDEPEND="sys-auth/pambase
-	vim-syntax? ( app-vim/pam-syntax )"
-RDEPEND="${RDEPEND}
-	!sys-auth/openpam
-	!sys-auth/pam_userdb"
-
-S="${WORKDIR}/${MY_P}"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | 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"
-		eerror "0.99 is no longer 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 ""
-
-		retval=1
-	fi
-
-	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; 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_console"
-		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."
-		eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
-		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
-		eerror ""
-
-		retval=1
-	fi
-
-	return $retval
-}
-
-pkg_setup() {
-	check_old_modules
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	if use hppa || use elibc_FreeBSD; then
-		myconf="${myconf} --disable-pie"
-	fi
-
-	# Disable automatic detection of libxcrypt; we _don't_ want the
-	# user to link libxcrypt in by default, since we won't track the
-	# dependency and allow to break PAM this way.
-	export ac_cv_header_xcrypt_h=no
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--enable-securedir="${EPREFIX}"/$(get_libdir)/security \
-		--enable-isadir="${EPREFIX}"/$(get_libdir)/security \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable cracklib) \
-		$(use_enable audit) \
-		$(use_enable debug) \
-		$(use_enable berkdb db) \
-		--with-db-uniquename=-$(db_findver sys-libs/db) \
-		--disable-prelude \
-		${myconf}
-}
-
-src_compile() {
-	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "emake failed"
-}
-
-src_test() {
-	# explicitly allow parallel-build during testing
-	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" check || die "emake check failed"
-}
-
-src_install() {
-	local lib
-
-	emake DESTDIR="${D}" install \
-		 sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "make install failed"
-
-	# Need to be suid
-	fperms u+s /sbin/unix_chkpwd
-
-	gen_usr_ldscript -a pam pamc pam_misc
-
-	# create extra symlinks just in case something depends on them...
-	for lib in pam pamc pam_misc; do
-		if ! [[ -f "${ED}"/$(get_libdir)/lib${lib}$(get_libname) ]]; then
-			dosym lib${lib}$(get_libname 0) /$(get_libdir)/lib${lib}$(get_libname)
-		fi
-	done
-
-	dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
-
-	docinto modules
-	for dir in modules/pam_*; do
-		newdoc "${dir}"/README README."$(basename "${dir}")"
-	done
-
-	# Get rid of the .la files. We certainly don't need them for PAM
-	# modules, and libpam is installed as a shared object only, so we
-	# don't need them for static linking either.
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-}
-
-pkg_postinst() {
-	ewarn "Some software with pre-loaded PAM libraries might experience"
-	ewarn "warnings or failures related to missing symbols and/or versions"
-	ewarn "after any update. While unfortunate this is a limit of the"
-	ewarn "implementation of PAM and the software, and it requires you to"
-	ewarn "restart the software manually after the update."
-	ewarn ""
-	ewarn "You can get a list of such software running a command like"
-	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
-	ewarn ""
-	ewarn "Alternatively, simply reboot your system."
-	if [ -x "${ROOT}"/var/log/tallylog ] ; then
-		elog ""
-		elog "Because of a bug present up to version 1.1.1-r2, you have"
-		elog "an executable /var/log/tallylog file. You can safely"
-		elog "correct it by running the command"
-		elog "  chmod -x /var/log/tallylog"
-		elog ""
-	fi
-}
diff --git a/sys-libs/pam/pam-1.1.5.ebuild b/sys-libs/pam/pam-1.1.5.ebuild
index af3e2b90afd3..36ad658ff879 100644
--- a/sys-libs/pam/pam-1.1.5.ebuild
+++ b/sys-libs/pam/pam-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.5.ebuild,v 1.8 2012/05/04 07:33:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.5.ebuild,v 1.9 2012/07/05 16:17:52 flameeyes Exp $
 
 EAPI="4"
 
@@ -83,6 +83,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${MY_P}+glibc-2.16.patch
+
 	elibtoolize
 }