Don't report pam_chroot as deprecated, as it's now in portage (thanks Ali Polatel, hawking). Remove previous 0.99 series, before stabling Linux-PAM we need to give time to pam_chroot to settle down a bit at least.

(Portage version: 2.1.3_rc7)

8 files changed, 24 insertions, 408 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index fda462a350f6..ecd671c9beb5 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,13 @@
 # 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.162 2007/07/10 14:18:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.163 2007/07/12 09:22:59 flameeyes Exp $
+
+  12 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/Linux-PAM-0.99.6.3-berkdb.patch, -files/system-auth.pamd.0.99,
+  -pam-0.99.7.1.ebuild, -pam-0.99.8.0.ebuild, pam-0.99.8.0-r1.ebuild:
+  Don't report pam_chroot as deprecated, as it's now in portage (thanks Ali
+  Polatel, hawking). Remove previous 0.99 series, before stabling Linux-PAM we
+  need to give time to pam_chroot to settle down a bit at least.
 
   10 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/pam-0.78-inttypes.patch, -files/pam-0.78-xauth-path.patch,
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.6.3-berkdb.patch b/sys-libs/pam/files/Linux-PAM-0.99.6.3-berkdb.patch
deleted file mode 100644
index 2d811ae6e0da..000000000000
--- a/sys-libs/pam/files/Linux-PAM-0.99.6.3-berkdb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Linux-PAM-0.99.6.3/configure.in
-===================================================================
---- Linux-PAM-0.99.6.3.orig/configure.in
-+++ Linux-PAM-0.99.6.3/configure.in
-@@ -329,6 +329,11 @@ AC_SEARCH_LIBS([crypt],[xcrypt crypt], L
- LIBS=$BACKUP_LIBS
- AC_SUBST(LIBCRYPT)
- 
-+AC_ARG_ENABLE([berkdb],
-+	AC_HELP_STRING([--disable-berkdb],[do not use Berkeley DB]),
-+	WITH_BERKDB=$enableval, WITH_BERKDB=yes)
-+
-+if test "x$WITH_BERKDB" = "xyes"; then
- dnl check for libdb or libndbm as fallback. Some libndbm compat
- dnl libraries are unuseable, so try libdb first.
- AC_CHECK_LIB([db], [db_create], LIBDB="-ldb", LIBDB="")
-@@ -344,6 +349,8 @@ else
-     AC_CHECK_HEADERS(db.h)
- fi
- AC_SUBST(LIBDB)
-+fi
-+
- AM_CONDITIONAL([HAVE_LIBDB], [test ! -z "$LIBDB"])
- 
- AC_CHECK_LIB([nsl],[yp_get_default_domain], LIBNSL="-lnsl", LIBNSL="")
diff --git a/sys-libs/pam/files/digest-pam-0.99.7.1 b/sys-libs/pam/files/digest-pam-0.99.7.1
deleted file mode 100644
index 5bcd595ca6ac..000000000000
--- a/sys-libs/pam/files/digest-pam-0.99.7.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 45ba2ac18dcca996ff63c3968c604451 Linux-PAM-0.99.7.1-ldflags-to-libadd.patch.bz2 2551
-RMD160 14a84d38bf4643f55a5a93400aa0b4fefb9fc30b Linux-PAM-0.99.7.1-ldflags-to-libadd.patch.bz2 2551
-SHA256 0436acbf46269bf664505d3dff1d80eeb168c9a9b50878401e6414663ca2c392 Linux-PAM-0.99.7.1-ldflags-to-libadd.patch.bz2 2551
-MD5 385458dfb4633071594e255a6ebec9da Linux-PAM-0.99.7.1.tar.bz2 872588
-RMD160 b705904a568d7badd3922665d2d019e434cc72ee Linux-PAM-0.99.7.1.tar.bz2 872588
-SHA256 d5f3756bbb61a27adc2d16842ea6d867c9c1830a2c9577f71bb9fe14859ac96a Linux-PAM-0.99.7.1.tar.bz2 872588
diff --git a/sys-libs/pam/files/digest-pam-0.99.8.0 b/sys-libs/pam/files/digest-pam-0.99.8.0
deleted file mode 100644
index 0ae5144edf74..000000000000
--- a/sys-libs/pam/files/digest-pam-0.99.8.0
+++ /dev/null
@@ -1,6 +0,0 @@
-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/files/system-auth.pamd.0.99 b/sys-libs/pam/files/system-auth.pamd.0.99
deleted file mode 100644
index c37035f51067..000000000000
--- a/sys-libs/pam/files/system-auth.pamd.0.99
+++ /dev/null
@@ -1,14 +0,0 @@
-#%PAM-1.0
-
-auth       required	pam_env.so
-auth       sufficient	pam_unix.so try_first_pass likeauth nullok
-auth       required	pam_deny.so
-
-account    required	pam_unix.so
-
-password   required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 try_first_pass retry=3
-password   sufficient	pam_unix.so try_first_pass use_authtok nullok md5 shadow
-password   required	pam_deny.so
-
-session    required	pam_limits.so
-session    required	pam_unix.so
diff --git a/sys-libs/pam/pam-0.99.7.1.ebuild b/sys-libs/pam/pam-0.99.7.1.ebuild
deleted file mode 100644
index 7fd2c8d6de4a..000000000000
--- a/sys-libs/pam/pam-0.99.7.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.7.1.ebuild,v 1.8 2007/07/10 13:49:07 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.99' || 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 "${FILESDIR}/${MY_PN}-0.99.6.3-berkdb.patch"
-	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-berkdb \
-		--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.*
-
-	newpamd "${FILESDIR}/system-auth.pamd.0.99" system-auth
-	newpamd "${FILESDIR}/other.pamd" other
-
-	# 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"
-}
diff --git a/sys-libs/pam/pam-0.99.8.0-r1.ebuild b/sys-libs/pam/pam-0.99.8.0-r1.ebuild
index dd6200852a00..43b78a46cea1 100644
--- a/sys-libs/pam/pam-0.99.8.0-r1.ebuild
+++ b/sys-libs/pam/pam-0.99.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2007/07/10 13:49:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.0-r1.ebuild,v 1.3 2007/07/12 09:22:59 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -53,11 +53,11 @@ check_old_modules() {
 		retval=1
 	fi
 
-	if sed -e 's:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp|chroot)'; then
+	if sed -e 's:#.*::' /etc/pam.d/* | egrep -q 'pam_(pwdb|radius|timestamp)'; 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 "pam_pwdb, pam_radius, pam_timestamp"
 		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."
@@ -69,25 +69,19 @@ check_old_modules() {
 	# Produce the warnings only during upgrade, for the following two
 	has_version '<sys-libs/pam-0.99' || 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
+	# This works only for those modules that are moved to sys-auth/$module, or the
+	# message will be wrong.
+	for module in pam_chroot pam_console pam_userdb; do
+		if sed -e 's:#.*::' /etc/pam.d/* | fgrep -q ${module}.so; then
+			ewarn ""
+			ewarn "Your current setup is using the ${module} 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/${module}."
+			ewarn ""
+			ebeep 5
+		fi
+	done
 
 	return $retval
 }
diff --git a/sys-libs/pam/pam-0.99.8.0.ebuild b/sys-libs/pam/pam-0.99.8.0.ebuild
deleted file mode 100644
index 9b9ffed4f84a..000000000000
--- a/sys-libs/pam/pam-0.99.8.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.4 2007/07/10 13:49:07 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.99' || 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"
-	epatch "${FILESDIR}/${MY_P}-setlocale.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.*
-
-	newpamd "${FILESDIR}/system-auth.pamd.0.99" system-auth
-	newpamd "${FILESDIR}/other.pamd" other
-
-	# 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"
-}