fix for bug #24215, be aware that it may break on non-Linux Portage.

3 files changed, 39 insertions, 26 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 897ff3e8d2fd..e4044f310170 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.76 2003/10/30 19:57:10 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.77 2003/10/31 04:26:34 robbat2 Exp $
+
+  30 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> apache-2.0.48.ebuild:
+  fix for bug #24215, be aware that it may break on non-Linux Portage.
 
   30 Oct 2003; Donny Davies <woodchip@gentoo.org> files/apache.rc6,
   files/2.0.40/apache2.initd:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index eb0be4f8a17c..f8bb4e7604fb 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,17 +1,17 @@
-MD5 90b7174ec6fa48a662d48ae3c0a08844 apache-2.0.48.ebuild 10707
-MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
-MD5 03c997dee35fcd0c56d77294ef557ab0 apache-2.0.47.ebuild 11434
-MD5 fee6fd5ad8b1ae64e6819e84729a6aad ChangeLog 15502
-MD5 09fa626c00f029bdfb266b1e5d16193e apache-1.3.28-r1.ebuild 7905
+MD5 55862b63e709d619973d79c1ef2a1ce2 apache-2.0.48.ebuild 11155
+MD5 a7b34e66451c80aaaf83f125be7830c5 apache-1.3.27-r3.ebuild 7883
+MD5 14cd0bbb39a338f7214fbfc93e40ff25 apache-2.0.47.ebuild 11433
+MD5 90a788b38b2914746af66fb29d317ff4 ChangeLog 15647
+MD5 2d3df94ee4373424850f209cb454284e apache-1.3.28-r1.ebuild 7904
 MD5 bd80c41f0d8d92374c3712c4cac4d2ff metadata.xml 503
-MD5 235d2261cabdf2fbf72bee4b0ddd519f apache-2.0.47-r1.ebuild 10711
-MD5 d4bfc120696457a6084e949b99d045ac apache-1.3.27-r4.ebuild 8913
-MD5 2785b7e11adc2c240c5fca3d2d4cfb67 apache-2.0.46.ebuild 11012
-MD5 c8e565da1b91536d92e4e2a3001400a5 apache-1.3.28.ebuild 9135
+MD5 902cbae6f0c193503bf1e01fefab7b4d apache-2.0.47-r1.ebuild 10710
+MD5 55cd71a98138b9a419603da1c584684c apache-1.3.27-r4.ebuild 8912
+MD5 6422b2b91e0502b118cfbfec8b3a7cad apache-2.0.46.ebuild 11011
+MD5 1b53ad09d86ed3337ab2285bdb23902a apache-1.3.28.ebuild 9134
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
 MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
-MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
+MD5 7be16a0103be642b354ddcba5fb4bd91 files/apache-builtin-mods 2464
 MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
 MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28-r1 211
@@ -20,39 +20,39 @@ MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47-r1 65
 MD5 5dbbb01b1f4e39ff052a49389caa76ed files/apache-1.3.27_db4_gentoo.patch 956
 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
 MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
-MD5 85ccffe9b261e49604d01cee3b57d6fd files/apache.rc6 1045
+MD5 018d9fe7dda6d635b1f2f8441afc0ccb files/apache.rc6 1044
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
-MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
-MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
-MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
+MD5 a0252c6abb04b4211f28e828eaabe5d3 files/apachelogserverstatus 4762
+MD5 bf269395d653f995f21b543a4ceb42a9 files/robots.txt 339
+MD5 d0e867a1725d08e241f43cbab60ac3bb files/apacheaddmod 5976
+MD5 2ab9f43e3c8529e441e139bdd64074f4 files/apachedelmod 3184
 MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
-MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959
+MD5 961de7bbaaeee7a96240f50cf6966bea files/apachesplitlogfile 4958
 MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
 MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48 65
 MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
-MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
+MD5 4116d4d04ac48f9dc6c6b506fc62a277 files/apache.confd 1011
 MD5 df3796825b36f68131a9ab673297f692 files/conf/apache.conf 7238
 MD5 7f443a9cfecdb060ed53ddd8cb572316 files/conf/commonapache.conf 22169
-MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
-MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909
-MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
+MD5 49f74daf31509c98150f0b77c31a1195 files/conf/VirtualHomePages.conf 906
+MD5 24b8240f9bebfbf4c51c2bc626d1a6cb files/conf/Vhosts.conf 1908
+MD5 7c47e2641f7719c7c76607bc720b7b82 files/conf/DynamicVhosts.conf 962
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185
 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 473bbc8726eb6e8a49e9dcf661ccd7d1 files/2.0.40/apache2.initd 1146
+MD5 6a2a6bd30168a28993fe4d6344810784 files/2.0.40/apache2.confd 783
+MD5 2371b1602b53bb0fe17e7630f2bff11a files/2.0.40/apache2.initd 1145
 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
diff --git a/net-www/apache/apache-2.0.48.ebuild b/net-www/apache/apache-2.0.48.ebuild
index 3a6e859f68da..1a2d570433c4 100644
--- a/net-www/apache/apache-2.0.48.ebuild
+++ b/net-www/apache/apache-2.0.48.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.1 2003/10/30 17:51:18 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.48.ebuild,v 1.2 2003/10/31 04:26:34 robbat2 Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -124,8 +124,18 @@ src_compile() {
 
 	select_modules_config || die "determining modules"
 
+	# fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
+	# we pre-load the cache with the correct answer!
+	# this avoids it violating the sandbox
+	# this may have to be changed for non-Linux systems
+	# or if sem_open changes on Linux
+	# this hack is built around documentation in /usr/include/semaphore.h and
+	# the glibc (pthread) source
+	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
+
 	SSL_BASE="SYSTEM" \
 	./configure \
+		--cache-file=${S}/config.cache \
 		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 		--with-suexec-logfile=/var/log/apache2/suexec_log \
 		--with-suexec-bin=/usr/sbin/suexec2 \