Fix sem_open related sandbox violations. Resolves bug 133573.

(Portage version: 2.1_rc1-r2)

5 files changed, 27 insertions, 3 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/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