Version bump to new release. Some of the interesting changes: the debug USE flag is properly set up this time, we don't patch man regeneration any longer (should be fixed upsteram), don't touch the modules' README files until install phase, don't error out on pam_timestamp usage, this PAM version fixes it. Also drop the update warnings on the split PAM modules.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 181 insertions, 1 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 8539a8507075..19f04ee22e4e 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,16 @@
 # 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.239 2009/06/20 18:51:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.240 2009/06/20 20:23:13 flameeyes Exp $
+
+*pam-1.1.0 (20 Jun 2009)
+
+  20 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> +pam-1.1.0.ebuild,
+  +files/Linux-PAM-1.1.0-debug.patch:
+  Version bump to new release. Some of the interesting changes: the debug
+  USE flag is properly set up this time, we don't patch man regeneration any
+  longer (should be fixed upsteram), don't touch the modules' README files
+  until install phase, don't error out on pam_timestamp usage, this PAM
+  version fixes it. Also drop the update warnings on the split PAM modules.
 
   20 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> -pam-1.0.1.ebuild:
   Remove old version.
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.0-debug.patch b/sys-libs/pam/files/Linux-PAM-1.1.0-debug.patch
new file mode 100644
index 000000000000..ec9f99bf7dfd
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.0-debug.patch
@@ -0,0 +1,13 @@
+Index: Linux-PAM-1.1.0/modules/pam_env/pam_env.c
+===================================================================
+--- Linux-PAM-1.1.0.orig/modules/pam_env/pam_env.c
++++ Linux-PAM-1.1.0/modules/pam_env/pam_env.c
+@@ -120,7 +120,7 @@ _pam_parse (const pam_handle_t *pamh, in
+ 			"user_envfile= specification missing argument - ignored");
+ 	  } else {
+ 	    *user_envfile = 13+*argv;
+-	    D(("new User Env File: %s", *user_env_file));
++	    D(("new User Env File: %s", *user_envfile));
+ 	  }
+ 	} else if (!strncmp(*argv,"readenv=",8))
+ 	  *readenv = atoi(8+*argv);
diff --git a/sys-libs/pam/pam-1.1.0.ebuild b/sys-libs/pam/pam-1.1.0.ebuild
new file mode 100644
index 000000000000..2529c219004a
--- /dev/null
+++ b/sys-libs/pam/pam-1.1.0.ebuild
@@ -0,0 +1,157 @@
+# 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.0.ebuild,v 1.1 2009/06/20 20:23:13 flameeyes Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+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"
+
+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_timestamp, 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}"
+
+	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
+
+	# Remove NIS dependencies, see bug #235431
+	epatch "${FILESDIR}/${MY_PN}-1.0.2-noyp.patch"
+
+	# Fix building with debug USE flag enabled
+	epatch "${FILESDIR}/${MY_PN}-1.1.0-debug.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"
+}