security bump

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

3 files changed, 287 insertions, 7 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index c2572b0f3789..e02c975fb54f 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.436 2011/09/04 10:16:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.437 2011/09/09 08:25:23 polynomial-c Exp $
+
+*xulrunner-1.9.2.22 (08 Sep 2011)
+
+  08 Sep 2011; Lars Wendler <polynomial-c@gentoo.org>
+  +xulrunner-1.9.2.22.ebuild:
+  Security bump.
 
   04 Sep 2011; Markus Meier <maekke@gentoo.org> xulrunner-1.9.2.20.ebuild:
   arm stable, bug #379549
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 608ccb37996c..e9b0b167863a 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX arm-bug-644136.patch 472 RMD160 bda46fa7a4ca306ebfa3455d90c6e54a3f0d97e1 SHA1 f2eb5ab3ce793fc7d8c30d9f9db6be3a714f5c16 SHA256 3152f9c5b3f9cd75caf522e71d4105be8fbcc4def3e2f4162663799d78e03511
 AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc
@@ -14,6 +14,7 @@ DIST firefox-3.6.12.source.tar.bz2 51423668 RMD160 196e32a4cd9c6725e115aabcf320d
 DIST firefox-3.6.17.source.tar.bz2 51522989 RMD160 af7320c7447dea4b1722b937bb77b20943e9e68d SHA1 1ae71e8e2838d438de2f6f860fe77d067f3629ee SHA256 a07abc8faba26fb613d69c3cff810542dd2da11d8892f8b57602486f7e8d6457
 DIST firefox-3.6.20.source.tar.bz2 51564376 RMD160 b2314d50020815ab432ce91931266884410bedec SHA1 d25d892b3214f92f0799ecdaf6ea6414a8950eb2 SHA256 0e8e3110c8cd1f4ad913c3c7424952b1aeebf6b375e8f6b5ccfe3e0b6d8abb18
 DIST firefox-3.6.21.source.tar.bz2 51556131 RMD160 b883221eca22ddb4a9f2ce2c966d4bf406051c34 SHA1 3c1f001ad22d93b48e191999f548b4382db3d36c SHA256 1abaa7d44033601ffccdfef8f02e684d83d8a08c6c4ddb8ae862683da87b89b7
+DIST firefox-3.6.22.source.tar.bz2 51675082 RMD160 7b5cd6bb9264b97b0059bb254c383d9237982e4c SHA1 db7953b20568126a3ffe7c5a89ab0cecac4b0a53 SHA256 788e5a64f8bdb07183405c568fda70d8cb7759d3a8d75c404f3589fe8a039229
 DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a34454986361212382c838e SHA1 c89bc5106266aa0097a7be15be84555bd2649f03 SHA256 cf3a39877facc229a67760915341fe95095cca647faab3a7adcb70046105199c
 DIST xulrunner-1.9.2-patches-0.7.tar.bz2 16366 RMD160 2bfa5f56d58d5bb4508512190cf07454814fb0b5 SHA1 2c6e2cfb0c50a5595795561126de26941dbed576 SHA256 3e25e9b8d5fe9109f03889bca9240f92acd502fd68efe0e7eda304f5487b6bf0
 DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
@@ -22,13 +23,24 @@ EBUILD xulrunner-1.9.2.12.ebuild 8544 RMD160 b9237eaa83d73bfeae84245453dd5c120f3
 EBUILD xulrunner-1.9.2.17.ebuild 8534 RMD160 284f9838c86f79d886deda76c1f1b99064ccd59f SHA1 86264c2cefb9ed751b995d5454321b9afa44f8dd SHA256 ae38269d6a2f674b9fd5fc52210ab8c08b33c6f6c6760b609817553bce165f5c
 EBUILD xulrunner-1.9.2.20.ebuild 8530 RMD160 b24e2254dcc08fc2cd281add45a36961cd3401ed SHA1 e6e6846821866bd6a283755afe4213be63aa8030 SHA256 62ab81df950224bac8879481de52171ec75cbf0c7345587444c1cead04491f1f
 EBUILD xulrunner-1.9.2.21.ebuild 8542 RMD160 3e86e0d3f450f753e36f660137dd51ac3ec92b4f SHA1 0095836a63fe37c1b7b095c0c043ea03ddb92e10 SHA256 35252e5559347d8f465460a6e63d181aa949f20fc9f7df960b5d3b78a45789d7
+EBUILD xulrunner-1.9.2.22.ebuild 8542 RMD160 384f5d351e4085cd603f9b0edf0dff491e29c24f SHA1 ff75a8196a3ad6ab4dd99675eedc6ba0e92c69f1 SHA256 a901db84dc5be8ceaf9786b9afa418d26508cec12f49a45fbef6deb81983ff3c
 EBUILD xulrunner-2.0.1-r1.ebuild 6545 RMD160 3b53547acccb037d549fcefa24fc6bbccfc8e965 SHA1 ec98c46634c32920083914cb641e5b48d2d141a7 SHA256 315159f8a6128afbf748114f3d43523f8e57d4a7b0f62527fd5a7ddf83aab035
-MISC ChangeLog 60970 RMD160 2cc203f1a330da7a6edca357ce0e9391d7601420 SHA1 225725cff727a5fb8cb82fa8ff459778d16210ff SHA256 de9e5462f0d7a3bf396e451180652eedcb4d816b5d24f7ee5bbfd470a4f8c519
+MISC ChangeLog 61113 RMD160 c8b3bf5fe6a436065f4bb15200f1023908e7dca7 SHA1 0754b7027fb49e8f7a1eec55185e983a234feb0c SHA256 6689f66cc622e4b02d2c515d61e3e8bb4c7b5ba14b1497f545658d69ab8c92b0
 MISC metadata.xml 737 RMD160 ee298932f419af0c12657a8df62b797e1ae7720b SHA1 8b9e4d04ae106f928b374568a5d3e2ff0eddcc88 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5jUEUACgkQkKaRLQcq0GIFkQCfQXnNsfffRJe5G4r7gGxiIAw2
-kbYAmwbmBkD+NprE7OS2kAGOImSoL83B
-=Qmis
+iQIcBAEBCgAGBQJOac15AAoJEPiazRVxLXTFIssQAL8IN7yjhK9avrTMA8T4FYix
+KHxMvnq2f96mlLluHVEiWieOgl25GKz4I+XRF99Hc8Jayg35QW7qktC4OmlwL12a
+BEvlzMWXJFE3tRCDy2Rs4d2Kl04c1qKl4J2n29p6/hh8nndNLr5lDEdU3G3ZIph1
+iEshLjYuts1W79tfKS/c5oJYJt7d3rACXFPXpRI5FtpLCMRdNlReSV6H8aN9LUm7
+BTILpHNp9tEP4s4BbGyTNZ+mszGoGyikFMrMGAHPqdQ+L9P4Vi0AUD+l/Hw+gj3N
+bCK4K+Ksm8VlZGb+ht8GSus1DF37efR+TXbRKF6brVOxKFRjK5TBx4o3+r876RPN
+MNeS1VBIw4wrSNddxjt6HD+yTi7vLP/3ujMPZJYVlx1mn5ILdZOWqcQ/IvrySR3Z
+/SPP6tum7uBN8kCeaKATtkzDKqBVbsWylxF9ZcaccBt5DQkKQrbiThNLM9iDyA1w
+pIJdopeWA+f2sxVmKZwCN8lwV1JEjuBoWhTrUsHLjMOMxhJesx2RozD3zBedBovJ
+aKoiQeCIwI8Vhu4w6h/fdWje5ftuVXxhGtArdy1FS4JiN/q0DloZiANvNO6Nyd7N
+eSxWGdXja+fFyjQ+L1AzLOjAxiKWtgX0rMl2g5UTJyvBtERDupqovqe/12fQbupA
+nF8tC0HTxRMT61iljDEl
+=xgrU
 -----END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild
new file mode 100644
index 000000000000..f20dafb7dee2
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild,v 1.1 2011/09/09 08:25:23 polynomial-c Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils
+
+MY_PV="${PV/_rc/rc}" # Handle beta
+MY_PV="${MY_PV/1.9.2/3.6}"
+MAJ_PV="1.9.2" # from mozilla-* branch name
+PATCH="${PN}-1.9.2-patches-0.9"
+
+DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
+HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="1.9"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi"
+
+RDEPEND="
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.12.8
+	>=dev-libs/nspr-4.8.6
+	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] )
+	alsa? ( media-libs/alsa-lib )
+	>=app-text/hunspell-1.2
+	>=x11-libs/cairo-1.8.8[X]
+	x11-libs/libXt
+	x11-libs/pixman
+	>=dev-libs/libevent-1.4.7
+	gnome? ( >=gnome-base/gnome-vfs-2.16.3
+		>=gnome-base/libgnomeui-2.16.1
+		>=gnome-base/gconf-2.16.0
+		>=gnome-base/libgnome-2.16.0 )
+	wifi? ( net-wireless/wireless-tools )
+	libnotify? ( >=x11-libs/libnotify-0.4 )"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )
+	${RDEPEND}
+	=dev-lang/python-2*[threads]
+	dev-util/pkgconfig"
+
+# virtual/jre should not be in DEPEND. bug 325981
+RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
+
+S="${WORKDIR}/mozilla-${MAJ_PV}"
+
+pkg_setup() {
+	# Ensure we always build with C locale.
+	export LANG="C"
+	export LC_ALL="C"
+	export LC_MESSAGES="C"
+	export LC_CTYPE="C"
+
+	java-pkg-opt-2_pkg_setup
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Apply our patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	epatch "${FILESDIR}/bug-606109.patch"
+
+	eprefixify \
+		extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
+		xpcom/build/nsXPCOMPrivate.h \
+		xulrunner/installer/Makefile.in \
+		xulrunner/app/nsRegisterGREUnix.cpp
+
+	# fix double symbols due to double -ljemalloc
+	sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
+		xulrunner/stub/Makefile.in || die
+
+	#Fix compilation with curl-7.21.7 bug 376027
+	sed -e '/#include <curl\/types\.h>/d' \
+		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
+		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
+			|| die
+	sed -e '/curl\/types\.h/d' \
+		-i "${S}"/config/system-headers \
+		-i "${S}"/js/src/config/system-headers \
+			|| die
+
+	# Allow user to apply additional patches without modifing ebuild
+	epatch_user
+
+	# Same as in config/autoconf.mk.in
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
+
+	# Gentoo install dirs
+	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 || die "sed failed!"
+	fi
+
+	eautoreconf
+
+	cd js/src
+	eautoreconf
+}
+
+src_configure() {
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	MEXTENSIONS="default"
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	mozconfig_annotate '' --enable-crypto
+	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-application=xulrunner
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate 'broken' --disable-crashreporter
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate 'places' --enable-storage --enable-places
+	mozconfig_annotate '' --enable-safe-browsing
+
+	# Build mozdevelop permately
+	mozconfig_annotate ''  --enable-jsd --enable-xpctools
+
+	# System-wide install specs
+	mozconfig_annotate '' --disable-installer
+	mozconfig_annotate '' --disable-updater
+	mozconfig_annotate '' --disable-strip
+	mozconfig_annotate '' --disable-install-strip
+
+	# Use system libraries
+	mozconfig_annotate '' --enable-system-cairo
+	mozconfig_annotate '' --enable-system-hunspell
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --with-system-bz2
+	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+
+	mozconfig_use_enable gnome gnomevfs
+	mozconfig_use_enable gnome gnomeui
+	mozconfig_use_enable ipc # +ipc, upstream default
+	mozconfig_use_enable libnotify
+	mozconfig_use_enable java javaxpcom
+	mozconfig_use_enable wifi necko-wifi
+	mozconfig_use_enable alsa ogg
+	mozconfig_use_enable alsa wave
+	mozconfig_use_enable system-sqlite
+
+	# Debug
+	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
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-flags -fno-stack-protector
+	fi
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	# 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!"
+
+	# hack added to workaround bug 299905 on hosts with libc that doesn't
+	# support tls, (probably will only hit this condition with Gentoo Prefix)
+	tc-has-tls -l || export ac_cv_thread_keyword=no
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${ED}"/usr/bin/xulrunner
+
+	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
+	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
+
+	if has_multilib_profile; then
+		local config
+		for config in "${ED}"/etc/gre.d/*.system.conf ; do
+			mv "${config}" "${config%.conf}.${CHOST}.conf"
+		done
+	fi
+
+	dodir /usr/bin
+	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
+
+	# env.d file for ld search path
+	dodir /etc/env.d
+	echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
+
+	# Add our defaults to xulrunner and out of firefox
+	cp "${FILESDIR}"/xulrunner-default-prefs.js \
+		"${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
+			die "failed to cp xulrunner-default-prefs.js"
+
+	pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
+
+	if use java ; then
+		java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
+		java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
+		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
+		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
+	ewarn "If that does not fix the problem, rebuild dev-libs/nss"
+	ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
+
+	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 through and enable the basics."
+
+	einfo
+	ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
+	ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
+	ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
+}