Fix sem_open related sandbox violations. Resolves bug 133573.

Package-Manager: portage-2.1_rc1-r2

6 files changed, 58 insertions, 21 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index faf5a97a99a0..db843b0d3140 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/apr
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.54 2006/04/16 22:03:00 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.55 2006/05/18 01:22:33 vericgar Exp $
+
+  18 May 2006; Michael Stewart <vericgar@gentoo.org> apr-0.9.12.ebuild,
+  apr-1.2.7.ebuild:
+  Fix sem_open related sandbox violations. Resolves bug 133573.
 
 *apr-0.9.12 (16 Apr 2006)
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 63094b1e874c..d5ca7e06c5f0 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,33 +1,49 @@
-MD5 eec477485ed9b63b8ff690019e260931 ChangeLog 6721
-RMD160 b8cdfe44f5acf7e7dfed40b29023aeb9509af96e ChangeLog 6721
-SHA256 26aef65bc577294dce271a3f8cd69410cb2399a45a9a55cbfc4a007cd3b1b4fc ChangeLog 6721
-MD5 470d836c232813491b36fcaab55e57a5 apr-0.9.12.ebuild 1748
-RMD160 11f46894c0564880c8c07d13e41dd41f52ba50a4 apr-0.9.12.ebuild 1748
-SHA256 230ae70bae47a6e502121435a0e04411003e5ffbad42eebf69d63f122574b247 apr-0.9.12.ebuild 1748
+DIST apr-0.9.12.tar.gz 1048890 RMD160 a6604478b3d09c860bc27a21859248dfd5f6b259 SHA256 a4e9eaa1c5cbac1bb82fb08b6414cf077555353423e8fc5ae93145c33a607dc2 size 1048890
+DIST apr-0.9.6.tar.gz 1025231 RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5 size 1025231
+DIST apr-0.9.7.tar.gz 1045136 RMD160 d2978d3f3d505885e0782b2b2b40fa1ccc2e9e7a SHA256 9d102909d840b2e2960a8175408e6d6a6e28a35112bd1190a22d346b0b66b2ba size 1045136
+DIST apr-1.2.2.tar.gz 1096029 RMD160 13a4edd59fb93596c8cae4549d38a0022a5c6758 SHA256 23826f62b305efef3f6c6e7e6b8ddad05ec48a2f36410ff508b3fc4714a33dfc size 1096029
+DIST apr-1.2.7.tar.gz 1102370 RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa size 1102370
+EBUILD apr-0.9.12.ebuild 2138 RMD160 07746389e57f73fecee41e7a9487d7a81358733b SHA1 8abf1935b87a4348d39c7f73877b63044fe0b275 SHA256 2a0c3a41910052eb49f6ccd3e47f35451cacc1b77d8c28bd2be7f417a7e3a75a size 2138
+MD5 0640458528bab0a8835b6ecd6d47b1f5 apr-0.9.12.ebuild 2138
+RMD160 07746389e57f73fecee41e7a9487d7a81358733b apr-0.9.12.ebuild 2138
+SHA256 2a0c3a41910052eb49f6ccd3e47f35451cacc1b77d8c28bd2be7f417a7e3a75a apr-0.9.12.ebuild 2138
+EBUILD apr-0.9.6-r3.ebuild 1534 RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 SHA1 63ecf41ab814152095cca916d7b69cda90f3aa1b SHA256 0795ed7fb1daed9fa97160ce1d117ce43ec063d48b06f1a6b56ab28a0497db08 size 1534
 MD5 2fc416814f4a3443b28fc548cf8d86dc apr-0.9.6-r3.ebuild 1534
 RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 apr-0.9.6-r3.ebuild 1534
 SHA256 0795ed7fb1daed9fa97160ce1d117ce43ec063d48b06f1a6b56ab28a0497db08 apr-0.9.6-r3.ebuild 1534
+EBUILD apr-0.9.6-r4.ebuild 1741 RMD160 d814da08bca64f1e8772c4cd6259910ca0a8a7dc SHA1 064bcfb11caa67215bcb3602d46a53663e6f8f02 SHA256 2f0fb1cb303381110e350d314c7a57f2f31b0a651e823be0d826b9c108dc4d90 size 1741
 MD5 e60102c3837e3d05e9d2cbf520bce415 apr-0.9.6-r4.ebuild 1741
 RMD160 d814da08bca64f1e8772c4cd6259910ca0a8a7dc apr-0.9.6-r4.ebuild 1741
 SHA256 2f0fb1cb303381110e350d314c7a57f2f31b0a651e823be0d826b9c108dc4d90 apr-0.9.6-r4.ebuild 1741
+EBUILD apr-0.9.7.ebuild 1737 RMD160 f45f8bc0092dc542991c0de967dbce1e20db28a1 SHA1 9de04e73b05c0eaf513c470c45ab95669c50b0cb SHA256 a7941151e8bd74de62ba7ba2876b3501889556c9434176a6019d13b1600c69ad size 1737
 MD5 994875c8daaca16f78b72d6ceb722054 apr-0.9.7.ebuild 1737
 RMD160 f45f8bc0092dc542991c0de967dbce1e20db28a1 apr-0.9.7.ebuild 1737
 SHA256 a7941151e8bd74de62ba7ba2876b3501889556c9434176a6019d13b1600c69ad apr-0.9.7.ebuild 1737
+EBUILD apr-1.2.2.ebuild 1153 RMD160 c79ec24d344374620276ed4375560d979101e64a SHA1 4f84459647d0178e7da15d064a6fc428ca100869 SHA256 67cc8e69d39cbda0ea7516776cab9215c3c90ca685f0c98c1faf5e65cb82cecf size 1153
 MD5 c31a13985fd8919d13a7bd06d3058d52 apr-1.2.2.ebuild 1153
 RMD160 c79ec24d344374620276ed4375560d979101e64a apr-1.2.2.ebuild 1153
 SHA256 67cc8e69d39cbda0ea7516776cab9215c3c90ca685f0c98c1faf5e65cb82cecf apr-1.2.2.ebuild 1153
-MD5 3d0a67722b796f1ce4b8f7d11da0452d apr-1.2.7.ebuild 1153
-RMD160 6977b8c6bc45268c7d1f2c6861506860970fe2db apr-1.2.7.ebuild 1153
-SHA256 4a6851df417cc97b0542b169b6babaee25a80d3dc7d43a1fd410037dc360165d apr-1.2.7.ebuild 1153
+EBUILD apr-1.2.7.ebuild 1544 RMD160 f4421927662923afa334f3f67173e8d4f8d50839 SHA1 3665c4732d751c60fa090f995ce1744d2fc6b283 SHA256 902151989b17b639f75746ffbe6450b03380e80e25d0fe4c09741221fcda10ae size 1544
+MD5 62ab8798c4f5a4efe9fb4e352574db74 apr-1.2.7.ebuild 1544
+RMD160 f4421927662923afa334f3f67173e8d4f8d50839 apr-1.2.7.ebuild 1544
+SHA256 902151989b17b639f75746ffbe6450b03380e80e25d0fe4c09741221fcda10ae apr-1.2.7.ebuild 1544
+MISC ChangeLog 6878 RMD160 a7e2601a16bdcbbd86dd3bbb6e508b49bfe1736c SHA1 bc98d26360303431f6fb249c60cfe3bffd1b6f03 SHA256 16be0b9d63ea7f6dbe249140b19018bde58d6d42e484adf47f417db0f625e65e size 6878
+MD5 a716bd3c0acbb04eee5d12810abbc767 ChangeLog 6878
+RMD160 a7e2601a16bdcbbd86dd3bbb6e508b49bfe1736c ChangeLog 6878
+SHA256 16be0b9d63ea7f6dbe249140b19018bde58d6d42e484adf47f417db0f625e65e ChangeLog 6878
+MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 size 226
+MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
+RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
+SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
 MD5 b57608f31fa2af09b38d76820aa79ea1 files/digest-apr-0.9.12 235
 RMD160 3febf6c27a02388ccc7b2cf8b37f55b2006ffad6 files/digest-apr-0.9.12 235
 SHA256 9ec8cac33dfcf931b83ae7a71c104a6e0844bbb0a9af30e0fbabbe0934474be1 files/digest-apr-0.9.12 235
-MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r3 62
-RMD160 c93df8a84d86a2c31c744ca0c9c5293f5a207515 files/digest-apr-0.9.6-r3 62
-SHA256 f97cc8492692b5879bf12d8c6eeac60f002ad64be889ee0ebdce755e365fd5c2 files/digest-apr-0.9.6-r3 62
-MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r4 62
-RMD160 c93df8a84d86a2c31c744ca0c9c5293f5a207515 files/digest-apr-0.9.6-r4 62
-SHA256 f97cc8492692b5879bf12d8c6eeac60f002ad64be889ee0ebdce755e365fd5c2 files/digest-apr-0.9.6-r4 62
+MD5 0038a9d0d8c5743014f53dcea3c3fe38 files/digest-apr-0.9.6-r3 232
+RMD160 616234593060d05467480a9b7cbbe450764c4dd5 files/digest-apr-0.9.6-r3 232
+SHA256 22a76a39639fa64237d30bb2b9f8fada7608039e1f63289c21b5a449a3b239ae files/digest-apr-0.9.6-r3 232
+MD5 0038a9d0d8c5743014f53dcea3c3fe38 files/digest-apr-0.9.6-r4 232
+RMD160 616234593060d05467480a9b7cbbe450764c4dd5 files/digest-apr-0.9.6-r4 232
+SHA256 22a76a39639fa64237d30bb2b9f8fada7608039e1f63289c21b5a449a3b239ae files/digest-apr-0.9.6-r4 232
 MD5 51c36bd8aa68296e90099e1a3e868fd3 files/digest-apr-0.9.7 232
 RMD160 f7f9335e7b968ea15f87212684155982c0d9e9e0 files/digest-apr-0.9.7 232
 SHA256 d496f84ad2f9918fa3296c638bfd36b02d81e31a73e4b887901a2078de262c21 files/digest-apr-0.9.7 232
@@ -37,6 +53,3 @@ SHA256 0470c016cff11975573657a5dfbad7f8c3e902e6841d39de4f349dcb61b95e8d files/di
 MD5 09fe6662358980713dc8869e8e7dcf98 files/digest-apr-1.2.7 232
 RMD160 ca0ba31e6a8204bf8037d3fdfefa39eb25945b24 files/digest-apr-1.2.7 232
 SHA256 638280a01796e1bd4275c9b50efc5c583c332a8a38973fd259177e148bf4ac36 files/digest-apr-1.2.7 232
-MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
-RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
-SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
diff --git a/dev-libs/apr/apr-0.9.12.ebuild b/dev-libs/apr/apr-0.9.12.ebuild
index d999c7e1cea5..4add3f89c402 100644
--- a/dev-libs/apr/apr-0.9.12.ebuild
+++ b/dev-libs/apr/apr-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.12.ebuild,v 1.1 2006/04/16 22:03:00 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.12.ebuild,v 1.2 2006/05/18 01:22:33 vericgar Exp $
 
 inherit flag-o-matic libtool
 
@@ -32,6 +32,14 @@ src_compile() {
 		myconf="${myconf} --with-devrandom=/dev/random"
 	fi
 
+	# 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
+	# See bugs 24215 and 133573
+	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
+
 	econf ${myconf} || die
 	emake || die
 }
diff --git a/dev-libs/apr/apr-1.2.7.ebuild b/dev-libs/apr/apr-1.2.7.ebuild
index fcda9e91a9ea..be50bcb13612 100644
--- a/dev-libs/apr/apr-1.2.7.ebuild
+++ b/dev-libs/apr/apr-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7.ebuild,v 1.2 2006/04/19 00:55:06 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7.ebuild,v 1.3 2006/05/18 01:22:33 vericgar Exp $
 
 inherit libtool
 
@@ -31,6 +31,14 @@ src_compile() {
 		einfo "Using /dev/random as random device"
 		myconf="${myconf} --with-devrandom=/dev/random"
 	fi
+	
+	# 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
+	# See bugs 24215 and 133573
+	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
 
 	econf ${myconf} || die "Configure failed"
 	emake || die "Make failed"
diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r3 b/dev-libs/apr/files/digest-apr-0.9.6-r3
index 06838c2f0f27..809c77ef1b72 100644
--- a/dev-libs/apr/files/digest-apr-0.9.6-r3
+++ b/dev-libs/apr/files/digest-apr-0.9.6-r3
@@ -1 +1,3 @@
 MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231
+RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 apr-0.9.6.tar.gz 1025231
+SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5 apr-0.9.6.tar.gz 1025231
diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r4 b/dev-libs/apr/files/digest-apr-0.9.6-r4
index 06838c2f0f27..809c77ef1b72 100644
--- a/dev-libs/apr/files/digest-apr-0.9.6-r4
+++ b/dev-libs/apr/files/digest-apr-0.9.6-r4
@@ -1 +1,3 @@
 MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231
+RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 apr-0.9.6.tar.gz 1025231
+SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5 apr-0.9.6.tar.gz 1025231