Fix directory handling so selinux policies work correctly. Bugs 65006 and 65053.

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 9837215a4e277962dd52205a5906c6d7eede151d..0fe4c08cf79ed124a4e845aa1f49d0a21eb989aa 100644 (file)
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,10 +1,14 @@
 # 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.301 2004/11/09 03:18:02 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.302 2004/11/09 14:02:57 urilith Exp $
 
   09 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-1.3.33.ebuild:
   Stable on sparc wrt Stuart ;)
 
+  09 Nov 2004; Michael Tindal <urilith@gentoo.org>
+  files/2.0.49/40_mod_ssl.conf:
+  SELinux fixes for bugs
+
   07 Nov 2004; Joshua Kinard <kumba@gentoo.org> apache-1.3.32-r1.ebuild,
   apache-2.0.52-r1.ebuild:
   Marked stable on mips (Bugs #68564, #70138).

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index e613df7ffe50ba682870b7ffc1f57559a7b6d805..cf04984997e343088237099525a70dd2159f809e 100644 (file)
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,18 +1,18 @@
-MD5 7d3c01e248a700627207a29f8fb9fae8 ChangeLog 51841
+MD5 f9299901e320fa6a5687e23223260e99 ChangeLog 51949
 MD5 e4dc4b093f2d9b8edd137e09ecbb2adf apache-1.3.29-r2.ebuild 7177
-MD5 1bcfd89028a8f1e39f99a370f39e5ff2 apache-1.3.31-r1.ebuild 6739
-MD5 08b63251db95f14ddbdc4b0368d48702 apache-1.3.31.ebuild 6693
+MD5 13462fb57bec7feb92212d34a75e66e3 apache-1.3.32-r1.ebuild 6608
+MD5 c4728dbf14f69ec79e3dc9d3636e3f0b apache-1.3.32.ebuild 6616
 MD5 904e5b6782f1ddc241ce468dfd5cbd55 apache-2.0.50.ebuild 12902
+MD5 e04b2e008169968fe7b6c0775d5fab89 apache-2.0.51-r1.ebuild 12836
 MD5 c096bf4f3779f9138b631ae00aaa387d apache-2.0.51.ebuild 12827
+MD5 46e83b90a91a8997eefb54c4f3d3e0f3 apache-2.0.52.ebuild 12831
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
+MD5 51fdac8cf7872d2b9bad6c2929e3dcfd apache-2.0.52-r1.ebuild 12905
+MD5 16549f378f4d57cae1d8d2b6ec87bc94 apache-1.3.33.ebuild 6863
+MD5 1bcfd89028a8f1e39f99a370f39e5ff2 apache-1.3.31-r1.ebuild 6739
 MD5 c46f4b015504b2b22e0b8a7917ec84bf apache-1.3.31-r2.ebuild 6864
-MD5 46e83b90a91a8997eefb54c4f3d3e0f3 apache-2.0.52.ebuild 12831
 MD5 f71001bc9b282e7eb336570621b54328 apache-1.3.31-r3.ebuild 6872
-MD5 e04b2e008169968fe7b6c0775d5fab89 apache-2.0.51-r1.ebuild 12836
-MD5 13462fb57bec7feb92212d34a75e66e3 apache-1.3.32-r1.ebuild 6608
-MD5 c4728dbf14f69ec79e3dc9d3636e3f0b apache-1.3.32.ebuild 6616
-MD5 16549f378f4d57cae1d8d2b6ec87bc94 apache-1.3.33.ebuild 6863
-MD5 f00857763ffd5ff6b5e38e385c1b2fb8 apache-2.0.52-r1.ebuild 12837
+MD5 08b63251db95f14ddbdc4b0368d48702 apache-1.3.31.ebuild 6693
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
@@ -32,7 +32,13 @@ MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
 MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
+MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
+MD5 e50d882b9cc4547c6951c1638f904c3d files/digest-apache-1.3.31-r3 215
+MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
+MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
+MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
 MD5 0551c76a9171a3af1d0ad6aa2ef4572c files/digest-apache-2.0.50 137
+MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
 MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
 MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
@@ -41,14 +47,8 @@ MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
 MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
-MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139
-MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
-MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
-MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
-MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
 MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
-MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.49/40_mod_ssl.conf 3185
+MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
@@ -75,14 +75,14 @@ MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl
 MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r1/00_gentoo_base.patch 27799
 MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304
 MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149
-MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
-MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
-MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
-MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
-MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 c42fc79a9d08f38a8d8938883451f6b6 files/patches/1.3.31-r2/00_apache_proxy_security_fix.patch 790
 MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl.patch 32836
 MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r2/00_gentoo_base.patch 27799
 MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r2/00_gentoo_db4_detect.patch 1304
 MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149
+MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
+MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
+MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
+MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
+MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357

diff --git a/net-www/apache/apache-2.0.52-r1.ebuild b/net-www/apache/apache-2.0.52-r1.ebuild
index 2d7eb28c676dc52dbc52d7433741ffdf02c58180..a01b69fea3b586064082e8e0a9cc3194fc54df65 100644 (file)
--- a/net-www/apache/apache-2.0.52-r1.ebuild
+++ b/net-www/apache/apache-2.0.52-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-2.0.52-r1.ebuild,v 1.7 2004/11/07 23:27:21 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r1.ebuild,v 1.8 2004/11/09 14:02:57 urilith Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -362,14 +362,25 @@ select_modules_config() {
 pkg_postinst() {
        set_filter_flags
 
+       # Fix for bug #65006 (urilith@gentoo.org)
        #empty dirs...
-       install -d -m0755 -o apache -g apache ${ROOT}/var/lib/dav
-       install -d -m0755 -o root -g root ${ROOT}/var/log/apache2
-       install -d -m0755 -o apache -g apache ${ROOT}/var/cache/apache2
+       keepdir /var/lib/dav
+       fowners apache:apache /var/lib/dav
+       fperms 755 /var/lib/dav
+
+       keepdir /var/log/apache2
+       fowners apache:apache /var/log/apache2
+       fperms 755 /var/log/apache2
+
+       keepdir /var/cache/apache2
+       fowners apache:apache /var/cache/apache2
+       fperms 755 /var/cache/apache2
+
+       if use ssl; then
+               keepdir /etc/apache2/conf/ssl
+       fi
 
        if use ssl; then
-       #       install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
-       install -d -m0755 -o root -g root ${ROOT}/etc/apache2/conf/ssl
                cd ${ROOT}/etc/apache2/conf/ssl
                einfo
                einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."

diff --git a/net-www/apache/files/2.0.49/40_mod_ssl.conf b/net-www/apache/files/2.0.49/40_mod_ssl.conf
index 196b1bff530403c5554ba844046ba4611b8d2cd3..c2f3e3d2b1f83009c5dd2164d639114b882ded21 100644 (file)
--- a/net-www/apache/files/2.0.49/40_mod_ssl.conf
+++ b/net-www/apache/files/2.0.49/40_mod_ssl.conf
@@ -63,7 +63,7 @@ SSLPassPhraseDialog  builtin
 #SSLSessionCache        shmht:logs/ssl_scache(512000)
 #SSLSessionCache        shmcb:logs/ssl_scache(512000)
 #SSLSessionCache        dbm:logs/ssl_scache
-SSLSessionCache         shm:logs/ssl_scache(128000)
+SSLSessionCache         shm:/var/cache/apache2/ssl_scache(128000)
 
 SSLSessionCacheTimeout  300
 
@@ -71,7 +71,7 @@ SSLSessionCacheTimeout  300
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
 
-SSLMutex  file:logs/ssl_mutex
+SSLMutex  file:/var/cache/apache2/ssl_mutex
 
 #   Pseudo Random Number Generator (PRNG):
 #   Configure one or more sources to seed the PRNG of the 

diff --git a/net-www/apache/files/digest-apache-1.3.31-r3 b/net-www/apache/files/digest-apache-1.3.31-r3
index b661e6f11363100f13baccf57fa41218c135e7d1..8dc9c5fcfcfd1f7b478dcad8700ec9aed6992f47 100644 (file)
--- a/net-www/apache/files/digest-apache-1.3.31-r3
+++ b/net-www/apache/files/digest-apache-1.3.31-r3
@@ -1,2 +1,3 @@
 MD5 bd548a06ac48dda496b4e613572bb020 apache_1.3.31.tar.gz 2467371
 MD5 ae2becebfec3784f9342932581e1cc9d mod_ssl-2.8.19-1.3.31.tar.gz 754277
+MD5 dfb378c2ad65ce062f9a9fd83f0f97db apache-patches-1.3.31-r2.tar.bz2 13276