remove selinux stuff, no longer needed

4 files changed, 15 insertions, 21 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 03a9cef9dc2d..ed3265cc6469 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.34 2003/05/18 12:54:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.35 2003/06/30 02:26:43 pebenito Exp $
+
+  29 Jun 2003; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.3-r6.ebuild:
+  Remove selinux stuff, as its no longer needed.  Using pam-login again.
 
 *shadow-4.0.3-r6 (18 May 2003)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index f9d351d192d2..6cc47ae89b00 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,16 +1,16 @@
-MD5 f78b1de531395e3a16e868ee25d62abc ChangeLog 7064
 MD5 21620e30c508d857d5b19610e4c59c54 shadow-4.0.3-r3.ebuild 4868
 MD5 3f554c3eac0d87be62e86f5cc3af7b4f shadow-4.0.3-r4.ebuild 4872
+MD5 c49cec0e7052077150e72987f8bed766 ChangeLog 7216
 MD5 198f0a492622ae859ed81ad8c608a2f6 shadow-4.0.3-r5.ebuild 4952
-MD5 e6c732a26d1f8761af84020fcd85a385 shadow-4.0.3-r6.ebuild 5244
+MD5 c628d270e85cd054df50b69bab825aa7 shadow-4.0.3-r6.ebuild 4858
 MD5 03fbcf7c3c68fbd445550092e4df9933 files/digest-shadow-4.0.3-r3 140
 MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r4 65
-MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r5 65
-MD5 03fbcf7c3c68fbd445550092e4df9933 files/digest-shadow-4.0.3-r6 140
 MD5 e70a5f61d37c3c67a4b860d8a6191dbc files/securetty 230
 MD5 5be850b601aabd73a43b1a3bbb893386 files/shadow-4.0.3-nologin-run-sh.patch 972
 MD5 13c8bec4c2cffb2d73c2f5aa01229d03 files/shadow-4.0.3-su-pam_open_session.patch-v2 4882
 MD5 de1e23b4a7d38545475dffc3c9dc73a0 files/shadow-4.0.3-useradd-manpage-update.patch 804
+MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r5 65
+MD5 52fc2a150fc27350a5f9990e0007d064 files/digest-shadow-4.0.3-r6 65
 MD5 6e0bc0211949c624da0ea08d994a7038 files/default/useradd 96
 MD5 51b0337bd261f6ed5e53af5dc196431a files/pam.d/system-auth 499
 MD5 a5311bbc9c1fc378a6b0bfb3ca1b2394 files/pam.d/login 431
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.3-r6 b/sys-apps/shadow/files/digest-shadow-4.0.3-r6
index 22f2eeb1284a..aee0733f80f7 100644
--- a/sys-apps/shadow/files/digest-shadow-4.0.3-r6
+++ b/sys-apps/shadow/files/digest-shadow-4.0.3-r6
@@ -1,2 +1 @@
 MD5 873e49fcde0d665e916414722ecb0d72 shadow-4.0.3.tar.gz 1055089
-MD5 15e586eb8cec9a84683679fe7d093f2e shadow-4.0.3-selinux.patch.bz2 150543
diff --git a/sys-apps/shadow/shadow-4.0.3-r6.ebuild b/sys-apps/shadow/shadow-4.0.3-r6.ebuild
index 0ad55f01e7eb..048e53c9c5e5 100644
--- a/sys-apps/shadow/shadow-4.0.3-r6.ebuild
+++ b/sys-apps/shadow/shadow-4.0.3-r6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r6.ebuild,v 1.2 2003/06/21 21:19:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.3-r6.ebuild,v 1.3 2003/06/30 02:26:43 pebenito Exp $
 
-IUSE="selinux"
+IUSE=""
 
 inherit eutils libtool gnuconfig
 
@@ -11,8 +11,7 @@ FORCE_SYSTEMAUTH_UPDATE="yes"
 S="${WORKDIR}/${P}"
 HOMEPAGE="http://shadow.pld.org.pl/"
 DESCRIPTION="Utilities to deal with user accounts"
-SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz
-	selinux? mirror://gentoo/${P}-selinux.patch.bz2"
+SRC_URI="ftp://ftp.pld.org.pl/software/shadow/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,8 +19,7 @@ KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
 
 DEPEND=">=sys-libs/pam-0.75-r4
 	>=sys-libs/cracklib-2.7-r3
-	sys-devel/gettext
-	selinux? ( sys-apps/selinux-small )"
+	sys-devel/gettext"
 	
 RDEPEND=">=sys-libs/pam-0.75-r4
 	>=sys-libs/cracklib-2.7-r3"
@@ -40,8 +38,7 @@ src_unpack() {
 	# pam_xauth for one, is then never used.  This should close bug #8831.
 	#
 	# <azarah@gentoo.org> (19 Oct 2002)
-	use selinux || epatch ${FILESDIR}/${P}-su-pam_open_session.patch-v2
-	# (selinux doesn't like this patch. may fix later.)
+	epatch ${FILESDIR}/${P}-su-pam_open_session.patch-v2
 
 	# 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.
@@ -53,9 +50,6 @@ src_unpack() {
 	# Patch the useradd manpage to be a bit more clear, closing bug #13203.
 	# Thanks to Guy <guycad@mindspring.com>.
 	epatch ${FILESDIR}/${P}-useradd-manpage-update.patch
-
-	# Necessary selinux patch
-	use selinux && epatch ${DISTDIR}/${P}-selinux.patch.bz2
 }
 
 src_compile() {
@@ -91,8 +85,7 @@ src_install() {
 	# Do not install this login, but rather the one from
 	# pam-login, as this one have a serious root exploit
 	# with pam_limits in use.
-	# (selinux will use this login for now at least)
-	use selinux || rm ${D}/bin/login
+	rm ${D}/bin/login
 
 	mv ${D}/lib ${D}/usr
 	dosed "s:/lib':/usr/lib':g" /usr/lib/libshadow.la
@@ -144,8 +137,7 @@ src_install() {
 	
 	# Dont install the manpage, since we dont use
 	# login with shadow
-	# (selinux does, so we install the man pages in that case)
-	use selinux || rm -f ${D}/usr/share/man/man1/login.*
+	rm -f ${D}/usr/share/man/man1/login.*
 	# We use pam, so this is not applicable.
 	rm -f ${D}/usr/share/man/man5/suauth.*