Mark arm/hppa/ia64/s390/x86 stable for security, fix duplicate manpage install #69781, and block virtual/login when USE=-pam.

3 files changed, 28 insertions, 13 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index ae9c6aadb7bb..e98a2504bcc0 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.79 2004/11/02 11:23:21 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.80 2004/11/02 13:53:52 vapier Exp $
+
+  02 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5.ebuild:
+  Mark arm/hppa/ia64/s390/x86 stable for security, fix duplicate manpage
+  install #69781, and block virtual/login when USE=-pam.
 
   02 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> shadow-4.0.5.ebuild:
   Stable on sparc wrt #69212
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 4bf809e1af45..85028216f43c 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,21 +1,24 @@
-MD5 dc95a35501ea543f1061fa5dda39ed74 ChangeLog 14903
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b3df89d018b51c0db4ba8badb34aa613 ChangeLog 15103
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 23ef7363bf5ffa1d0f3343ff2a618e5d shadow-4.0.4.1-r4.ebuild 5943
-MD5 0ec2faa5b6417fdff59ddfe717122543 shadow-4.0.5.ebuild 4990
+MD5 297d154f703a593f0269a88e2cec98d7 shadow-4.0.5.ebuild 5024
 MD5 cef6788bc7c8c5468c1b1f68df77ed9e files/digest-shadow-4.0.4.1-r4 67
+MD5 2d2faa6b9a837f9319de52a780485743 files/securetty 243
 MD5 058f760e522ab65e270293003805fe61 files/shadow-4.0.4.1-userdel-missing-brackets.patch 380
 MD5 a99f871c88548d503bad935d2aa6f412 files/shadow-4.0.4.1-nls-manpages.patch 355
-MD5 2d2faa6b9a837f9319de52a780485743 files/securetty 243
-MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
+MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5 66
+MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
+MD5 38ab75648a10b5d49d2aaffab77d787e files/shadow-4.0.5-login.defs.patch 753
+MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
 MD5 aaf16ddabef285df169e37254b13561c files/shadow-4.0.4.1-selinux.diff 4296
 MD5 201f1321262da41ccd1a0283216ae9a7 files/shadow-4.0.4.1-su-pam_open_session.patch 4886
 MD5 bb55107c3a9354ef2d1977547fdb5a83 files/shadow-4.0.4.1-useradd-manpage-update.patch 958
-MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
-MD5 636f233fa173a998195016c3808173d4 files/shadow-4.0.5-skey.patch 395
-MD5 d8b8542a7bc013011a293732ca504a50 files/digest-shadow-4.0.5 66
 MD5 7becc41b4f7264483ee3ff0ca8277084 files/shadow-4.0.4.1-passwd-typo.patch 438
-MD5 38ab75648a10b5d49d2aaffab77d787e files/shadow-4.0.5-login.defs.patch 753
-MD5 c31db5c71b0cdfca75346abc2887aa02 files/shadow-4.0.5-nls-manpages.patch 362
+MD5 b8efca60a25e256eebe54c3d0db0760f files/shadow-4.0.4.1-gcc34-xmalloc.patch 361
+MD5 020e030c2d09b206e88cf9051ced6244 files/shadow-4.0.4.1-nonis.patch 1504
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
 MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
@@ -24,3 +27,10 @@ MD5 a1c7fb84c2dc309db86ba7b8d3dfae76 files/pam.d/passwd 214
 MD5 60d44a6f43aafcb9ca35858ab2534a49 files/pam.d/shadow 227
 MD5 0a8b62ed0426b607b92e275d63fa7cbf files/pam.d/su 1247
 MD5 1baa646400c4a596290e9d4b9e1c09b2 files/pam.d/system-auth-1.1 491
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBh5G0HTu7gpaalycRAteSAJ9k72yfPhxmyf1JiPxpA+rWa5K/AwCg0I/E
+BzspGeEFRo1fHg6dBI55elo=
+=IIz2
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/shadow-4.0.5.ebuild b/sys-apps/shadow/shadow-4.0.5.ebuild
index 2fa2a484debc..09db62cb275d 100644
--- a/sys-apps/shadow/shadow-4.0.5.ebuild
+++ b/sys-apps/shadow/shadow-4.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5.ebuild,v 1.8 2004/11/02 11:23:21 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.5.ebuild,v 1.9 2004/11/02 13:53:52 vapier Exp $
 
 inherit eutils libtool gnuconfig flag-o-matic
 
@@ -13,11 +13,12 @@ SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sparc x86"
 IUSE="pam selinux nls skey"
 
 RDEPEND=">=sys-libs/cracklib-2.7-r3
 	pam? ( >=sys-libs/pam-0.75-r4 )
+	!pam? ( !virtual/login )
 	skey? ( app-admin/skey )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${DEPEND}
@@ -136,7 +137,7 @@ src_install() {
 
 	# Remove manpages that are handled by other packages
 	find ${D}/usr/share/man \
-		'(' -name 'id.1' -o -name 'passwd.5' ')' \
+		'(' -name id.1 -o -name passwd.5 -o name getspnam.3 ')' \
 		-exec rm {} \;
 
 	cd ${S}/doc