Version bump, some patches were merged in. Caution to uClibc users since the NIS/YP patch doesn't apply, as upstream changed that code quite a bit, it should be fixed but be wary anyway.

Package-Manager: portage-2.2_rc59/cvs/Linux x86_64

3 files changed, 168 insertions, 6 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 2b6f36a46d4e..bf4665253017 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.250 2009/11/26 10:11:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.251 2009/12/16 18:16:14 flameeyes Exp $
+
+*pam-1.1.1 (16 Dec 2009)
+
+  16 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> +pam-1.1.1.ebuild:
+  Version bump, some patches were merged in. Caution to uClibc users since
+  the NIS/YP patch doesn't apply, as upstream changed that code quite a bit,
+  it should be fixed but be wary anyway.
 
   26 Nov 2009; Markus Meier <maekke@gentoo.org> pam-1.1.0.ebuild:
   amd64 stable, bug #284087
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 5cffdb06fe6b..86e6790907d3 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -10,14 +10,17 @@ AUX Linux-PAM-1.1.0-nonls.patch 367 RMD160 80ff3ce536e3bf3cb4e4448bf1062972b2b14
 DIST Linux-PAM-1.0.4.tar.bz2 1004979 RMD160 8eacf6344663c0ce2f42d374d82d717211ca10e5 SHA1 60146a363b653324d4477dce4a3e999834a2d713 SHA256 13136d438f5748d08dcb2227e44e53a3c611351b96e11891052e0c8c2557f3ca
 DIST Linux-PAM-1.1.0-docs.tar.bz2 494697 RMD160 324f4cdabbaaa85ac5afca9babea1bfe21e32285 SHA1 56cdc680d48a3dc1ffbd9becb855a4724d5f39ad SHA256 7d8e4455cf44937ccc0c7fb370d469c9bef33c68979b23f706fb37727bf8812b
 DIST Linux-PAM-1.1.0.tar.bz2 1106379 RMD160 b57473ac39ef5c5ec22459e78e00abdbead396e5 SHA1 1ef5b91bf483ecf31e8f07c3c0322b397b13af70 SHA256 139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7
+DIST Linux-PAM-1.1.1-docs.tar.bz2 495534 RMD160 182639c3fa79c96dbc263f2d16346345949bb0c8 SHA1 9e25f276546844bb5a58f30b5e5d5a97d25c5af5 SHA256 89950180aba6e5e05671c43d970d9738fd2b71b1421a2cf4d504f5c529586ac6
+DIST Linux-PAM-1.1.1.tar.bz2 1120055 RMD160 2d3c39cb2c3542d380e1331fef08c7086cc829d9 SHA1 8baf11b04396230ba7cf8b2bfb2d2bd75aab8fa6 SHA256 608d3eb9d7a5e1a7505fff62e6a583fdb6e52dc05bf54dc9661c5f395b1fb904
 EBUILD pam-1.0.4.ebuild 5771 RMD160 2a095e5d9e844e93c840e234d51580f2daa7b347 SHA1 a6b57a9386e5a25dd211490ada17a4df152be26e SHA256 d182992833d985a568716fc65b06182d588b481ab250f99a6a3caf1c792403c8
 EBUILD pam-1.1.0.ebuild 4903 RMD160 d328ba7b3f180a94ec6a099e8839bf509503d0fa SHA1 24b72cbba8aba11ba314da93895d1244bc0f48a9 SHA256 f140f0fde03b6d98ddfca5eafd1f102a6f6af83a488465ce828e803ebbb04c81
-MISC ChangeLog 39884 RMD160 044cf9eb7ec95b5606a772bc4747f5c0b85f5da6 SHA1 be1397e22b27050b5db44d8480fe8246f5ca2d12 SHA256 c64029fd82883fca0e27a383cb890d3ad3b86e04a64f80082de1b63b643ef81d
+EBUILD pam-1.1.1.ebuild 4631 RMD160 2c8a18056a0534c88276ffb0302b2d12cf54f9c7 SHA1 13fa7715a942ec36c0794150323e0cd233b2606e SHA256 3fb3a127d895badbd07a30cbbf21610bf0f6784eaf081a407dc2cb9330c42be6
+MISC ChangeLog 40182 RMD160 b77055d3c29f9f96cf15651da2e764667f760baf SHA1 16a225698c74b89cd8a423c8aae2581131a35aaa SHA256 c138d7a38d366d62a069e5e09c787ebcc222c6f39bb38ccd2ab75fa698416211
 MISC metadata.xml 306 RMD160 d8d5dbaaf990cfc32c5294d2d63234ed4da3bff2 SHA1 5d66f934ae3ebd65dca4c3c3a6d7cb318c9b00d9 SHA256 eb34afcf75eebf8d17686d207e1196d8c00a2be82d0225c2d0e68a8dc71b13f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksOVHsACgkQkKaRLQcq0GK6VgCePx1/AA2E+jVETNRLiPX2ijVC
-MggAnj3c+oLN53658GbdCVKTr/XwdBRr
-=ttxa
+iEYEARECAAYFAkspI+wACgkQAiZjviIA2XhIEwCgo27RR37x9NFPW4K6Y2BqM8q8
+DwoAoIvXbLIvnMOI1yfVh9OcDcAoMIGG
+=IPSw
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/pam-1.1.1.ebuild b/sys-libs/pam/pam-1.1.1.ebuild
new file mode 100644
index 000000000000..5b843b70ec30
--- /dev/null
+++ b/sys-libs/pam/pam-1.1.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1.ebuild,v 1.1 2009/12/16 18:16:14 flameeyes Exp $
+
+inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
+
+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="PAM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug"
+
+RDEPEND="nls? ( virtual/libintl )
+	cracklib? ( >=sys-libs/cracklib-2.8.3 )
+	audit? ( sys-process/audit )
+	selinux? ( >=sys-libs/libselinux-1.28 )
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+PDEPEND="sys-auth/pambase
+	vim-syntax? ( app-vim/pam-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+PROVIDE="virtual/pam"
+
+check_old_modules() {
+	local retval="0"
+
+	if sed -e 's:#.*::' "${ROOT}"/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 ""
+		ebeep 15
+
+		retval=1
+	fi
+
+	if sed -e 's:#.*::' "${ROOT}"/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 ""
+		ebeep 10
+
+		retval=1
+	fi
+
+	return $retval
+}
+
+pkg_setup() {
+	check_old_modules
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Avoid building xtests during "make all"; note that for what
+	# we're concerned xtests are not even executed, so we should
+	# probably use EXTRA_PROGRAMS.
+	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
+
+	# Remove libtool-2 libtool macros, see bug 261167
+	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
+
+	AT_M4DIR="m4" eautoreconf
+
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+
+	if use hppa || use elibc_FreeBSD; then
+		myconf="${myconf} --disable-pie"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--enable-securedir=/$(get_libdir)/security \
+		--enable-isadir=/$(get_libdir)/security \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		$(use_enable cracklib) \
+		$(use_enable audit) \
+		$(use_enable debug) \
+		--disable-db \
+		--disable-dependency-tracking \
+		--disable-prelude \
+		${myconf} || die "econf failed"
+	emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		 sepermitlockdir="/var/run/sepermit" || 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
+
+	dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
+
+	docinto modules
+	for dir in modules/pam_*; do
+		newdoc "${dir}"/README README."$(basename "${dir}")"
+	done
+
+	# Remove the wrongly installed manpages
+	rm "${D}"/usr/share/man/man8/pam_userdb.8*
+	use cracklib || rm "${D}"/usr/share/man/man8/pam_cracklib.8*
+
+	# 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 ned them for static linking either.
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_preinst() {
+	check_old_modules || die "deprecated PAM modules still used"
+}