gentoo resync : 05.02.2020

3 files changed, 120 insertions, 2 deletions

diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 217822506bfb..43b5425eb83e 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,4 +1,6 @@
 AUX pam-remove-browsers.patch 985 BLAKE2B 3e258e00f7287436b1b6a97323764612a3098dc4effb12e62cd8d55151ace2b97b6ea7b67ae33613aa6b3cca318bfbfc310b48a99b0c81e1beaa9d16188e69eb SHA512 42d89d35fc754e51112040a5468067ee9f6a3a411e538cb634187e28975040c0b7ef48fab166ec6a20a849f6ed9d74a069355269cf708d9985ded6b87fe13ed1
 DIST pam-1.3.1.tar.gz 749997 BLAKE2B 3b44c41daaa5810c53e3e2baeac1ab58463768fde433f874b9bd09c7c28cfd55e0f227c9a0c318e66444a3adb23c112a2db32d5c7211b07c84c2d4600a47ca5c SHA512 0c5019493b2ac42180ee9c4974a51329a2395a44f5f892c1ca567ec9b43cc3a9bce0212861d4dfb82eb236c5eaa682b27189ce672ed6cafa37d8801d059a944d
-EBUILD pam-1.3.1-r1.ebuild 3344 BLAKE2B 3e96d05d66d6fec287be78c5dadae13da99e53b90eb37797add75463953c01039797d830fdfe9d7643daa3b90a5398ac672a095e12cd08d5ca3d9b0936b49501 SHA512 62ed8ab02208ca55b0f9ef0175269428a34d1bbb6c8f16a8618016c88c964b6a3e47afe5459b93b15f6e1e6ad705e3bbdc4a8833e4154686627a40e9f14b05ef
+DIST pam-4dd9b97b762cc73816cb867d49c9d0d0b91d642c.tar.gz 765455 BLAKE2B 8a8543b51c9fa877cd48d483d9af489df00376f92f26fea648d38a0ce3168702888a662e5d3c7423cce8a5d56896e84e4c1829e56d08fca8c3ab878b20945a7d SHA512 bdb236a47a5810449fb96546ff89d70dec185a215b0d047178a12e40945fde4ffdb801dbbd87ff95eead1bb7acb4748333a2d3383881d5de0dbd89ec5ceddd3f
+EBUILD pam-1.3.1-r1.ebuild 3345 BLAKE2B 376d49efc72d9fe5fd9abc3d1e9bbedbf9d5e9f242a354b32408d7aec8db5d0b01b337ee6c8353f3e8ca265c4bee078dbeea5f25b79d041a3040495af28ead70 SHA512 f6caf8ba4dff19f2bf3303e4e8d3874ca8bdb73deff65c48d16768d52b7e8e82b26555471370118a6c8023b632336c65440abeefda779af05f5fd1d6cf5ab387
+EBUILD pam-1.3.1_p20200128.ebuild 3466 BLAKE2B 4a958bff4752dc22c23917954bc2d3b9164f34b084d9944205fb2b905edf75420edec3485bf7ab33fccaf44dfaf74224fb980f20cac9f06ee3911e4f22955d4a SHA512 9c1f9f32501c692b0e49a2e747eee668de89e01d94a399210c902481b1c7c4242d8b0d18d3bcf451bae0be6c25fcdd71a0bb2c8ab122e362935ea3373c2a2974
 MISC metadata.xml 1086 BLAKE2B 39d2291ff9553394ce684a87a49a2c41b18689102d8cf352c905ce2ede28508501aa41a4a473d287c461b77e5732aa4ed0eaac94db94c851ed9491bffdac8acf SHA512 6743a2021ef7d7ab9fc547b270c17b205747a498e0e2bafc07ad171d52657a4aa3f84803c2b4e5c088b73b1732d600b5b2189c958d4b15fba8e081714790fc72
diff --git a/sys-libs/pam/pam-1.3.1-r1.ebuild b/sys-libs/pam/pam-1.3.1-r1.ebuild
index 3956e3a3499b..ee93946e8608 100644
--- a/sys-libs/pam/pam-1.3.1-r1.ebuild
+++ b/sys-libs/pam/pam-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs"
 
 BDEPEND="app-text/docbook-xml-dtd:4.1.2
diff --git a/sys-libs/pam/pam-1.3.1_p20200128.ebuild b/sys-libs/pam/pam-1.3.1_p20200128.ebuild
new file mode 100644
index 000000000000..85f031584204
--- /dev/null
+++ b/sys-libs/pam/pam-1.3.1_p20200128.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use fcaps multilib-minimal toolchain-funcs usr-ldscript
+
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+HOMEPAGE="https://github.com/linux-pam/linux-pam"
+
+COMMIT_HASH="4dd9b97b762cc73816cb867d49c9d0d0b91d642c"
+SRC_URI="https://github.com/linux-pam/linux-pam/archive/${COMMIT_HASH}.tar.gz#/${PN}-${COMMIT_HASH}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit berkdb +cracklib debug nis nls +pie selinux static-libs"
+
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xml-dtd:4.4
+	app-text/docbook-xml-dtd:4.5
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	nls? ( sys-devel/gettext )"
+
+DEPEND="
+	audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND="sys-auth/pambase"
+
+S="${WORKDIR}/linux-${PN}-${COMMIT_HASH}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${PN}-remove-browsers.patch"
+	touch ChangeLog || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Do not let user's BROWSER setting mess us up. #549684
+	unset BROWSER
+
+	# 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
+
+	local myconf=(
+		--with-db-uniquename=-$(db_findver sys-libs/db)
+		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
+		--libdir=/usr/$(get_libdir)
+		--disable-prelude
+		--enable-doc
+		$(use_enable audit)
+		$(use_enable berkdb db)
+		$(use_enable cracklib)
+		$(use_enable debug)
+		$(use_enable nis)
+		$(use_enable nls)
+		$(use_enable pie)
+		$(use_enable selinux)
+		$(use_enable static-libs static)
+		--enable-isadir='.' #464016
+		)
+	ECONF_SOURCE="${S}" econf ${myconf[@]}
+}
+
+multilib_src_compile() {
+	emake sepermitlockdir="${EPREFIX}/run/sepermit"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install \
+		sepermitlockdir="${EPREFIX}/run/sepermit"
+
+	gen_usr_ldscript -a pam pam_misc pamc
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use selinux; then
+		dodir /usr/lib/tmpfiles.d
+		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
+d /run/sepermit 0755 root root
+EOF
+	fi
+}
+
+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."
+
+	# 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
+}