sys-libs/pam: sync with upstream

drop r99 suffix

3 files changed, 13 insertions, 17 deletions

diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 067b29c1..4f22b421 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -5,6 +5,6 @@ DIST Linux-PAM-1.2.0-docs.tar.bz2 490586 SHA256 3bc9ae398f759e372dbf4065ceed2df8
 DIST Linux-PAM-1.2.1.tar.bz2 1279523 SHA256 342b1211c0d3b203a7df2540a5b03a428a087bd8a48c17e49ae268f992b334d9 SHA512 4572aa1eaf5a1312410c74b5ed055b2592c5efe2bb82f59981da4e9e93555ad40aee3a89f446d9dc6c6af79efc04c33f739f66db9edc07e02479475a14e426da WHIRLPOOL 562917945b3b3a407955cc5bf5cd251ff7e257a94055d7cfbf06d5c2619b58d61624f16848de3512ddf61636ad8618315de3f7bd8e4e51b3b7d109adfa212c8a
 DIST Linux-PAM-1.3.0-docs.tar.bz2 492805 SHA256 8610b48703f036f6755c1d2bd8bcdeaddd9d99a1631f2d7668ec69b444d972a0 SHA512 b6b8497e6a4307b3f9a2af1c74456a0577b848cbc5417fb88fabe305b67ca022a6bcf632d68faaaacc701cdcf6254ec196707551a1ea70985cdde6add68bbbfe WHIRLPOOL a98b28c020de3170f2437b396176efc900683ea2ea85cb3db48306a944595f2d371cce95ee1233a874faa1fb55a06fcbe58068da7a2cc190c93809473938c821
 DIST Linux-PAM-1.3.0.tar.bz2 1302820 SHA256 241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb SHA512 4a89ca4b6f4676107aca4018f7c11addf03495266b209cb11c913f8b5d191d9a1f72197715dcf2a69216b4036de88780bcbbb5a8652e386910d71ba1b6282e42 WHIRLPOOL bb8615c8296eda83a784ffd9e9fc5ad6d401f18b8769f7859a4b94f5782decdbde7a66dc5e22e960fe723943e1562b2f5fa55e64f4836188cf57a7631edb8dcb
-EBUILD pam-1.2.1-r99.ebuild 6637 SHA256 68e70111eab72978d632c7d4b7583b7d9b155bac209d9d1a8b5e5e89c250fc7f SHA512 0bed8fa142c5e6b479f5636c8619b382df5342c43260ce5e0930b477edc1e2bcc0079583a490bd8ec4c70a62af38290d2172cd1c063e76f86e226bfe1c03f448 WHIRLPOOL 14c83f1ac9ae0d2103b9992b8d5b31e61442a5a172ee437ce0046515d89f43531725215592e26edeb29cd295cdc265f1f235131bf58b90725759d8820716bd36
-EBUILD pam-1.3.0.ebuild 6362 SHA256 1dc265335417faa125d9c46a3be73bb8c7569e83628e8a27d0a7da49bf507329 SHA512 8f0de0441b7c1ca31a222ef5dcea4b8b04f14ba5d6092d781af59bb777cc651a79eb71b8a014ac4fca2205164f1eceb96b8e6e2945c7587c0306f96bdc075357 WHIRLPOOL a72114f0334ebf7e7cf9ba48c83ff6806a2288a33ea4eaae8df9d6c80b97ff64f0e08da7ccd983d5e44fb63a472143bfed270f76b5fd362b6942b46ed04338ce
+EBUILD pam-1.2.1.ebuild 6506 SHA256 bb81442c79b29aa13a1275adaadd5518e0cb0248886e5140e1c3e80f86944a47 SHA512 cddf38a5320c7f884b4fc44d6a3d387a0243ed9ae2cb2f07c3d734a6075192c609dbbbe22c1a857c337b501c19c7681af724aeffb4b8b9507791e40dff659138 WHIRLPOOL 2c6dfa121282d505858a1e24b339a12821dad8ed2661571d39e7a92f9bd39fd8ade8014f504763f41c786cf04f69d0cf4daa6021db1608cdd44100bb1517a433
+EBUILD pam-1.3.0.ebuild 6393 SHA256 c1ff10fd4431705838cfac9d875775ad083d12eb82d0231f62a50b7dc06be774 SHA512 72ab0c29fcac8b87de53885b697464a7d4cfae049f9f09739a7bd797e3d421131630e21c01e99a32de31d9ac83b511b995e3f58bcd18ed0e631b7b232bb9bb62 WHIRLPOOL 257ee1a93ab651a154318e269b01e14e1d01465ebde6316c0f6f8b99ab2f7dab5b7f838a3ecd3b972446b1e20af27ac6859de9f005d8d47b4f7bc22d48d9891b
 MISC metadata.xml 1135 SHA256 19e87cb2aa29dcd1b12d3fd5a001a7fe08fcb9153cc80045d0b95a88c4cad3d7 SHA512 de2a617918085c4e6a7a1976447ed2c0bcdb8eb257d28351e095b29ea219382ce8964206ba0fcdefe9b69db9ab17a52556371cfbee3ed4d5c5293c8d21738d55 WHIRLPOOL abf1d986d9fb8a6654db2ecb982ef50a4aea376c5386f3b68baec1faa19811a6b58f1a08e617711737879f173db729e34d92c8be29ee4acb47f2a0deec5241fc
diff --git a/sys-libs/pam/pam-1.2.1-r99.ebuild b/sys-libs/pam/pam-1.2.1.ebuild
index 391bd72f..fdbf5477 100644
--- a/sys-libs/pam/pam-1.2.1-r99.ebuild
+++ b/sys-libs/pam/pam-1.2.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
-inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use fcaps
+inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use
 
 MY_PN="Linux-PAM"
 MY_P="${MY_PN}-${PV}"
@@ -16,14 +15,14 @@ SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb cracklib debug nis nls +pie selinux test vim-syntax"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
 	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
 	nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2
@@ -55,7 +54,7 @@ check_old_modules() {
 		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 "  https://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
+		eerror "  https://wiki.gentoo.org/wiki/Project:PAM/Upgrade_to_0.99"
 		eerror ""
 
 		retval=1
@@ -70,7 +69,7 @@ check_old_modules() {
 		eerror "of PAM through https://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 "  https://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
+		eerror "  https://wiki.gentoo.org/wiki/Project:PAM/Upgrade_to_0.99"
 		eerror ""
 
 		retval=1
@@ -88,8 +87,6 @@ pkg_pretend() {
 src_unpack() {
 	# Upstream didn't release a new doc tarball (since nothing changed?).
 	unpack ${MY_PN}-1.2.0-docs.tar.bz2
-	# Update timestamps to avoid regenerating at build time. #569338
-	find -type f -exec touch -r "${T}" {} + || die
 	mv Linux-PAM-1.2.{0,1} || die
 	unpack ${MY_P}.tar.bz2
 }
@@ -132,6 +129,7 @@ multilib_src_configure() {
 		$(use_enable pie)
 		--with-db-uniquename=-$(db_findver sys-libs/db)
 		--disable-prelude
+		--disable-regenerate-docu
 	)
 
 	ECONF_SOURCE=${S} \
@@ -169,6 +167,9 @@ multilib_src_install_all() {
 	einstalldocs
 	prune_libtool_files --all
 
+	# Need to be suid
+	fperms 4711 /sbin/unix_chkpwd
+
 	docinto modules
 	local dir
 	for dir in modules/pam_*; do
@@ -206,8 +207,4 @@ pkg_postinst() {
 		elog "  chmod -x /var/log/tallylog"
 		elog ""
 	fi
-
-	# The pam_unix module needs to check the password of the user which requires
-	# read access to /etc/shadow only.
-	fcaps cap_dac_override sbin/unix_chkpwd
 }
diff --git a/sys-libs/pam/pam-1.3.0.ebuild b/sys-libs/pam/pam-1.3.0.ebuild
index a9adc503..3842fb8f 100644
--- a/sys-libs/pam/pam-1.3.0.ebuild
+++ b/sys-libs/pam/pam-1.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb cracklib debug nis nls +pie selinux test vim-syntax"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
@@ -88,7 +88,6 @@ src_prepare() {
 		configure || die
 
 	epatch "${FILESDIR}"/${PN}-1.2.1-fix-compat.patch
-#	epatch "${FILESDIR}"/${PN}-1.2.1-innetgr.patch
 	epatch "${FILESDIR}"/${PN}-1.2.1-no-strndupa.patch
 
 	# disable insecure modules (musl-libc doesn't implement the functions anyway)