summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2011-08-13 06:08:30 +0000
committerFabio Erculiani <lxnay@gentoo.org>2011-08-13 06:08:30 +0000
commit72478cfc4aaed501c09867078094e0379ca3e597 (patch)
treee83616869ceaaeb150c43a44762df1a8b12b4223 /net-nds
parentstop logwatch from complaining - bug #378877 (diff)
downloadhistorical-72478cfc4aaed501c09867078094e0379ca3e597.tar.gz
historical-72478cfc4aaed501c09867078094e0379ca3e597.tar.bz2
historical-72478cfc4aaed501c09867078094e0379ca3e597.zip
apply back a patch for selinux, close bug 378953
Package-Manager: portage-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.ebuild3
-rw-r--r--net-nds/389-ds-base/ChangeLog6
-rw-r--r--net-nds/389-ds-base/Manifest5
-rw-r--r--net-nds/389-ds-base/files/selinux.patch8
4 files changed, 18 insertions, 4 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 7cfec213ee90..8bb9ec827a42 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.2 2011/08/12 08:49:55 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.8.3.ebuild,v 1.3 2011/08/13 06:08:30 lxnay Exp $
EAPI=2
@@ -56,6 +56,7 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/selinux.patch"
# as per 389 documentation, when 64bit, export USE_64
use amd64 && export USE_64=1
diff --git a/net-nds/389-ds-base/ChangeLog b/net-nds/389-ds-base/ChangeLog
index 678c09a138c9..284130cd3533 100644
--- a/net-nds/389-ds-base/ChangeLog
+++ b/net-nds/389-ds-base/ChangeLog
@@ -1,6 +1,10 @@
# 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.18 2011/08/12 08:49:55 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.19 2011/08/13 06:08:30 lxnay Exp $
+
+ 13 Aug 2011; Fabio Erculiani <lxnay@gentoo.org> 389-ds-base-1.2.8.3.ebuild,
+ +files/selinux.patch:
+ apply back a patch for selinux, close bug 378953
12 Aug 2011; Fabio Erculiani <lxnay@gentoo.org>
-files/1.2.6/selinux_gentoo.patch, -files/1.2.6/selinux_makefile.patch,
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 627ee1825311..0710b9d695cf 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -1,8 +1,9 @@
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 selinux.patch 280 RMD160 f20b93a31f0e2435b95f3e927c99c719811b9bd7 SHA1 00391f15331ec22e3b43e098230ad154c150edfb SHA256 0600d46c02987c69c3c77a2f8f90dd4c31edea983911268227aa708230cdb6f9
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 5494 RMD160 e9e73d7a1b4bf748ab976dd1f481ff1af2e6ddb8 SHA1 147bd979946ec4dd1f2d4a9be847a38f4acd2178 SHA256 2afdffc8750c6fd22779c8bd9c0e8c69d36758a430431c54b0b247152a33f5f6
-MISC ChangeLog 3890 RMD160 1656b02e29e72a2a18216a12bbbd323ac8f75e84 SHA1 6d7dbcaea53df29fbf9fdda8985587febcf4f7a4 SHA256 b96509535f79774b9150c004ef63a41882da8f02f13c2c3cfca4a80e73d1962a
+EBUILD 389-ds-base-1.2.8.3.ebuild 5530 RMD160 598e1d669c078c6c10c130fa1950e269585fe546 SHA1 ef00b60b873819e04e94b6bb13c50ceaa9c00aae SHA256 8dc6591f81abd3a2540e6daeb420804ebc63cd7e34822279b5e0109ebbc9a0c1
+MISC ChangeLog 4044 RMD160 5c03aa468ab6d0c14115f4b871c2fe9c3d2c042a SHA1 4681e1c69c042a4824a194a9868632d9d3738695 SHA256 25ae9b17fe9127972539c743ba1567bbb812028d18b0e5b0cd857c148db43397
MISC metadata.xml 1070 RMD160 f31a4089eb70f9228378f1fb6dd69ae2942bc9a3 SHA1 5b58beab1b9e2a63c7378bdf9836683a888600de SHA256 b7bd4cba6afb6af7418c4c6467ef998cdcd381765de671462f15872d29fa4066
diff --git a/net-nds/389-ds-base/files/selinux.patch b/net-nds/389-ds-base/files/selinux.patch
new file mode 100644
index 000000000000..4b6e093eecca
--- /dev/null
+++ b/net-nds/389-ds-base/files/selinux.patch
@@ -0,0 +1,8 @@
+--- 389-ds-base-1.2.8.3.orig/selinux/Makefile
++++ 389-ds-base-1.2.8.3/selinux/Makefile
+@@ -1,4 +1,4 @@
+-POLICY_MAKEFILE = /usr/share/selinux/devel/Makefile
++POLICY_MAKEFILE = /usr/share/selinux/targeted/include/Makefile
+ POLICY_DIR = $(DESTDIR)/usr/share/selinux/targeted
+
+ all: