Port pambase to 4.1.0 version, and remove the version based off 4.0.18.2.

Package-Manager: portage-2.1.4.4

3 files changed, 17 insertions, 28 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index c81f186e713e..679e3e254d3c 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.184 2008/02/24 12:00:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.185 2008/02/24 14:37:39 flameeyes Exp $
+
+*shadow-4.1.0-r1 (24 Feb 2008)
+
+  24 Feb 2008; Diego Pettenò <flameeyes@gentoo.org>
+  -shadow-4.0.18.2-r2.ebuild, +shadow-4.1.0-r1.ebuild:
+  Port pambase to 4.1.0 version, and remove the version based off 4.0.18.2.
 
 *shadow-4.1.0 (24 Feb 2008)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 294768df3733..39b7f38cfd8a 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -32,15 +32,15 @@ DIST shadow-4.0.18.1.tar.bz2 1516296 RMD160 05a1f609370371de3112479cb6a98d966c45
 DIST shadow_4.0.18.2.orig.tar.gz 2501791 RMD160 f13d5c06bc88eea8d851a8c396110b2e96d1bb39 SHA1 c3426cddc8605ddb7ff55fdc231dc191ecc46989 SHA256 0b3cbfb32200cacd8544734d227d0a576642baf573f972f046bbbae457145cae
 DIST shadow_4.1.0.orig.tar.gz 2651512 RMD160 82c78efd61cb7cadfa2fd7fa0f1f3cb65c72363a SHA1 f4c99d44c33415d9ea68f98e47f6f7e9f47350f9 SHA256 cf132866ad1741da2072b8faa16e6e2d98ff85270151fe7383c818549187e3ae
 EBUILD shadow-4.0.18.1-r1.ebuild 5981 RMD160 3d55c06ab5a08051d9fcc14d79caf13f23bef699 SHA1 617a0087d5a949bee90135dc4aba0702bfd938b6 SHA256 efb797e3aa03063f0fc1d020daae30e401d5a3ad42c317235d153e52eb40ebb4
-EBUILD shadow-4.0.18.2-r2.ebuild 5215 RMD160 a8b1a78dfaa6182e76ab94576fdf907f1ac91e44 SHA1 68f26a57d13bcff59efc1cddce4fa06b0a14ee9f SHA256 850d092f5641d7b9c58359d8fada64c96335c6f180fcc90d7f8c2dc830bdcba4
 EBUILD shadow-4.0.18.2.ebuild 5191 RMD160 6716d64cee6e46c8cfd9bf84be0d7c2e1eee1684 SHA1 8023121f304efd1d0ab872d858cdf5e1c2bd837c SHA256 2681f509f51a1d5f01658c60616c43f5e80d75c5621bfe288051cedffbd850be
+EBUILD shadow-4.1.0-r1.ebuild 4745 RMD160 f60dc812b8c89c20d37da441f700a38a64f932c5 SHA1 27e4ec0c59767c49b0e8f7ccb6d3f4df0b062706 SHA256 41efd8b72afd1af7a252c8ae20a3c37f704de58e0e655c446bfaf946a7e3eca8
 EBUILD shadow-4.1.0.ebuild 4718 RMD160 fa0a7e7feb90bf02d369d46c92ff0b0b8696dfa7 SHA1 09d70acde021c8a18c0c5e1e5da0b1edb088c028 SHA256 7ca97061f3dbac39fdc0ef6822b2e8b7686b4cc66f8108be9539fad3acdc2cf7
-MISC ChangeLog 33134 RMD160 01d5cb479cf588b447bf21289463c8aa9145fbfb SHA1 e2283dcdc264225366097826ca25de57c349888c SHA256 da5383fd30993aad0414d329e298e4e6083354d772a29a60bbeb301cb0929d27
+MISC ChangeLog 33354 RMD160 5ebfc107bdd83f0b1fe948db0d248e4dcdea92f1 SHA1 eb85268fcfb3f8a0906c465475c865b045df5b41 SHA256 0e62e8c5d9fd73b952b597ba136c5bbeaaf705c6e3d40d783afbd80ba62f2804
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHwVxrj9hvisErhMIRAsjuAKCeAHD8dnAhSGxA//DhL4z0teGvMACgi+Fn
-cUK3xpa3GWNGDKJgUJhWZcg=
-=TzNK
+iD8DBQFHwYFIAiZjviIA2XgRAidzAKDluhqTfpWcTb7hRztVZzKzUP8lMACfRBwA
+xw4aMsNoRbvqKqsbubR0/28=
+=Ip07
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild b/sys-apps/shadow/shadow-4.1.0-r1.ebuild
index c272689a22a0..e4851eed21d7 100644
--- a/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.2-r2.ebuild,v 1.3 2008/02/24 11:02:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.0-r1.ebuild,v 1.1 2008/02/24 14:37:39 flameeyes Exp $
 
 inherit eutils libtool toolchain-funcs autotools pam multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/shadow/shadow_${PV}.orig.tar.gz"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="nls pam selinux skey nousuid cracklib"
+IUSE="nls pam selinux skey cracklib"
 
 # Does not work with OpenPAM (yet?)
 RDEPEND="cracklib? ( >=sys-libs/cracklib-2.7-r3 )
@@ -30,9 +30,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# uclibc support, corrects NIS usage
-	epatch "${FILESDIR}"/${PN}-4.0.13-nonis.patch
-
 	# If su should not simulate a login shell, use '/bin/sh' as shell to enable
 	# running of commands as user with /bin/false as shell, closing bug #15015.
 	# *** This one could be a security hole; disable for now ***
@@ -45,19 +42,7 @@ src_unpack() {
 	# Make user/group names more flexible #3485 / #22920
 	epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch
 	epatch "${FILESDIR}"/${PN}-4.0.13-long-groupnames.patch
-
-	# Fix compiling with gcc-2.95.x
-	epatch "${FILESDIR}"/${PN}-4.0.12-gcc2.patch
-
-	# lock down setuid perms #47208
-	epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
-
-	epatch "${FILESDIR}"/${PN}-4.0.15-uclibc-missing-l64a.patch
-	epatch "${FILESDIR}"/${PN}-4.0.16-fix-useradd-usergroups.patch #128715
-	epatch "${FILESDIR}"/${PN}-4.0.18.2-useradd.patch
-
-	# Needed by the UCLIBC patches
-	eautoconf || die
+	epatch "${FILESDIR}"/${PN}-4.1.0-fix-useradd-usergroups.patch #128715
 
 	elibtoolize
 	epunt_cxx
@@ -80,9 +65,7 @@ src_compile() {
 }
 
 src_install() {
-	local perms=4711
-	use nousuid && perms=711
-	make DESTDIR="${D}" suiduperms=${perms} install || die "install problem"
+	emake DESTDIR="${D}" suidperms=4711 install || die "install problem"
 	dosym useradd /usr/sbin/adduser
 
 	# Remove libshadow and libmisc; see bug 37725 and the following
@@ -128,7 +111,7 @@ src_install() {
 	if use pam ; then
 		dopamd "${FILESDIR}/pam.d-include/"{su,passwd,shadow}
 
-		newpamd "${FILESDIR}/login.pamd.3" login
+		newpamd "${FILESDIR}/login.pamd.2" login
 
 		for x in chage chsh chfn chpasswd newusers \
 				 user{add,del,mod} group{add,del,mod} ; do