drop selinux patch, no longer needed, close bug 378661

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

5 files changed, 9 insertions, 28 deletions

diff --git a/net-nds/389-ds-base/389-ds-base-1.2.8.3.ebuild b/net-nds/389-ds-base/389-ds-base-1.2.8.3.ebuild
index 1ead875aed6a..7cfec213ee90 100644
--- a/net-nds/389-ds-base/389-ds-base-1.2.8.3.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-1.2.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.8.3.ebuild,v 1.1 2011/06/14 19:02:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.8.3.ebuild,v 1.2 2011/08/12 08:49:55 lxnay Exp $
 
 EAPI=2
 
@@ -61,7 +61,6 @@ src_prepare() {
 	use amd64 && export USE_64=1
 
 	sed -i -e 's/nobody/dirsrv/g' configure.ac || die "sed failed on configure.ac"
-	use selinux && epatch "${FILESDIR}/1.2.6"/*selinux*.patch
 	eautoreconf
 
 	# enable nsslapd-allow-unauthenticated-binds by default
diff --git a/net-nds/389-ds-base/ChangeLog b/net-nds/389-ds-base/ChangeLog
index 3dc3615ddbd5..678c09a138c9 100644
--- a/net-nds/389-ds-base/ChangeLog
+++ b/net-nds/389-ds-base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/389-ds-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.17 2011/06/14 19:02:24 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.18 2011/08/12 08:49:55 lxnay Exp $
+
+  12 Aug 2011; Fabio Erculiani <lxnay@gentoo.org>
+  -files/1.2.6/selinux_gentoo.patch, -files/1.2.6/selinux_makefile.patch,
+  389-ds-base-1.2.8.3.ebuild:
+  drop selinux patch, no longer needed, close bug 378661
 
 *389-ds-base-1.2.8.3 (14 Jun 2011)
 
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index cd0f3fab9dcc..627ee1825311 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -1,10 +1,8 @@
-AUX 1.2.6/selinux_gentoo.patch 410 RMD160 28cf3a3ecf9de2216af7f8b6b1da5b8420e78c14 SHA1 3641911617b1ed7103d2ac6ee5373d6e96889f17 SHA256 bf5935e7a4330bb88bb57058f26e44db57fc967a86d6f562243ec987846b879c
-AUX 1.2.6/selinux_makefile.patch 448 RMD160 a51d3a8fc81e4580984dd6e8ec89dcf5f9a8f66d SHA1 96f71c778609dcb1b8cde91757f55d3766f9d3d7 SHA256 ee4251bd1753696df385175a457c90a6e06f88eea8465e98a681d85b10bb81bc
 AUX 389-ds-snmp.initd 1076 RMD160 7a3be7745e7e7a6de675b40b56556bfacef76a9a SHA1 8d8cbaa5c288d7d2a4ec25a2d85b406336c37073 SHA256 0dccceef42e29b5f696fc241cccdb3641eca3d8e300aef13b13ba1a40f8382e1
 AUX 389-ds.initd 1995 RMD160 1c6140438e874b5e75bc13533fb493780675a2ff SHA1 a3c567584ce949317a741f2a8410f758d507f9b5 SHA256 722f0c18f21ccb60054433e62748008ffd908d026220be4f705dcf46e9322a92
 AUX restart-dirsrv 581 RMD160 8812d099f1da6bcbefc0d09fe719f340f3c6d534 SHA1 0db36dd8f0379f1cd4bcc10da4f6cfe6dc37eacd SHA256 fd0dfbce5d74b065fc1bef6e11527d56c7fc4f16ae55383841c05d35d03173b2
 AUX start-dirsrv 303 RMD160 92d3d03931614f9a85345feec5a070c7a664996f SHA1 b2b92fc7d6aaec16d9ed31ff4fb5a596f9ce32f7 SHA256 d29272f92d2c4420da8aad7919861ab667c8f224bde560491f1626957418d361
 DIST 389-ds-base-1.2.8.3.tar.bz2 2881255 RMD160 39442a5eaa2e5c05be6db6f3ee76cf051d5a70e5 SHA1 87f1f8ec0044f4b1766b2b65b34f4e14d9d0d41d SHA256 956d15947ed91d1564c539d6932b6bca28b1209dd43ff19594ceb4e41a40cf1f
-EBUILD 389-ds-base-1.2.8.3.ebuild 5553 RMD160 b7699f36df4ab8e0556a323898c0815a088cb43d SHA1 72379bd61be2beadb5d2be2957e87d9f21310175 SHA256 98da2199fb06bebdb1d916bd6c5d741b322e070fda9206905aefe2ea89a304bd
-MISC ChangeLog 3678 RMD160 7f72bda7c73dc004d70803faec84db6e028dd59a SHA1 9441ecb53d7db6363b704fe0842ba5e49386fe10 SHA256 c50c7247903135ed4a70ce951b22f9eac6d7d80e144627b734bd4d40e3e3b90d
+EBUILD 389-ds-base-1.2.8.3.ebuild 5494 RMD160 e9e73d7a1b4bf748ab976dd1f481ff1af2e6ddb8 SHA1 147bd979946ec4dd1f2d4a9be847a38f4acd2178 SHA256 2afdffc8750c6fd22779c8bd9c0e8c69d36758a430431c54b0b247152a33f5f6
+MISC ChangeLog 3890 RMD160 1656b02e29e72a2a18216a12bbbd323ac8f75e84 SHA1 6d7dbcaea53df29fbf9fdda8985587febcf4f7a4 SHA256 b96509535f79774b9150c004ef63a41882da8f02f13c2c3cfca4a80e73d1962a
 MISC metadata.xml 1070 RMD160 f31a4089eb70f9228378f1fb6dd69ae2942bc9a3 SHA1 5b58beab1b9e2a63c7378bdf9836683a888600de SHA256 b7bd4cba6afb6af7418c4c6467ef998cdcd381765de671462f15872d29fa4066
diff --git a/net-nds/389-ds-base/files/1.2.6/selinux_gentoo.patch b/net-nds/389-ds-base/files/1.2.6/selinux_gentoo.patch
deleted file mode 100644
index 4f6036fce1c9..000000000000
--- a/net-nds/389-ds-base/files/1.2.6/selinux_gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4.orig/selinux.m4	2010-03-09 04:02:20.562880260 +0200
-+++ m4/selinux.m4	2010-03-09 04:03:16.558882069 +0200
-@@ -27,7 +27,7 @@
-   with_selinux=yes
-   AC_MSG_RESULT(yes)
-   AC_SUBST(with_selinux)
--  if test ! -f "/usr/share/selinux/devel/Makefile"; then
-+  if test ! -f "/usr/share/selinux/targeted/include/Makefile"; then
-     AC_MSG_ERROR([SELinux development tools (selinux-policy) not found])
-   fi
- ],
diff --git a/net-nds/389-ds-base/files/1.2.6/selinux_makefile.patch b/net-nds/389-ds-base/files/1.2.6/selinux_makefile.patch
deleted file mode 100644
index 3ad7bda991fd..000000000000
--- a/net-nds/389-ds-base/files/1.2.6/selinux_makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- selinux.orig/Makefile	2010-03-09 04:55:28.915799132 +0200
-+++ selinux/Makefile	2010-03-09 04:57:09.214733326 +0200
-@@ -1,6 +1,5 @@
--POLICY_MAKEFILE = /usr/share/selinux/devel/Makefile
- POLICY_DIR = $(DESTDIR)/usr/share/selinux/targeted
--
-+POLICY_MAKEFILE = /usr/share/selinux/targeted/include/Makefile
- all:
- 	if [ ! -e $(POLICY_MAKEFILE) ]; then echo "You need to install the SELinux policy development tools (selinux-policy)" && exit 1; fi
-