Cleanup old version and required patches.

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

8 files changed, 9 insertions, 373 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 80aa13cb6046..29302b36800b 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.285 2010/11/20 15:55:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.286 2010/11/20 18:22:08 flameeyes Exp $
+
+  20 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/Linux-PAM-0.99.8.1-xtests.patch, -files/Linux-PAM-1.1.0-uclibc.patch,
+  -pam-1.1.1-r2.ebuild, -files/Linux-PAM-1.1.1+berkdb-5.patch,
+  -files/Linux-PAM-1.1.1-gentoodb.patch,
+  -files/Linux-PAM-1.1.1-pam_tally2-mode.patch,
+  -files/Linux-PAM-1.1.1-xcrypt.patch:
+  Cleanup old version and required patches.
 
   20 Nov 2010; Raúl Porcel <armin76@gentoo.org> pam-1.1.3.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #343399
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.8.1-xtests.patch b/sys-libs/pam/files/Linux-PAM-0.99.8.1-xtests.patch
deleted file mode 100644
index 2cd3e950db6d..000000000000
--- a/sys-libs/pam/files/Linux-PAM-0.99.8.1-xtests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch makes sure that the xtests programs don't get build when running
-'make all', as they might fail to build (for instance if GLIBC 2.3 is used).
-
-Note that the tests are not executed by default at make check because they
-are anyway broken.
-Index: Linux-PAM-0.99.9.0/xtests/Makefile.am
-===================================================================
---- Linux-PAM-0.99.9.0.orig/xtests/Makefile.am
-+++ Linux-PAM-0.99.9.0/xtests/Makefile.am
-@@ -29,7 +29,7 @@ XTESTS = tst-pam_dispatch1 tst-pam_dispa
- 	tst-pam_access4 tst-pam_limits1 tst-pam_succeed_if1 \
- 	tst-pam_group1
- 
--noinst_PROGRAMS = $(XTESTS)
-+check_PROGRAMS = $(XTESTS)
- 
- xtests: $(XTESTS) run-xtests.sh
- 	"$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS}
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.0-uclibc.patch b/sys-libs/pam/files/Linux-PAM-1.1.0-uclibc.patch
deleted file mode 100644
index 6b8fa25f8f59..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.1.0-uclibc.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Index: Linux-PAM-1.1.0/modules/pam_pwhistory/opasswd.c
-===================================================================
---- Linux-PAM-1.1.0.orig/modules/pam_pwhistory/opasswd.c
-+++ Linux-PAM-1.1.0/modules/pam_pwhistory/opasswd.c
-@@ -94,6 +94,23 @@ parse_entry (char *line, opwd *data)
-   return 0;
- }
- 
-+static int
-+compare_password(const char *newpass, const char *oldpass)
-+{
-+  char *outval;
-+#ifdef HAVE_CRYPT_R
-+  struct crypt_data output;
-+
-+  output.initialized = 0;
-+
-+  outval = crypt_r (newpass, oldpass, &output);
-+#else
-+  outval = crypt (newpass, oldpass);
-+#endif
-+
-+  return strcmp(outval, oldpass) == 0;
-+}
-+
- /* Check, if the new password is already in the opasswd file.  */
- int
- check_old_password (pam_handle_t *pamh, const char *user,
-@@ -167,12 +184,9 @@ check_old_password (pam_handle_t *pamh, 
-   if (found)
-     {
-       const char delimiters[] = ",";
--      struct crypt_data output;
-       char *running;
-       char *oldpass;
- 
--      memset (&output, 0, sizeof (output));
--
-       running = strdupa (entry.old_passwords);
-       if (running == NULL)
- 	return PAM_BUF_ERR;
-@@ -180,7 +194,7 @@ check_old_password (pam_handle_t *pamh, 
-       do {
- 	oldpass = strsep (&running, delimiters);
- 	if (oldpass && strlen (oldpass) > 0 &&
--	    strcmp (crypt_r (newpass, oldpass, &output), oldpass) == 0)
-+	    compare_password(newpass, oldpass) )
- 	  {
- 	    if (debug)
- 	      pam_syslog (pamh, LOG_DEBUG, "New password already used");
-Index: Linux-PAM-1.1.0/configure.in
-===================================================================
---- Linux-PAM-1.1.0.orig/configure.in
-+++ Linux-PAM-1.1.0/configure.in
-@@ -458,7 +458,7 @@ AC_FUNC_MEMCMP
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS(fseeko gethostname gettimeofday lckpwdf mkdir select)
- AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname)
--AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
-+AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
- AC_CHECK_FUNCS(getgrouplist getline getdelim)
- AC_CHECK_FUNCS(inet_ntop inet_pton ruserok_af)
- 
-Index: Linux-PAM-1.1.0/modules/pam_timestamp/pam_timestamp.c
-===================================================================
---- Linux-PAM-1.1.0.orig/modules/pam_timestamp/pam_timestamp.c
-+++ Linux-PAM-1.1.0/modules/pam_timestamp/pam_timestamp.c
-@@ -200,7 +200,13 @@ check_login_time(const char *ruser, time
- 	time_t oldest_login = 0;
- 
- 	setutent();
--	while(!getutent_r(&utbuf, &ut)) {
-+	while(
-+#ifdef HAVE_GETUTENT_R
-+	      !getutent_r(&utbuf, &ut)
-+#else
-+	      (ut = getutent()) != NULL
-+#endif
-+	      ) {
- 		if (ut->ut_type != USER_PROCESS) {
- 			continue;
- 		}
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.1+berkdb-5.patch b/sys-libs/pam/files/Linux-PAM-1.1.1+berkdb-5.patch
deleted file mode 100644
index ece92119b29a..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.1.1+berkdb-5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: Linux-PAM-1.1.1/modules/pam_userdb/pam_userdb.c
-===================================================================
---- Linux-PAM-1.1.1.orig/modules/pam_userdb/pam_userdb.c
-+++ Linux-PAM-1.1.1/modules/pam_userdb/pam_userdb.c
-@@ -30,6 +30,7 @@
- #else
- # ifdef HAVE_DB_H
- #  define DB_DBM_HSEARCH    1 /* use the dbm interface */
-+#  define HAVE_DBM            /* for BerkDB 5.0 and later */
- #  include <db.h>
- # else
- #  error "failed to find a libdb or equivalent"
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.1-gentoodb.patch b/sys-libs/pam/files/Linux-PAM-1.1.1-gentoodb.patch
deleted file mode 100644
index 0334496b9902..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.1.1-gentoodb.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: Linux-PAM-1.1.1/configure.in
-===================================================================
---- Linux-PAM-1.1.1.orig/configure.in
-+++ Linux-PAM-1.1.1/configure.in
-@@ -389,10 +389,11 @@ AC_ARG_WITH([db-uniquename],
- 	AS_HELP_STRING([--with-db-uniquename=extension],[Unique name for db libraries and functions.]))
- if test x"$WITH_DB" != xno ; then
-         if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then
--              AC_CHECK_LIB([db$with_db_uniquename], [db_create$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="")
--              if test -z "$LIBDB" ; then
--                  AC_CHECK_LIB([db$with_db_uniquename], [dbm_store$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="")
--              fi
-+              old_libs=$LIBS
-+              LIBS="$LIBS -ldb$with_db_uniquename"
-+              AC_CHECK_FUNCS([db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store],
-+                [LIBDB="-ldb$with_db_uniquename"; break])
-+              LIBS=$old_libs
-         fi
-         if test -z "$LIBDB" ; then
-             AC_CHECK_LIB([ndbm],[dbm_store], LIBDB="-lndbm", LIBDB="")
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.1-pam_tally2-mode.patch b/sys-libs/pam/files/Linux-PAM-1.1.1-pam_tally2-mode.patch
deleted file mode 100644
index 608615cf6d94..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.1.1-pam_tally2-mode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: modules/pam_tally2/pam_tally2.c
-===================================================================
-RCS file: /cvsroot/pam/Linux-PAM/modules/pam_tally2/pam_tally2.c,v
-retrieving revision 1.4
-diff -u -B -r1.4 pam_tally2.c
---- modules/pam_tally2/pam_tally2.c	27 Feb 2009 14:29:40 -0000	1.4
-+++ modules/pam_tally2/pam_tally2.c	26 Jul 2010 15:37:14 -0000
-@@ -373,7 +373,7 @@
- 
-     lstat_ret = lstat(filename, &fileinfo);
-     if (lstat_ret) {
--      *tfile=open(filename, O_APPEND|O_CREAT, 0700);
-+      *tfile=open(filename, O_APPEND|O_CREAT, S_IRUSR|S_IWUSR);
-       /* Create file, or append-open in pathological case. */
-       if (*tfile == -1) {
- #ifndef MAIN
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch b/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch
deleted file mode 100644
index f842da7dfe5e..000000000000
--- a/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: Linux-PAM-1.1.1/configure.in
-===================================================================
---- Linux-PAM-1.1.1.orig/configure.in
-+++ Linux-PAM-1.1.1/configure.in
-@@ -361,10 +361,14 @@ AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS],
- 	       [test "x$HAVE_AUDIT_TTY_STATUS" = xyes])
- 
- AC_CHECK_HEADERS(xcrypt.h crypt.h)
-+AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
-+  [crypt_libs="xcrypt crypt"],
-+  [crypt_libs="crypt"])
-+
- BACKUP_LIBS=$LIBS
--AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
-+AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
- AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
--Libs=$BACKUP_LIBS
-+LIBS=$BACKUP_LIBS
- AC_SUBST(LIBCRYPT)
- if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then
- 	AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.])
diff --git a/sys-libs/pam/pam-1.1.1-r2.ebuild b/sys-libs/pam/pam-1.1.1-r2.ebuild
deleted file mode 100644
index 53caa835e699..000000000000
--- a/sys-libs/pam/pam-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2010 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-r2.ebuild,v 1.13 2010/10/22 08:01:02 flameeyes Exp $
-
-EAPI="3"
-
-inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic db-use
-
-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="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~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"
-
-RDEPEND="nls? ( virtual/libintl )
-	cracklib? ( >=sys-libs/cracklib-2.8.3 )
-	audit? ( sys-process/audit )
-	selinux? ( >=sys-libs/libselinux-1.28 )
-	berkdb? ( sys-libs/db )
-	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 )"
-RDEPEND="${RDEPEND}
-	!sys-auth/pam_userdb"
-
-S="${WORKDIR}/${MY_P}"
-
-PROVIDE="virtual/pam"
-
-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_setup() {
-	check_old_modules
-}
-
-src_prepare() {
-	# 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"
-
-	# Fix building on uClibc; it is added since 1.1.1 but applies to
-	# 1.1.0 as well.
-	epatch "${FILESDIR}/${MY_PN}-1.1.0-uclibc.patch"
-
-	# Fix tests to find Berkeley DB as installed by Gentoo (with a
-	# library suffix but no suffix on the ELF symbols).
-	epatch "${FILESDIR}/${MY_PN}-1.1.1-gentoodb.patch"
-
-	# make it possible to skip libxcrypt detection if header is not
-	# found
-	epatch "${FILESDIR}/${MY_PN}-1.1.1-xcrypt.patch"
-
-	# fix building with Berkeley DB 5.0 and later; now defining
-	# DB_DBM_HSEARCH is not enough; bug #319831
-	epatch "${FILESDIR}/${MY_PN}-1.1.1+berkdb-5.patch"
-
-	# fix tally file created executable, see bug #329885
-	epatch "${FILESDIR}/${MY_PN}-1.1.1-pam_tally2-mode.patch"
-
-	# Remove libtool-2 libtool macros, see bug 261167
-	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
-
-	eautoreconf
-
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-
-	if use hppa || use elibc_FreeBSD; then
-		myconf="${myconf} --disable-pie"
-	fi
-
-	# 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
-
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--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) \
-		--with-db-uniquename=-$(db_findver sys-libs/db) \
-		--disable-dependency-tracking \
-		--disable-prelude \
-		${myconf}
-}
-
-src_compile() {
-	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "emake failed"
-}
-
-src_test() {
-	# explicitly allow parallel-build during testing
-	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" check || die "emake check failed"
-}
-
-src_install() {
-	local lib
-
-	emake DESTDIR="${D}" install \
-		 sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "make install failed"
-
-	# Need to be suid
-	fperms u+s /sbin/unix_chkpwd
-
-	gen_usr_ldscript -a pam pamc pam_misc
-
-	# create extra symlinks just in case something depends on them...
-	for lib in pam pamc pam_misc; do
-		if ! [[ -f "${ED}"/$(get_libdir)/lib${lib}$(get_libname) ]]; then
-			dosym lib${lib}$(get_libname 0) /$(get_libdir)/lib${lib}$(get_libname)
-		fi
-	done
-
-	dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
-
-	docinto modules
-	for dir in modules/pam_*; do
-		newdoc "${dir}"/README README."$(basename "${dir}")"
-	done
-
-	# 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 need them for static linking either.
-	find "${D}" -name '*.la' -delete
-}
-
-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 'DEL.*libpam\\.so'"
-	elog ""
-	elog "Because of a bug present up to version 1.1.1-r2, you might have"
-	elog "an executable /var/log/tallylog file. If it is so, you can safely"
-	elog "correct it by running the command"
-	elog "  chmod -x /var/log/tallylog"
-	elog ""
-}