diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2011-08-12 08:49:55 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2011-08-12 08:49:55 +0000 |
| commit | cd9b397499cadc71c83bb63ad967822e49c02ab0 (patch) | |
| tree | c448ff8fd7c85ba7127a2eb71d7a5b4bacab75af /net-nds | |
| parent | Version bump nose to 1.1.1. (diff) | |
| download | gentoo-2-cd9b397499cadc71c83bb63ad967822e49c02ab0.tar.gz gentoo-2-cd9b397499cadc71c83bb63ad967822e49c02ab0.tar.bz2 gentoo-2-cd9b397499cadc71c83bb63ad967822e49c02ab0.zip | |
drop selinux patch, no longer needed, close bug 378661
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/389-ds-base/389-ds-base-1.2.8.3.ebuild | 3 | ||||
| -rw-r--r-- | net-nds/389-ds-base/ChangeLog | 7 | ||||
| -rw-r--r-- | net-nds/389-ds-base/files/1.2.6/selinux_gentoo.patch | 11 | ||||
| -rw-r--r-- | net-nds/389-ds-base/files/1.2.6/selinux_makefile.patch | 10 |
4 files changed, 7 insertions, 24 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/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 - |