Fix sandbox violations, bug 263585

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 38 insertions, 32 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 48b41b375baa..8ceaae747730 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.210 2009/07/02 06:39:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.211 2009/07/02 07:13:39 nirbheek Exp $
+
+  02 Jul 2009; <nirbheek@gentoo.org> epiphany-2.26.1.ebuild,
+  epiphany-2.26.2.ebuild, +files/epiphany-2.26-fix-sandbox-violations.patch:
+  Fix sandbox violations, bug 263585
 
   02 Jul 2009; <nirbheek@gentoo.org> epiphany-2.24.3-r10.ebuild:
   2.24* doesn't work with xulrunner-1.9.1, DEPEND on xulrunner-1.9.0*. bug
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 7dd86347cf3f..1bb644abfbbe 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,6 +1,7 @@
 AUX epiphany-2.22.3-CVE-2008-5985.patch 311 RMD160 68e777f2273f5c1035dba7bfc94edd808f630236 SHA1 41c14365c22d28b451a6a02cad2f5e7e375d54f0 SHA256 871bedabf3b5c4013a2b0b2e69c9dc3cd21e43dc9a2a05ece57262a6c359e2ab
 AUX epiphany-2.22.3-firefox2.0-header-fix.patch 555 RMD160 53beacda1bfd919d8afa0bf652d91a3068ef1c07 SHA1 ce0e4a52ba0a2aad1ac9bc785540d0d49f9d689f SHA256 8a72057ad4e0434fb3f7c45c7336c1280d97aca092ff196bfbb56519900aabcc
 AUX epiphany-2.22.3-notify-crash-fix.patch 1589 RMD160 ae0f063db6c314f8f188bc24e9e8de2b019e46d2 SHA1 cc2f719ab3b7ad28464e3e22dbed40c9e25fd845 SHA256 09aab29054c53cbd07fc5d2a8bec29c8e02c830e3fec8f4af7a079216cc13d8b
+AUX epiphany-2.26-fix-sandbox-violations.patch 552 RMD160 a7902ab192b698c2edc79a3ff3b6f2476ec68031 SHA1 1db80a7f829e41d605b50dce6caecb35984a9d57 SHA256 94d66760b1c493093febcc399a0418eb37708da1a3bf1d3bc7c851a527b061f1
 AUX epiphany-2.26.0-xulrunner191.patch 491 RMD160 ae36fd6f67b9afb3c03413bed685f10816ac24d2 SHA1 b5ba78085dcf35677361af9008f3f8998788ddd8 SHA256 3c8804a9004ed27f4f2ad99f4e434d6d4050711d000ce73ce2c0fc8bc0d197df
 AUX epiphany-2.26.1-automagic-libcanberra.patch 1838 RMD160 b98c6a734f240ea000e8938ac690426c904ec37f SHA1 9a782c3c8babf1ae8ac18c2602e0eb2d46b6eb82 SHA256 9cc20da812e7a95e535e905efaedf05720e2e8c1828d644934636ccb05f77fa3
 DIST epiphany-2.24.3.tar.bz2 5722991 RMD160 d27d511cf9f1cb6b5db94b1c821729c1dfc59b0b SHA1 945d7935273cf341f7c5445b31202ed257cfc9a6 SHA256 cc6ff7b30911bf80d8d72d6db7cc7ecbf51b2f5bb66796b79da33f8f680402ac
@@ -8,7 +9,7 @@ DIST epiphany-2.26.1.tar.bz2 5631650 RMD160 b25f3d3edab539ec1ce90181b4ef40e557a3
 DIST epiphany-2.26.2.tar.bz2 5655320 RMD160 8759787ff8b7fabfaf2b0362272c0d38e23a549c SHA1 446aa5475d478e447bae8e19c75ecbc802f9b144 SHA256 2cccfd27d454d5899c372969ba54e9231068c606ac5fb779a860081c519dec9c
 EBUILD epiphany-2.24.3-r10.ebuild 2410 RMD160 76f47e3085e03ea7519b8d9e08ae545c324cdddc SHA1 30e86b5b74e58934acdcbeb87c2d5240b37e0e63 SHA256 fa37df1cdf0b11219c7f3ec6f0101f1223c3dc2ad3492c7b9901327dee26e68b
 EBUILD epiphany-2.24.3.ebuild 2756 RMD160 cc01f406e1380d82e10a8df44348cb330d83eef3 SHA1 cb36053f0eb8b124fef19954f8836a490d2212d5 SHA256 f1acd30586027c353982c4298c1704459bcdb9729f133fafd0495ef1dc60b862
-EBUILD epiphany-2.26.1.ebuild 2668 RMD160 77e5800656022d87f470d9d88d86c927f0eb6486 SHA1 ddfff671b11902995fbb4c328f818220cd32bd73 SHA256 f9e1dd521b79ad983661caf0ca283db86f35be1cba96f4d6fb2527eb9afad685
-EBUILD epiphany-2.26.2.ebuild 2676 RMD160 e83466149f13be225aef5ec85dcdcf66aae0c894 SHA1 a36cb0ad7f2155ea9ae28da828946c6d78a70c9f SHA256 91bfa8dc31418e7f8a8b1afb955f1cc935dc2fd8ecf41d4d042e60cbadaf4a78
-MISC ChangeLog 42886 RMD160 3ba6c1e2d5913a4520a1c437ec778d3930786161 SHA1 258205492bdc2889282b7c64a2debc8624a5523f SHA256 3d252a5f529f40d690160deca2907db2ad14c2de538d140f06500ab038474a8d
+EBUILD epiphany-2.26.1.ebuild 2273 RMD160 6f8e3212ab967dba6e0d5e3c9fd09cc946f3ed76 SHA1 8c7aa8e458a590d801487fddb390e2f66a992e5f SHA256 895f5b8909b4856c09bbbbe4a92cc2dca5775e93d07af93ddd9635cdd0b27a1b
+EBUILD epiphany-2.26.2.ebuild 2281 RMD160 d00f04127553c706be094096078bd47150d4bb8b SHA1 bacc27fec5a14d3ef52b833a2f2274d114ced637 SHA256 752205d87308cbbff55328c763b3405658d606475562c388f6eca11f1e47e033
+MISC ChangeLog 43062 RMD160 7eeee41e8c132649768731c38cff25646e232efb SHA1 ce02d51db6349d0228d6c0f4eeab5e3e10b7d58c SHA256 d2e18943a73b947b8a002ec36a14c9a7cbc3e1187e29622175e0236b0fa02742
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/www-client/epiphany/epiphany-2.26.1.ebuild b/www-client/epiphany/epiphany-2.26.1.ebuild
index 22a1e73ec05e..ffc7eeaa27d3 100644
--- a/www-client/epiphany/epiphany-2.26.1.ebuild
+++ b/www-client/epiphany/epiphany-2.26.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.1.ebuild,v 1.1 2009/05/10 22:07:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.1.ebuild,v 1.2 2009/07/02 07:13:39 nirbheek Exp $
 
 EAPI="2"
 
@@ -68,22 +68,12 @@ src_prepare() {
 	# Fix libcanberra automagic support, bug #266232
 	epatch "${FILESDIR}/${P}-automagic-libcanberra.patch"
 
+	# Fix sandbox violations, bug 263585
+	epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch"
+
 	# Make it libtool-1 compatible
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
-
-src_configure() {
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
-
-	# Why are these write-opened per bug #228589 and bug #253043
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
-
-	gnome2_src_configure
-}
diff --git a/www-client/epiphany/epiphany-2.26.2.ebuild b/www-client/epiphany/epiphany-2.26.2.ebuild
index 05dc9a37d52a..92377aeea34a 100644
--- a/www-client/epiphany/epiphany-2.26.2.ebuild
+++ b/www-client/epiphany/epiphany-2.26.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.2.ebuild,v 1.1 2009/05/18 21:40:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.2.ebuild,v 1.2 2009/07/02 07:13:39 nirbheek Exp $
 
 EAPI="2"
 
@@ -68,22 +68,12 @@ src_prepare() {
 	# Fix libcanberra automagic support, bug #266232
 	epatch "${FILESDIR}/${PN}-2.26.1-automagic-libcanberra.patch"
 
+	# Fix sandbox violations, bug 263585
+	epatch "${FILESDIR}/${PN}-2.26-fix-sandbox-violations.patch"
+
 	# Make it libtool-1 compatible
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
-
-src_configure() {
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp
-
-	# Why are these write-opened per bug #228589 and bug #253043
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp
-
-	gnome2_src_configure
-}
diff --git a/www-client/epiphany/files/epiphany-2.26-fix-sandbox-violations.patch b/www-client/epiphany/files/epiphany-2.26-fix-sandbox-violations.patch
new file mode 100644
index 000000000000..5ca8cd07881c
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.26-fix-sandbox-violations.patch
@@ -0,0 +1,21 @@
+Running the test program as root inside a sandbox causes access violations
+
+See bug 263585
+
+Patch by Jory A. Pratt
+
+---
+--- configure.ac
++++ configure.ac
+@@ -315,11 +315,6 @@
+ # now tests for mozilla API variance
+ # **********************************
+ 
+-# First build a test program to see whether compiling and running XPCOM
+-# programs works at all, so we don't get false test failures below
+-
+-GECKO_XPCOM_PROGRAM_CHECK
+-
+ # Check for PSM header(s) to infer PSM presence
+ 
+ GECKO_CHECK_HEADERS([pipnss],[nsIX509Cert.h],[have_psm=yes],[have_psm=no])