Enable multilib support.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 221 insertions, 15 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 6f6e68cfd850..6bad10f892fa 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.335 2014/05/08 23:07:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.336 2014/05/30 14:26:28 mgorny Exp $
+
+*pam-1.1.8-r2 (30 May 2014)
+
+  30 May 2014; Michał Górny <mgorny@gentoo.org> +pam-1.1.8-r2.ebuild:
+  Enable multilib support.
 
 *pam-1.1.8-r1 (08 May 2014)
 
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 8cb70cf280db..ea11e3877b89 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -14,23 +14,26 @@ DIST Linux-PAM-1.1.8.tar.bz2 1148944 SHA256 c4b1f23a236d169e2496fea20721578d864b
 EBUILD pam-1.1.5.ebuild 5784 SHA256 a003975168a13a6ddd06fe26ce33e0da007bcd26ca145786abd525abd9fe72e3 SHA512 647b6c5c9aad340fbbf32efc0988e5678cef8175297eb921ce36b097838aa1bd8cfef6f96157235ff0e9017f938b72429d741b01ea1692f7134f2871473d9fa3 WHIRLPOOL 7296e3adcb6e04eacc61b563a2f00f40b84f4f3f247b77acc3c79d4c87ae61513c20eca12d2b442d10dadda40963387343d87a54c03ce74a06c06a521d1b6f8b
 EBUILD pam-1.1.6-r2.ebuild 5998 SHA256 b95b3304d736e38df77d1d5455cbe070fa5d70ba30bf49596c8542176973e616 SHA512 dcfdbf2afcd09ce98005539dfdaf1823d7102e8735b3fdb8d6a73570e2a2df44a20374bdca067a152ce4e476b5586b1b5f01d7728e5af5c204493fbbe642bb16 WHIRLPOOL 7e062aba0edc95ce465b673a93e2cbea8e6dd13b01cc1a4b53083a8af192c341223c5676be0d2f07c5703b63135282a30da995c49f55cfc149e80dbbd40d90e5
 EBUILD pam-1.1.8-r1.ebuild 5604 SHA256 09cf838a791ac420f82f0595bf4f2e05eb694144f35425dd293eafd7de065fd1 SHA512 33c40d113c69037839771eb2b8d65675c766f9545016bcf757f697376f521f4d3b3a27edbfd2e90fe444c372ac26fe149c26c563e838a78184116458ef1c9b93 WHIRLPOOL b39244bd2240bb11e32c0cc6dc8d055e9fe8bc91a86b77d28c44c69016967266ef22fc80d559c9b98af148731fcca60b1cf1eb0c6622f5faf865edb1314ccb20
+EBUILD pam-1.1.8-r2.ebuild 6034 SHA256 3f2fe83a9c9308fca021f2467ef2e345eb7a052f9a440dde08117e9cae47e057 SHA512 3100acb418f39add4180ecbdad9cbc9aa1ac72ddac7cf83dfcd6937742e29f40f81ec80c20548afb378ecc124f89ab48da0daa20e7c039897a915bc5a82d0c48 WHIRLPOOL 34e42b770859b34f2ef51c6898c2c43980ee4e9026ad0a766ac00ba27b2f939830e6670623a70a9fe6bed5c9c14d686895896817f6cf4e27928359f69223fbbf
 EBUILD pam-1.1.8.ebuild 5539 SHA256 ecdf9732665c07a34df1c3ac87d396eb2e7082220af131ac3947a424280739b7 SHA512 ac45550b530443c529f6ce3d247779c3519b14097cb747e2096e1e359d859ab5279ea5d27f030fff136c91d1821abadec9d3e0e7a6226b2957e661fcda4237bb WHIRLPOOL 26a7d83d5e1621c5912d7715eaaceaf8d6a96f77eeede157edd482456022fa9f238294083ee6004a6fb8e6bf0aabcd81a81c4baf4e5e795644bc72fa59512705
-MISC ChangeLog 53264 SHA256 332e3176ea4c6a92511c0af30b36dc2978b19470649e9ce3186144367364f543 SHA512 57ecb0c359c0cb237a067c5d7cf0b468c65e2bf8cb12f469c1440e3029f26bbeda848d0cd95e604da211a79cd4faef9004a8f31fff8537e21f460964b6620796 WHIRLPOOL 58513ffabde8d25d3ac58e6770cc83c8b2b531b846b93d3f71119b96f56d7c77cb292f938c0305b1b684f7b9012cea8daa3a31a755f52af02c3f8bba61fc5836
+MISC ChangeLog 53393 SHA256 67e7985c9359987ddcf2eb0c2e963d3c9a5a1ee1b2b571a9dc69b0bf216c9852 SHA512 ec8ef4919fec6bd6d36a2c702951ae977e1f106a73facf4db7740019d9fb8cd7f256e3d59904fb311275fd823dd679a2f2337eb25cac7670f4adc0b931063d73 WHIRLPOOL 63a840e2e1e367fcd66f36f90c25800621d2e4e90344e60f5733a368d41bee3af668beb53b614d205b672b0b98f4323651c5355401c4a0958944b8d04b23f484
 MISC metadata.xml 1218 SHA256 9ea95e669c343b7e7184d3fb3b1bbad013493bfdca0e8f184ddf4728e6b5e884 SHA512 60ae70d605f654867e4c444c7489ecd76083c286039febd71ffd18a9e120b151a47488df925ec97e6768c62e5e48068abb864a6b978abd67623fb0b6c414f248 WHIRLPOOL a96d70fd81604dd265f15672183b793d0c3f48508b317f973481c460d56ea05d917a446fd60998536f7a3d811407ca3573554f9dcdc8f45ab88dbbf7875985ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTbA4uAAoJEPGu1DbS6WIAPCcQAIeGY0ynTvxOKWnNn4Tx2E0g
-ti2AgTFa1/iGvX3I1a5qgIfPODc0h+9MmejdLJFCGwRYnnKu0pyiw+c5MvDZkECf
-Ab4E7GKEAPPFj8uFP7rJTUTja9M2rG4sk+AZ+D+5H6gROjH0Evga9WZUKyXQLczG
-3qZ+LsR9NW5UrFzAOudF+odX8bUsi9EiCcT0OLNyOX9Y4SYGCiTu0wSnZNXoSt18
-YPPpPTX7oXT98tyXxmpdypHjVinsv91PfCdl7WW6w0ScyvrUiaAMdwE0GbLzS7Dx
-Mt5DbxfEOVhyzkbsjN7Cll4Sfd08uDM4yoIyVDRC99v4g7vK209ayse2PKW6C5hG
-J2wdnZwO7hAYyFASD6xJAqQ6whvkynti36fPMUok13R0CuMeKR5RV78qzsSf70Av
-08smVAw3bqDBLJLjl//sKv/ETi/vrps/h72iIQ6SyTlK9TmTujUZXzA/xRj5sBpg
-w2GRrFJzKhPb1feEtW8XTqZHJJmgTBGWR3lqjGoIpI5yvJmp0LMMS4ph34j4QPGt
-x2/3WRxggCJgD7iJ46WY6MbzbZhnVCKkn+2hTHQ2NpKxTIgDb6B+HNsgSn+p6V5N
-wop88OYj0Ommllzbli/E/vGh9YZPm14l47Bn+QwQlONIQutkyH9SyEgSv1sseiHs
-Di6SiVZmKiuETTmyDBV3
-=PgIm
+iQJ8BAEBCABmBQJTiJUVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/rsP/RqhGPbbw24Zt6ty7FxCnVnx
+2mW+smf1Q5w71xvP+Xmzyp7VjIoUUJ9fkR2gDa/SUxQaTX0rXvCcQMXmaf22n+rm
+evuWD3jh3dwi0o9CkTPY1cuXRl4FEbI7A8Umao+uQn9k9ajPJFkTV9gWPjRByiwj
+7FgivIilfPFZ7puznHL1R1iG+Gr1pvfGc+2egY9IB+v/VqmAB1QaIPd8wQuaP8Zo
+BCWh/1ge0JBswilbwPuKiBjK/PLTXxt131S92GS/W5jWdR4TY4jh9KT5cbnVtCv/
+EP4unTyngpPd3BuJih5iClhyIa97oIkZz8Kp2XB5RTI0WQdWyE4F9j+4gtU6jUvH
+2o4E3cCHm2lXmNhFXbkOW6qzz29AcRgyd2EF7psoIM/4mI0Thg1HYvgmj8Ocd8H0
+8rrrocv6AaWCBBxFhBOq8UhwPIVPKy3SWDwjdroFqyS3p8NSiKHTHlvl5y7stScS
+rkkMjiI5QrOWyU1udYr97mkH6V9BKYPgTfY0H37JtFULgpW2hevMYKLHjFXmDlao
+RrgLn/MTaQdKEEc+DErJ0WPNZcCCZuBbzri14j17qlCx/qrMozvacjtkkObvtfGs
+UI5ZbiOzu4Jaiw4ekSvmwJF+1exLDF8k8SJyLg6hyj+4dYeFqy0xqSxu+uq+8lLA
+L2EBXDtffXlqff8KFonm
+=fROk
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/pam-1.1.8-r2.ebuild b/sys-libs/pam/pam-1.1.8-r2.ebuild
new file mode 100644
index 000000000000..8982574b8a2a
--- /dev/null
+++ b/sys-libs/pam/pam-1.1.8-r2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.8-r2.ebuild,v 1.1 2014/05/30 14:26:28 mgorny Exp $
+
+EAPI=5
+
+inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use
+
+MY_PN="Linux-PAM"
+MY_P="${MY_PN}-${PV}"
+
+HOMEPAGE="https://fedorahosted.org/linux-pam/"
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+
+SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
+	http://www.linux-pam.org/documentation/${MY_P}-docs.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 nis"
+
+RDEPEND="nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	cracklib? ( >=sys-libs/cracklib-2.8.3[${MULTILIB_USEDEP}] )
+	audit? ( sys-process/audit[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-1.28[${MULTILIB_USEDEP}] )
+	berkdb? ( sys-libs/db[${MULTILIB_USEDEP}] )
+	elibc_glibc? (
+		>=sys-libs/glibc-2.7
+		nis? ( || ( >=net-libs/libtirpc-0.2.2-r1[${MULTILIB_USEDEP}] <sys-libs/glibc-2.14 ) )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2
+	sys-devel/flex
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+PDEPEND="sys-auth/pambase
+	vim-syntax? ( app-vim/pam-syntax )"
+RDEPEND="${RDEPEND}
+	!<sys-apps/openrc-0.11.8
+	!sys-auth/openpam
+	!sys-auth/pam_userdb
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r7
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+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_pretend() {
+	# do not error out, this is just a warning, one could build a binpkg
+	# with old modules enabled.
+	check_old_modules
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.8-doc-install.patch #473650
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# 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=(
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--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)
+		$(use_enable nis)
+		--with-db-uniquename=-$(db_findver sys-libs/db)
+		--disable-prelude
+	)
+
+	if use hppa || use elibc_FreeBSD; then
+		myconf+=( --disable-pie )
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake sepermitlockdir="${EPREFIX}/run/sepermit"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install \
+		sepermitlockdir="${EPREFIX}/run/sepermit"
+
+	local prefix
+	if multilib_is_native_abi; then
+		prefix=
+		gen_usr_ldscript -a pam pamc pam_misc
+	else
+		prefix=/usr
+	fi
+
+	# create extra symlinks just in case something depends on them...
+	local lib
+	for lib in pam pamc pam_misc; do
+		if ! [[ -f "${ED}"${prefix}/$(get_libdir)/lib${lib}$(get_libname) ]]; then
+			dosym lib${lib}$(get_libname 0) ${prefix}/$(get_libdir)/lib${lib}$(get_libname)
+		fi
+	done
+}
+
+DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS )
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	# Need to be suid
+	fperms u+s /sbin/unix_chkpwd
+
+	docinto modules
+	for dir in modules/pam_*; do
+		newdoc "${dir}"/README README."$(basename "${dir}")"
+	done
+
+	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_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 "${EROOT}"/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
+}