Sync with overlay, disable jemalloc on hardened, adjust SSP filtering. Bug #278698.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 35 insertions, 42 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 4fd73e86e8df..17a8e5d6bc0b 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.228 2009/08/05 14:49:09 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.229 2009/08/09 16:01:17 gengor Exp $
+
+  09 Aug 2009; Gordon Malm <gengor@gentoo.org> xulrunner-1.9.1.2.ebuild:
+  Sync with overlay, disable jemalloc on hardened, adjust SSP filtering. Bug
+  #278698.
 
 *xulrunner-1.9.1.2 (05 Aug 2009)
 
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 137b7f0ba766..998c0170baca 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 000_flex-configure-LANG.patch 1761 RMD160 638ae47607f582d6d264f7b6f4c3626ff60dbcb6 SHA1 db6d868d034b46b63ad292ab2e1c9b889fbeef75 SHA256 88719f2b3ab2be74a4d27173f7464f6fbc8e7697b84e3c32d19cf6e16170e532
 AUX 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036fccac1a7bb0 SHA1 9a1a09ee9bdca8ab9aeec6408baf207da9abe88a SHA256 069f6b1a43662e417e7f0194ceb039941c209409f8fb788914f862595cdf52f4
 AUX xulrunner-1.8-gcc-4.4.patch 310 RMD160 9d8f402aa66752b7d61fc47b6f4a1526f1f8a4e5 SHA1 741a8679bb6d65d83dfdc1ea0cd277c08b3bcc7e SHA256 2bb5b927e11307daf14b4cdab381fba27c6fcb0ba8631e7952d38821282e2c6f
@@ -14,20 +11,11 @@ DIST xulrunner-1.9.0.10.tar.bz2 34167778 RMD160 96ca5c569bbee78924c6e9cb5fea6608
 DIST xulrunner-1.9.0.11.tar.bz2 34209785 RMD160 63ace56728ceac5d54b8613c842d69791a87be3d SHA1 9e64464303eef215c11793ac1c096abac58215f6 SHA256 142aa222bbf800867f6301f05ca8c158edc17bfb3ad11c73c38a57ca7da3c5a2
 DIST xulrunner-1.9.0.12-patches-0.1.tar.bz2 6548 RMD160 135cf202dd34c2dce5624d1585f17a71511d4f07 SHA1 8324eb60eb596973dcb5b708e3fc3260badc6a42 SHA256 c74569a54da3b95e1dac45041c9b31deb6ba6bd4b0b0c66bb87f7ab7e7d0574a
 DIST xulrunner-1.9.0.12.tar.bz2 34331369 RMD160 b3e37ef065c5ca1e5d565b90c6a71f4896610afe SHA1 50536925b1c58ffebaa79e1536979f3191cc1095 SHA256 797d705266444d6097e63b40f3ef32d2f1d43e11fb4fdff804402509a5a6931d
-DIST xulrunner-1.9.1.2-patches-0.1.tar.bz2 8572 RMD160 dbb98c16fca57e54c1c48912c01650ea1aa2fc27 SHA1 d0ea9fecc79d23feb0b39443fdffa1c5ad5ba4d1 SHA256 1f0525679cbf1469fa394a9991ea1fa3b35681f619d22cc140070c2f98cfd593
+DIST xulrunner-1.9.1.2-patches-0.2.tar.bz2 8123 RMD160 f4c0b52bdd32f26b9a924ad4b331e99c2bb13895 SHA1 535f7f21576de4f333b922e101381b19a5bcb8d0 SHA256 04e09609dad1057fac11aa8db551eaef9a7ee41dd536523b81d11d9f37a5db91
 EBUILD xulrunner-1.8.1.19.ebuild 5112 RMD160 ae56c846a18f9edd396aa18169619250a2c3d293 SHA1 af67a48b3c7690d996aef1caf0ce71a4bab1d4d6 SHA256 cbef00c1ae6f23becdad8b9754ed7d4a034a152e17e87334ac4f7dce483dc385
 EBUILD xulrunner-1.9.0.10.ebuild 4704 RMD160 4c9c1bd079a72df2da35ce654d42b4a8ef230a3f SHA1 59758a181a9b94fce9cf7b5f6fa11af77d56b2c1 SHA256 c88b9f9a01e10ecae1fb072c320771384f56f772e9c6cce8cf7e89b438aae7df
 EBUILD xulrunner-1.9.0.11-r1.ebuild 4829 RMD160 bab59a48bda5b5e98d4353309bf8d5c777374734 SHA1 9d3f2170975d30c9356a6f47d81c7e8a540ac7e3 SHA256 ebc9495cdeac42cca8d288ac8d8771732e36e5ef1e561e4860e271d2018fe750
 EBUILD xulrunner-1.9.0.12.ebuild 4824 RMD160 6e4d98d2c292a68127819340f2756167ea4411a7 SHA1 a43a4f7d8c2664c01f1edeca689bd3dfd2f9fa29 SHA256 260e1f5bb66b2cc796d89d983ec6be78f6beba626ab0384c5e3c9871f5ace69f
-EBUILD xulrunner-1.9.1.2.ebuild 7486 RMD160 15a88aa347fab0ae90df4920d85c676ee69fb306 SHA1 e4556941ad3cb8a1efcab0b53ecac1c83cc7aa59 SHA256 ab100791a60c705a5d6ae5c2972eaea8b0188779b11b68d590dfe286978b8cc9
-MISC ChangeLog 30383 RMD160 5d86cee7204b3d955876c41b323847b7384f27c8 SHA1 7b9508a5e2ae9ee918bac3d806e67bb0eb4761e6 SHA256 730c15a5b16447877c9f3122714663bf74423ddfc30b04c0ccab781050e225b4
+EBUILD xulrunner-1.9.1.2.ebuild 7409 RMD160 439aea280a40fadab9d0a88fdf732f36261f7883 SHA1 df6bf4865fa842cb3c7924f6ce0adc2bb049f03f SHA256 6450a1c67adfa7bd6a9c6d32682fab20b03fe3162b7771fb05fc19f481bcdb58
+MISC ChangeLog 30546 RMD160 96c10163c66c874186422a8bfeb456cd072ff04f SHA1 d8ed7fe1eed3f3f9bb9c64a125ac34513115a819 SHA256 362ace6632fbd91e3162781fa715e3e12edd23d84b20dd5d8cfe64a51556487f
 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iJwEAQECAAYFAkp5m+8ACgkQG7kqcTWJkGcv2gP/QI5kn90+TzLDw2cEzlmBY7Gp
-nmRq+jAmZaSEhjC0INg7R9mkK8J9UvbD4j6EpCUy51xVvGMnDXorq8DXB/jvhEcl
-lARB2KVdHq8vbghL9i65dlPtKKqdPkXG72kO7lX/fZL7cwM3Yxvu9VaW8EXlKzMW
-EcXZaK3Ef5LftyW9Ysw=
-=EpyV
------END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/xulrunner-1.9.1.2.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.2.ebuild
index 31be30a56af4..af1371a3aac3 100644
--- a/net-libs/xulrunner/xulrunner-1.9.1.2.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.1.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/net-libs/xulrunner/xulrunner-1.9.1.2.ebuild,v 1.1 2009/08/05 14:49:09 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.1.2.ebuild,v 1.2 2009/08/09 16:01:17 gengor Exp $
 
 EAPI="2"
 WANT_AUTOCONF="2.1"
@@ -11,7 +11,7 @@ MY_PV="${PV/_beta/b}" # Handle betas
 MY_PV="${PV/_/}" # Handle rc1, rc2 etc
 MY_PV="${MY_PV/1.9.1.2/3.5.2}"
 MAJ_PV="${PV/_*/}"
-PATCH="${PN}-${MAJ_PV}-patches-0.1"
+PATCH="${PN}-${MAJ_PV}-patches-0.2"
 
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
@@ -21,7 +21,7 @@ SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/s
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="debug python +alsa" # qt-experimental
+IUSE="+alsa debug hardened python" # qt-experimental
 
 #	qt-experimental? (
 #		x11-libs/qt-gui
@@ -52,7 +52,7 @@ S="${WORKDIR}/mozilla-1.9.1"
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
-pkg_setup(){
+pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 }
 
@@ -67,13 +67,13 @@ src_prepare() {
 	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
 
 	# Gentoo install dirs
-	sed -e "s/@PV@/${MAJ_PV}/" -i "${S}/config/autoconf.mk.in" \
-		|| die "\${MAJ_PV} sed failed!"
+	sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
+		|| die "${MAJ_PV} sed failed!"
 
 	# Enable gnomebreakpad
-	if use debug; then
-		sed -i -e 's/GNOME_DISABLE_CRASH_DIALOG=1/GNOME_DISABLE_CRASH_DIALOG=0/g' \
-			"${S}/build/unix/run-mozilla.sh"
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
 	fi
 
 	eautoreconf
@@ -97,11 +97,12 @@ src_configure() {
 	mozconfig_config
 
 	MEXTENSIONS="default"
-	if use python; then
+	if use python ; then
 		MEXTENSIONS="${MEXTENSIONS},python/xpcom"
 	fi
 
 	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 
@@ -133,7 +134,7 @@ src_configure() {
 	mozconfig_annotate '' --with-system-bz2
 
 	# IUSE qt-experimental
-#	if use qt-experimental; then
+#	if use qt-experimental ; then
 #		ewarn "You are enabling the EXPERIMENTAL qt toolkit"
 #		ewarn "Usage is at your own risk"
 #		ewarn "Known to be broken. DO NOT file bugs."
@@ -152,24 +153,29 @@ src_configure() {
 	mozconfig_use_enable alsa ogg
 	mozconfig_use_enable alsa wave
 
-	#disable java
+	# Disable java
 	if ! use java ; then
 		mozconfig_annotate '-java' --disable-javaxpcom
 	fi
 
 	# Debug
-	if use debug; then
+	if use debug ; then
 		mozconfig_annotate 'debug' --disable-optimize
 		mozconfig_annotate 'debug' --enable-debug=-ggdb
 		mozconfig_annotate 'debug' --enable-debug-modules=all
 		mozconfig_annotate 'debug' --enable-debugger-info-modules
 	fi
 
+	# Bug #278698
+	if use hardened ; then
+		mozconfig_annotate 'hardened' --disable-jemalloc
+	fi
+
 	# Finalize and report settings
 	mozconfig_final
 
 	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
+		append-flags -fno-stack-protector
 	fi
 
 	####################################
@@ -181,16 +187,11 @@ src_configure() {
 	# Disable no-print-directory
 	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
 
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
 
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	sed -i -e \
-		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-		"${S}"/config/autoconf.mk \
-		"${S}"/toolkit/content/buildconfig.html
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf
 }
 
 src_install() {
@@ -226,7 +227,7 @@ pkg_postinst() {
 
 	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
 
-	if use python; then
+	if use python ; then
 		python_need_rebuild
 		python_mod_optimize "${MOZLIBDIR}/python"
 	fi
@@ -238,14 +239,14 @@ pkg_postinst() {
 	einfo
 	einfo "All prefs can be overridden by the user. The preferences are to make"
 	einfo "use of xulrunner out of the box on an average system without the user"
-	einfo "having to go threw and enable the basics."
+	einfo "having to go through and enable the basics."
 }
 
 pkg_postrm() {
 
 	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
 
-	if use python; then
+	if use python ; then
 		python_mod_cleanup "${MOZLIBDIR}/python"
 	fi
 }