Version bump, a similar patch to mine to disable pam_userdb has been merged, which makes it easier to split pam_userdb.

Package-Manager: portage-2.1.3_rc6

4 files changed, 197 insertions, 9 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 59e2aea42150..a44dc10c0ff9 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,12 @@
 # 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.155 2007/07/05 12:41:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.156 2007/07/08 15:34:16 flameeyes Exp $
+
+*pam-0.99.8.0 (08 Jul 2007)
+
+  08 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> +pam-0.99.8.0.ebuild:
+  Version bump, a similar patch to mine to disable pam_userdb has been merged,
+  which makes it easier to split pam_userdb.
 
   05 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> pam-0.99.7.1.ebuild:
   Fix typo, thanks Jakub.
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 637279e295ee..7c5f417b0f23 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -44,6 +44,8 @@ SHA256 e3e0f06d9803d335a31b7e29a5ea6c1aa6c258f6b95308f959a86c23a97fec53 files/pa
 DIST Linux-PAM-0.78.tar.gz 488936 RMD160 51643a8942267449b884f79804102fad61567df8 SHA1 fee3e519ac19dff64f7b14ecfa69c09d34411ebe SHA256 a18b9f7b45344a4e49d2647c036894cc6578f249fa0cf024763f1140df684d3e
 DIST Linux-PAM-0.99.7.1-ldflags-to-libadd.patch.bz2 2551 RMD160 14a84d38bf4643f55a5a93400aa0b4fefb9fc30b SHA1 73105f9826b1954a969ea5db0f28e38e27f636f4 SHA256 0436acbf46269bf664505d3dff1d80eeb168c9a9b50878401e6414663ca2c392
 DIST Linux-PAM-0.99.7.1.tar.bz2 872588 RMD160 b705904a568d7badd3922665d2d019e434cc72ee SHA1 40f8ba7280fbd8260cfe2ec06b86f972c79eb9d2 SHA256 d5f3756bbb61a27adc2d16842ea6d867c9c1830a2c9577f71bb9fe14859ac96a
+DIST Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554 RMD160 734f41e1e040f737ae9a229ce15c3a14caeb8922 SHA1 20095fa64eb87644efc7ae41ca87d9a42065fbe2 SHA256 f79f52e60390c1d131d4b590097ccb9e9705a4842c3b63de24f9867c6ea55336
+DIST Linux-PAM-0.99.8.0.tar.bz2 903366 RMD160 9e2c9bc00318ef711a2af4561a1c763c2ca28db5 SHA1 c344c7887d80eae5dc1ab7ac3ebfb412d555c4cf SHA256 4b42990b4cada5ad0abefd6048b8646b17813448fbf13d758cbce605908f02a2
 DIST db-4.3.27.tar.gz 5921872 RMD160 711129871c7edd840184bd5a87fb7bf93c8bb953 SHA1 8fddfe98d5ff7fcdb3fe9e23bb361d8f20a35941 SHA256 6f09e04c5811ad72a2a5c99459340cb2c635e6553520af76fc9e717dd6207244
 DIST glib-2.6.5.tar.bz2 2357089 RMD160 6ccdfed7ea5621b7c69c436c3b8b5fbba44dc62e SHA1 82818f9173b0bdc2b26af018e8393eb76318552e SHA256 ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca
 DIST pam-0.78-patches-1.3.tar.bz2 87223 RMD160 82f6f63de5209e26119ed430e80669f6306cd9ea SHA1 722f326474c29a10f62f335ae6ed9ad238449560 SHA256 ca6882263a474ed77a343572a6a30fa59d677929543feb72cb0801b3bfdc8266
@@ -60,10 +62,14 @@ EBUILD pam-0.99.7.1.ebuild 4857 RMD160 c3bbe49607235b5e8fd9be99e95e87971c4217ea
 MD5 2c540bce907212ee1ea5d5e62134d5d7 pam-0.99.7.1.ebuild 4857
 RMD160 c3bbe49607235b5e8fd9be99e95e87971c4217ea pam-0.99.7.1.ebuild 4857
 SHA256 5df22443825b69c0fe0e70df34a245a4774b3ab35a1d3ec060a3aa4dd3c3646b pam-0.99.7.1.ebuild 4857
-MISC ChangeLog 24625 RMD160 acf815f244b3a64e7bfd59fcb03a1e2fbaafa4ef SHA1 23b2b526224097388cc1a501beeede79cd88decc SHA256 578ed2b290b740d065ac9393b9a3f14f2e8b843214844efb2f7d15dab22cc8cf
-MD5 bb28ff99826966e654d09cb8c246752e ChangeLog 24625
-RMD160 acf815f244b3a64e7bfd59fcb03a1e2fbaafa4ef ChangeLog 24625
-SHA256 578ed2b290b740d065ac9393b9a3f14f2e8b843214844efb2f7d15dab22cc8cf ChangeLog 24625
+EBUILD pam-0.99.8.0.ebuild 4800 RMD160 35471d8c7da08e0050b714cb8221cbf3084ef47b SHA1 b1990dcc0d317a283fab9d18e20840c846c1687d SHA256 b2cbd4978163b2a3bcc56ed6e5f5930357720d806a660ffe044da43174a3915f
+MD5 115894b8cfb34eb11e62f5b5c8163281 pam-0.99.8.0.ebuild 4800
+RMD160 35471d8c7da08e0050b714cb8221cbf3084ef47b pam-0.99.8.0.ebuild 4800
+SHA256 b2cbd4978163b2a3bcc56ed6e5f5930357720d806a660ffe044da43174a3915f pam-0.99.8.0.ebuild 4800
+MISC ChangeLog 24854 RMD160 14268b1d652d87018c45aedc7bfa33b44beade5c SHA1 64c981c16875e40977ec5b585b48f9dac9e53d25 SHA256 84b21ef0e487a3c02bff7d5f4099f0debaa4ef546bbd6ffb2f4e2150eacf98b8
+MD5 a6a75c49caa607b0d1499574c05602c2 ChangeLog 24854
+RMD160 14268b1d652d87018c45aedc7bfa33b44beade5c ChangeLog 24854
+SHA256 84b21ef0e487a3c02bff7d5f4099f0debaa4ef546bbd6ffb2f4e2150eacf98b8 ChangeLog 24854
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c metadata.xml 218
@@ -77,10 +83,13 @@ SHA256 c3edc3912942659b0d5bdffd75c393e13641be489aad277aa72846079b2cacb0 files/di
 MD5 7e383728a5d0fe763e5a1e1cc1d07427 files/digest-pam-0.99.7.1 572
 RMD160 394ee12bca7c862a67e820a3b77d25cf5e123725 files/digest-pam-0.99.7.1 572
 SHA256 fd48ed29e798f9d699a8c0ecb394b65890da0993209b4ee9d7d1a036f7b8943f files/digest-pam-0.99.7.1 572
+MD5 53b6bc418321f8a2c39abffbf7a34fa9 files/digest-pam-0.99.8.0 572
+RMD160 9480c4d4df0fcbabf3f486d6e3a390949b148825 files/digest-pam-0.99.8.0 572
+SHA256 ab8db2c0eae109c483b93689c682916ae8161cfcd4917a8b68a53f870d018240 files/digest-pam-0.99.8.0 572
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGjObyAiZjviIA2XgRAivGAKDnjw8doWexXGsw1URAdKXVIpkGIgCfWA3F
-79moC+cUiUkvXmnZ2gaNYTg=
-=d/OV
+iD8DBQFGkQP+AiZjviIA2XgRAkziAKC4nurmCDVXTP+ARRYDgNPUUv1EWgCg8qN2
+HyOnRKpdslkTL16L2iOnhXE=
+=kDCw
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/digest-pam-0.99.8.0 b/sys-libs/pam/files/digest-pam-0.99.8.0
new file mode 100644
index 000000000000..0ae5144edf74
--- /dev/null
+++ b/sys-libs/pam/files/digest-pam-0.99.8.0
@@ -0,0 +1,6 @@
+MD5 dd508b5289b554630be66ea1f2a9ea52 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
+RMD160 734f41e1e040f737ae9a229ce15c3a14caeb8922 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
+SHA256 f79f52e60390c1d131d4b590097ccb9e9705a4842c3b63de24f9867c6ea55336 Linux-PAM-0.99.8.0-ldflags-to-libadd.patch.bz2 2554
+MD5 e05a9a1e95ec9bcfa5c09d44f46ad943 Linux-PAM-0.99.8.0.tar.bz2 903366
+RMD160 9e2c9bc00318ef711a2af4561a1c763c2ca28db5 Linux-PAM-0.99.8.0.tar.bz2 903366
+SHA256 4b42990b4cada5ad0abefd6048b8646b17813448fbf13d758cbce605908f02a2 Linux-PAM-0.99.8.0.tar.bz2 903366
diff --git a/sys-libs/pam/pam-0.99.8.0.ebuild b/sys-libs/pam/pam-0.99.8.0.ebuild
new file mode 100644
index 000000000000..0b92789ecf68
--- /dev/null
+++ b/sys-libs/pam/pam-0.99.8.0.ebuild
@@ -0,0 +1,167 @@
+# 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.0.ebuild,v 1.1 2007/07/08 15:34:16 flameeyes 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="nls elibc_FreeBSD selinux vim-syntax"
+
+RDEPEND="nls? ( virtual/libintl )
+	>=sys-libs/cracklib-2.8.3
+	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|chroot)'; 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, pam_chroot"
+		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.78' || return $retval
+
+	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_console.so; then
+		ewarn ""
+		ewarn "Your current setup is using the pam_console 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/pam_console."
+		ewarn ""
+		ebeep 5
+	fi
+
+	if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q pam_userdb.so; then
+		ewarn ""
+		ewarn "Your current setup is using the pam_userdb 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/pam_userdb."
+		ewarn ""
+		ebeep 5
+	fi
+
+	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) \
+		--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.*
+
+	for x in "${FILESDIR}/pam.d-0.99/"*; do
+		[[ -f "${x}" ]] && dopamd "${x}"
+	done
+
+	# Remove the wrongly installed manpage
+	rm -f "${D}"/usr/share/man/man8/pam_userdb.8*
+}
+
+pkg_preinst() {
+	check_old_modules || die "deprecated PAM modules still used"
+}