Added selinux support. #56380.

8 files changed, 52 insertions, 41 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 00fe7be79cf4..aade9875b20f 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.222 2004/07/07 18:46:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.223 2004/07/08 16:22:26 zul Exp $
+
+  09 Jul 2004; Chuck Short <zul@gentoo.org> apache-1.3.29-r2.ebuild,
+  apache-1.3.31-r1.ebuild, apache-1.3.31-r2.ebuild, apache-2.0.49-r3.ebuild,
+  apache-2.0.49-r4.ebuild, apache-2.0.50.ebuild:
+  Added selinux support. Closes #56380.
 
   07 Jul 2004; Aron Griffis <agriffis@gentoo.org> apache-2.0.49-r4.ebuild:
   stable on ia64 #5541
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index fc96544b21b3..a24cf6c3f72d 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,15 +1,15 @@
-MD5 fca501fa7d7699ab40a2615b4b7c98c0 apache-2.0.49-r4.ebuild 13200
-MD5 3ba8e2e64f2dee1396729b5de985a70d apache-1.3.29-r2.ebuild 7140
+MD5 91487b5485f8b8336246c8c052ffed38 apache-2.0.49-r4.ebuild 13234
+MD5 3104b738054da5089cf50865c9f1e0cb apache-1.3.29-r2.ebuild 7173
 MD5 6fb2420645fe7cd13366395eaf0bd49e apache-1.3.31.ebuild 6700
-MD5 eccf2b4d6a170c2f7fb5842b8631c27b apache-1.3.31-r2.ebuild 6831
-MD5 8a813acc63b22cd82fab1a2beb76a3ea apache-2.0.49-r3.ebuild 13143
-MD5 49d4a0eec048c26bc43c8e238db04673 apache-1.3.31-r1.ebuild 6706
-MD5 d27657d50cba035a69bfab1acc9cc771 ChangeLog 39966
+MD5 d0af9c4419e80f8a9e552d94c10b9a12 apache-1.3.31-r2.ebuild 6865
+MD5 b43d9d3c8a5062d987c9eb0b8b545ad8 apache-2.0.49-r3.ebuild 13181
+MD5 9117f8a05139c94a8f20803c68af3f37 apache-1.3.31-r1.ebuild 6739
+MD5 9467606863b480db4a018510c9972684 ChangeLog 40197
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 3635b605f7337d2581fe402c7617d46a apache-2.0.50.ebuild 12843
+MD5 2e337105ee6cf61ff98202c544eef4ee apache-2.0.50.ebuild 12880
 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
+MD5 7be16a0103be642b354ddcba5fb4bd91 files/apache-builtin-mods 2464
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
@@ -20,31 +20,31 @@ MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
 MD5 f344d93e24620988b561d71974989e8e files/00_apache_manual.conf 770
 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
-MD5 7d55db018577d9c8f779d29dad70f22d files/apache.rc6 1082
+MD5 56ceb87ace65a84685ebb1d6ef30da4e files/apache.rc6 1081
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 64670c349a80e98fc61da8e32b44a913 files/httpd-2.0.49-ssl_engine_kernel.patch 66330
-MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
-MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
-MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
+MD5 a0252c6abb04b4211f28e828eaabe5d3 files/apachelogserverstatus 4762
+MD5 bf269395d653f995f21b543a4ceb42a9 files/robots.txt 339
+MD5 d0e867a1725d08e241f43cbab60ac3bb files/apacheaddmod 5976
 MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
-MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
-MD5 c4738c2f22a613ee5701ccdf61d9f7ce files/apache2 324
+MD5 2ab9f43e3c8529e441e139bdd64074f4 files/apachedelmod 3184
+MD5 04f0aad038773b082474ecf38c9e76f1 files/apache2 323
 MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
 MD5 0551c76a9171a3af1d0ad6aa2ef4572c files/digest-apache-2.0.50 137
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
-MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
+MD5 29a5597d5dcdaf32abee2720fdef1999 files/apache.confd 997
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
 MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
 MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
 MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
-MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
-MD5 bb04f10b8e54f2ee95a8149fc50bb35b files/conf/Vhosts.conf 1903
-MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
+MD5 49f74daf31509c98150f0b77c31a1195 files/conf/VirtualHomePages.conf 906
+MD5 717560c61bce028ba96c40bc6067bafc files/conf/Vhosts.conf 1902
+MD5 7c47e2641f7719c7c76607bc720b7b82 files/conf/DynamicVhosts.conf 962
 MD5 6c5fea3288b0ca4769495060d345055d files/2.0.48-r1/commonapache2.conf 31776
-MD5 63b10f728d11f10fb24241f8322542df files/2.0.48-r1/apache2.confd 1955
-MD5 abb7eca89bc2ad072c61418195a98cd6 files/2.0.48-r1/apache2.initd 2418
+MD5 8ae5a1ea62ef8fbd5acc44b859c94320 files/2.0.48-r1/apache2.confd 1954
+MD5 3d986d9efa2af8de7a12e3bedfe0fa60 files/2.0.48-r1/apache2.initd 2417
 MD5 e8f5a440ea77613b7908872b6ef7cf88 files/2.0.48-r1/apache2.conf 7659
 MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
 MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
@@ -54,15 +54,15 @@ MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652
 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844
-MD5 3dfd53805dfe77a12507c3af371dbeae files/2.0.40/apache2-builtin-mods 2213
-MD5 b335411e582a8fd58aacf2f35e75291f files/2.0.40/gentestcrt.sh 8805
+MD5 75f0dfc2d25c9047d1451a368e8eadb4 files/2.0.40/apache2-builtin-mods 2212
+MD5 44e6cb453fc9166b2f1cdea29814c8c4 files/2.0.40/gentestcrt.sh 8804
 MD5 9375735d739344987fe4b2a3990de273 files/2.0.40/highperformance.conf 1959
 MD5 5c47dec8c730edf1cb755b581327bd49 files/2.0.40/httpd.conf 35481
 MD5 0055923f696c9ba3be7eeb5518603d40 files/2.0.40/ssl.conf 11082
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
 MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
-MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
-MD5 cf5600eadc7f31990840d631ef518d6c files/2.0.40/apache2.initd 1160
+MD5 6a2a6bd30168a28993fe4d6344810784 files/2.0.40/apache2.confd 783
+MD5 c6836da0273e08b4b5a9aa39a7f917b5 files/2.0.40/apache2.initd 1159
 MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.40/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
@@ -72,12 +72,12 @@ MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
 MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
-MD5 0fac1724d97d449d1cfb746275f7b32b files/2.0.49/apache2-builtin-mods 2211
-MD5 0e8867687279c44ddbf51375c537cd02 files/2.0.49/gentestcrt.sh 8800
+MD5 b3a6d1c01772a3623f7d467e9d8ad51c files/2.0.49/apache2-builtin-mods 2210
+MD5 e72d437366d1c9875fd37d86966798fa files/2.0.49/gentestcrt.sh 8799
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 51551378f38d8bf3b8389d70e51ccdea files/2.0.49/commonapache2.conf 32231
-MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
-MD5 6d56b77cb2230dd123b6a22ce71ef1f4 files/2.0.49/apache2.initd 2498
+MD5 4a7d5e937948ff12e82e520baa675745 files/2.0.49/apache2.confd 1950
+MD5 7e6d62ae35452c97da829092ea85804b files/2.0.49/apache2.initd 2497
 MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652
 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780
diff --git a/net-www/apache/apache-1.3.29-r2.ebuild b/net-www/apache/apache-1.3.29-r2.ebuild
index 6d144083fd03..a3ea0edc8947 100644
--- a/net-www/apache/apache-1.3.29-r2.ebuild
+++ b/net-www/apache/apache-1.3.29-r2.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/net-www/apache/apache-1.3.29-r2.ebuild,v 1.4 2004/06/25 00:48:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29-r2.ebuild,v 1.5 2004/07/08 16:22:26 zul Exp $
 
 inherit eutils fixheadtails
 
@@ -24,7 +24,8 @@ DEPEND="dev-lang/perl <=sys-libs/db-4.1
 	>=dev-libs/mm-1.1.3
 	>=sys-libs/gdbm-1.8
 	>=dev-libs/expat-1.95.2
-	>=sys-apps/sed-4"
+	>=sys-apps/sed-4
+	selinux? (sec-policy/selinux-apache)"
 LICENSE="Apache-1.1"
 SLOT="1"
 
diff --git a/net-www/apache/apache-1.3.31-r1.ebuild b/net-www/apache/apache-1.3.31-r1.ebuild
index ac3b8271fcc7..971e5bbdfd84 100644
--- a/net-www/apache/apache-1.3.31-r1.ebuild
+++ b/net-www/apache/apache-1.3.31-r1.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/net-www/apache/apache-1.3.31-r1.ebuild,v 1.10 2004/06/25 00:48:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r1.ebuild,v 1.11 2004/07/08 16:22:26 zul Exp $
 
 inherit eutils fixheadtails
 
@@ -23,7 +23,8 @@ DEPEND="dev-lang/perl <=sys-libs/db-4.1
 	>=sys-libs/gdbm-1.8
 	>=dev-libs/expat-1.95.2
 	>=sys-apps/sed-4
-	=sys-libs/db-1.85-r1"
+	=sys-libs/db-1.85-r1
+	selinux? (sec-policy/selinux-apache)"
 LICENSE="Apache-2.0"
 SLOT="1"
 
diff --git a/net-www/apache/apache-1.3.31-r2.ebuild b/net-www/apache/apache-1.3.31-r2.ebuild
index 1aca0060515d..cdbf1aa0b5f5 100644
--- a/net-www/apache/apache-1.3.31-r2.ebuild
+++ b/net-www/apache/apache-1.3.31-r2.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/net-www/apache/apache-1.3.31-r2.ebuild,v 1.9 2004/06/25 00:48:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r2.ebuild,v 1.10 2004/07/08 16:22:26 zul Exp $
 
 inherit eutils fixheadtails
 
@@ -24,7 +24,8 @@ DEPEND="dev-lang/perl <=sys-libs/db-4.1
 	>=sys-libs/gdbm-1.8
 	>=dev-libs/expat-1.95.2
 	>=sys-apps/sed-4
-	=sys-libs/db-1.85-r1"
+	=sys-libs/db-1.85-r1
+	selinux? (sec-policy/selinux-apache)"
 LICENSE="Apache-2.0"
 SLOT="1"
 
diff --git a/net-www/apache/apache-2.0.49-r3.ebuild b/net-www/apache/apache-2.0.49-r3.ebuild
index 4af59e99a9a3..5e04d07264a3 100644
--- a/net-www/apache/apache-2.0.49-r3.ebuild
+++ b/net-www/apache/apache-2.0.49-r3.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/net-www/apache/apache-2.0.49-r3.ebuild,v 1.17 2004/06/27 20:24:47 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r3.ebuild,v 1.18 2004/07/08 16:22:26 zul Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -27,7 +27,8 @@ DEPEND="dev-util/yacc
 	>=sys-apps/sed-4
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )
+	selinux? (sec-policy/selinux-apache)"
 
 apache_setup_vars() {
 	# Sets the USERDIR to default.
diff --git a/net-www/apache/apache-2.0.49-r4.ebuild b/net-www/apache/apache-2.0.49-r4.ebuild
index c6cfa3455475..11c8a4b4f770 100644
--- a/net-www/apache/apache-2.0.49-r4.ebuild
+++ b/net-www/apache/apache-2.0.49-r4.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/net-www/apache/apache-2.0.49-r4.ebuild,v 1.10 2004/07/07 18:46:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r4.ebuild,v 1.11 2004/07/08 16:22:26 zul Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -27,7 +27,8 @@ DEPEND="dev-util/yacc
 	>=sys-apps/sed-4
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )
+	selinux? (sec-policy/seelinux-apache)"
 
 apache_setup_vars() {
 	# Sets the USERDIR to default.
diff --git a/net-www/apache/apache-2.0.50.ebuild b/net-www/apache/apache-2.0.50.ebuild
index b16973b4ca99..1915146f37c8 100644
--- a/net-www/apache/apache-2.0.50.ebuild
+++ b/net-www/apache/apache-2.0.50.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/net-www/apache/apache-2.0.50.ebuild,v 1.2 2004/07/05 14:55:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.50.ebuild,v 1.3 2004/07/08 16:22:26 zul Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -28,7 +28,8 @@ DEPEND="dev-util/yacc
 	>=sys-apps/sed-4
 	berkdb? ( sys-libs/db )
 	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
+	!mips? ( ldap? ( =net-nds/openldap-2* ) )
+	selinux? ( sec-policy/selinux-apache )"
 
 apache_setup_vars() {
 	# Sets the USERDIR to default.