Fix tests on architectures where pointers have a size different from 8. Remove old version.

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

6 files changed, 25 insertions, 197 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index de39251e127c..2fe41bb14932 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.230 2009/03/04 16:48:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.231 2009/03/05 15:14:39 flameeyes Exp $
+
+  05 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-1.0.4-fix-tests.patch, -files/other.pamd,
+  -files/system-auth.pamd.epam, -pam-0.99.8.1-r1.ebuild, pam-1.0.4.ebuild:
+  Fix tests on architectures where pointers have a size different from 8.
+  Remove old version.
 
   04 Mar 2009; Brent Baude <ranger@gentoo.org> pam-1.0.4.ebuild:
   Marking pam-1.0.4 ppc64 for bug 261108
diff --git a/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch b/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch
new file mode 100644
index 000000000000..b705f3655ce3
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.0.4-fix-tests.patch
@@ -0,0 +1,13 @@
+Index: Linux-PAM-1.0.4/tests/tst-pam_mkargv.c
+===================================================================
+--- Linux-PAM-1.0.4.orig/tests/tst-pam_mkargv.c
++++ Linux-PAM-1.0.4/tests/tst-pam_mkargv.c
+@@ -35,7 +35,7 @@ int main(void)
+   printf ("\n");
+ #endif
+ 
+-  if (argvlen != 333)
++  if (argvlen != ( 37 + ( 37 * sizeof(char*) ) ))
+     return 1;
+ 
+   if (myargc != 4)
diff --git a/sys-libs/pam/files/other.pamd b/sys-libs/pam/files/other.pamd
deleted file mode 100644
index 85ca04ecf3ce..000000000000
--- a/sys-libs/pam/files/other.pamd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth       required	pam_deny.so
-account    required	pam_deny.so
-password   required	pam_deny.so
-session    required	pam_deny.so
diff --git a/sys-libs/pam/files/system-auth.pamd.epam b/sys-libs/pam/files/system-auth.pamd.epam
deleted file mode 100644
index bdee6f4a6852..000000000000
--- a/sys-libs/pam/files/system-auth.pamd.epam
+++ /dev/null
@@ -1,15 +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
-
-#%EPAM-Use-Flag:cracklib%#password   required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 try_first_pass retry=3
-#%EPAM-Use-Flag:cracklib%#password   sufficient	pam_unix.so try_first_pass use_authtok nullok md5 shadow
-#%EPAM-Use-Flag:!cracklib%#password   sufficient	pam_unix.so try_first_pass 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.8.1-r1.ebuild b/sys-libs/pam/pam-0.99.8.1-r1.ebuild
deleted file mode 100644
index b20c0ff4ccdb..000000000000
--- a/sys-libs/pam/pam-0.99.8.1-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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-0.99.8.1-r1.ebuild,v 1.16 2009/03/03 21:07:31 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="mips"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc"
-
-RDEPEND="nls? ( virtual/libintl )
-	cracklib? ( >=sys-libs/cracklib-2.8.3 )
-	audit? ( sys-process/audit )
-	selinux? ( >=sys-libs/libselinux-1.28 )"
-DEPEND="${RDEPEND}
-	test? ( elibc_glibc? ( >=sys-libs/glibc-2.4 ) )
-	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/* 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:#.*::' /etc/pam.d/* 2>/dev/null | 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"
-		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
-
-	# 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/* 2>/dev/null | 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
-}
-
-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_PN}-0.99.8.1-xtests.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) \
-		$(use_enable cracklib) \
-		$(use_enable audit) \
-		--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.epam" system-auth
-	newpamd "${FILESDIR}/other.pamd" other
-
-	# 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*
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-
-	pam_epam_expand "${D}"/etc/pam.d/*
-}
-
-pkg_postinst() {
-	if ! use cracklib; then
-		ewarn "You chosen not to enable cracklib. Make sure you run etc-update or"
-		ewarn "you won't be able to change users' passwords."
-	fi
-}
diff --git a/sys-libs/pam/pam-1.0.4.ebuild b/sys-libs/pam/pam-1.0.4.ebuild
index 208b826f73f3..20ea4ff03f79 100644
--- a/sys-libs/pam/pam-1.0.4.ebuild
+++ b/sys-libs/pam/pam-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # 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.0.4.ebuild,v 1.3 2009/03/04 16:48:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.0.4.ebuild,v 1.4 2009/03/05 15:14:39 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -110,7 +110,10 @@ src_unpack() {
 	# Remove NIS dependencies, see bug #235431
 	epatch "${FILESDIR}/${MY_PN}-1.0.2-noyp.patch"
 
-	#Remove libtool-2 libtool macros, see bug 261167
+	# Fix tests on systems where sizeof(void*) != 8
+	epatch "${FILESDIR}/${MY_PN}-1.0.4-fix-tests.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