Version bump wrt security #187205

Package-Manager: portage-2.1.2.11

4 files changed, 177 insertions, 5 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 04d91e62ef34..c8bc627d6e60 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.45 2007/07/30 02:05:57 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.46 2007/08/02 10:55:19 armin76 Exp $
+
+*xulrunner-1.8.1.6 (02 Aug 2007)
+
+  02 Aug 2007; Raúl Porcel <armin76@gentoo.org> +xulrunner-1.8.1.6.ebuild:
+  Version bump wrt security #187205
 
   29 Jul 2007; Tom Gall <tgall@gentoo.org> xulrunner-1.8.1.5.ebuild:
   stable on ppc64
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 1256e831778c..b1e27f0d561b 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -4,14 +4,19 @@ RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 files/xulrunner.conf 113
 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3 files/xulrunner.conf 113
 DIST xulrunner-1.8.1.4-patches-0.2.tar.bz2 61239 RMD160 8866fc8b1464613310bd1a34526237f5e58c315d SHA1 c8daddeea666d541af4c5c6b2ac46d132e8b0ef5 SHA256 8f6d24d607352c9c138d7dc984d2e8e670b054a0b87c50c281cb4fc3d3e7c86f
 DIST xulrunner-1.8.1.5-source.tar.bz2 35366483 RMD160 01bbc021aa532780f981c18656401b032ddae066 SHA1 f91c0b8a35720545cf8c2d0966ab10f7f5f03747 SHA256 e9a503de19eef9839e1773a38d731ff61b231ff1ed0fe219816fb9d4e0d3ac7f
+DIST xulrunner-1.8.1.6-source.tar.bz2 35368957 RMD160 4de43a5007fb9299996e1d3e8924caa94442752b SHA1 d7211f2e73f940985b55196b4c0fb89c9d2f8be6 SHA256 4f4c3b90cd87d97a8937379329b55e0c260a74ea55c8423966bde6cee2dd5a21
 EBUILD xulrunner-1.8.1.5.ebuild 4826 RMD160 c6816f1976b989c1ee99b2ff419e500dff4c8875 SHA1 51e9be48aa41fa7a5129425ae5caaaf7015bec8f SHA256 0494c2c13cb5e57b7c2f7232d3143b5a839e6986d8f227a2833a53b4773029df
 MD5 8963ed4ac54d3a2410b58baac74fa4d9 xulrunner-1.8.1.5.ebuild 4826
 RMD160 c6816f1976b989c1ee99b2ff419e500dff4c8875 xulrunner-1.8.1.5.ebuild 4826
 SHA256 0494c2c13cb5e57b7c2f7232d3143b5a839e6986d8f227a2833a53b4773029df xulrunner-1.8.1.5.ebuild 4826
-MISC ChangeLog 5982 RMD160 40b7105ee016cb084566e676e1e3477364160309 SHA1 1bd664d709282a6bdb9ab4dfe5e1c60177517fd2 SHA256 4d85114b02f64d922c730d6a9c2140c4eb5ca2e057bdd922375d5ede8d5f4e8f
-MD5 384a1a26156e97829ade10626e4a5d73 ChangeLog 5982
-RMD160 40b7105ee016cb084566e676e1e3477364160309 ChangeLog 5982
-SHA256 4d85114b02f64d922c730d6a9c2140c4eb5ca2e057bdd922375d5ede8d5f4e8f ChangeLog 5982
+EBUILD xulrunner-1.8.1.6.ebuild 4836 RMD160 3308c5a1f6843710ea2945eba23b326ffc671949 SHA1 1623e2a31b3de7ced5454d8253329864ef76c86e SHA256 6fd2b915601852c95988adc0a4a537cafe2c2d54fc43c77ed8a9685d357b801b
+MD5 a6a07148e7d9b3a918e18b9ae04a8904 xulrunner-1.8.1.6.ebuild 4836
+RMD160 3308c5a1f6843710ea2945eba23b326ffc671949 xulrunner-1.8.1.6.ebuild 4836
+SHA256 6fd2b915601852c95988adc0a4a537cafe2c2d54fc43c77ed8a9685d357b801b xulrunner-1.8.1.6.ebuild 4836
+MISC ChangeLog 6131 RMD160 2c96323e5ecd2c7f8bbbdc87b566efd705014a2f SHA1 0d25f37880707ccdd79c4d23304d72d3c55b7d44 SHA256 0ca9d51e6027932ff4eed905b06c267c07a0bc26b83df13182a799bb89aba97e
+MD5 971eb0668ddb6b45be9e7fb66c6b3b3b ChangeLog 6131
+RMD160 2c96323e5ecd2c7f8bbbdc87b566efd705014a2f ChangeLog 6131
+SHA256 0ca9d51e6027932ff4eed905b06c267c07a0bc26b83df13182a799bb89aba97e ChangeLog 6131
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -19,3 +24,6 @@ SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata
 MD5 2ddb192a04eae548e15e86c1f5d60ddd files/digest-xulrunner-1.8.1.5 572
 RMD160 4d8713464e53262ab49a4342c4a7db5379a07eb1 files/digest-xulrunner-1.8.1.5 572
 SHA256 35fee477aee05bdfba9a12df631c87cda79e12b70bfadd55c4a73e4a13887956 files/digest-xulrunner-1.8.1.5 572
+MD5 5d866985cfc3c15ce3ccab7047173d33 files/digest-xulrunner-1.8.1.6 572
+RMD160 e29b6a44d69da7c78a18c386c414241b8e83d100 files/digest-xulrunner-1.8.1.6 572
+SHA256 c346e365024c5ca5072d4075602e634fc79af9f309e42ea9f0b1e274af4bc04b files/digest-xulrunner-1.8.1.6 572
diff --git a/net-libs/xulrunner/files/digest-xulrunner-1.8.1.6 b/net-libs/xulrunner/files/digest-xulrunner-1.8.1.6
new file mode 100644
index 000000000000..3cf60edec5cb
--- /dev/null
+++ b/net-libs/xulrunner/files/digest-xulrunner-1.8.1.6
@@ -0,0 +1,6 @@
+MD5 413a2455ae80629fbe89a1f9f86c3f92 xulrunner-1.8.1.4-patches-0.2.tar.bz2 61239
+RMD160 8866fc8b1464613310bd1a34526237f5e58c315d xulrunner-1.8.1.4-patches-0.2.tar.bz2 61239
+SHA256 8f6d24d607352c9c138d7dc984d2e8e670b054a0b87c50c281cb4fc3d3e7c86f xulrunner-1.8.1.4-patches-0.2.tar.bz2 61239
+MD5 416a8d9467f7a039a586c17245be19e8 xulrunner-1.8.1.6-source.tar.bz2 35368957
+RMD160 4de43a5007fb9299996e1d3e8924caa94442752b xulrunner-1.8.1.6-source.tar.bz2 35368957
+SHA256 4f4c3b90cd87d97a8937379329b55e0c260a74ea55c8423966bde6cee2dd5a21 xulrunner-1.8.1.6-source.tar.bz2 35368957
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.6.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.6.ebuild
new file mode 100644
index 000000000000..d4dec44c00ae
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.8.1.6.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.8.1.6.ebuild,v 1.1 2007/08/02 10:55:19 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils makeedit multilib autotools mozconfig-2 java-pkg-opt-2
+PATCH="${PN}-1.8.1.4-patches-0.2"
+
+DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
+HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
+SRC_URI="mirror://gentoo/${P}-source.tar.bz2
+	mirror://gentoo/${PATCH}.tar.bz2"
+
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-devel/binutils-2.16.1
+	>=dev-libs/nss-3.11.5
+	>=dev-libs/nspr-4.6.5-r1
+	java? ( >=virtual/jre-1.4 )"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )
+	${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/mozilla"
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export MOZ_CO_PROJECT=xulrunner
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+src_unpack() {
+	unpack ${P}-source.tar.bz2  ${PATCH}.tar.bz2
+
+	# Apply our patches
+	cd "${S}" || die "cd failed"
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/patch
+
+	eautoreconf || die "failed  running eautoreconf"
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	mozconfig_annotate '' --enable-extensions="default,cookie,permissions,spellcheck"
+	mozconfig_annotate '' --enable-native-uconv
+	mozconfig_annotate '' --enable-image-encoder=all
+	mozconfig_annotate '' --enable-canvas
+	#mozconfig_annotate '' --enable-js-binary
+	mozconfig_annotate '' --enable-embedding-tests
+	mozconfig_annotate '' --with-system-nspr
+	mozconfig_annotate '' --with-system-nss
+	mozconfig_annotate '' --with-system-bz2
+	mozconfig_annotate '' --enable-jsd
+	mozconfig_annotate '' --enable-xpctools
+	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
+	# regardless of java setting.
+	mozconfig_annotate '' --enable-oji --enable-mathml
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	#disable java
+	if ! use java ; then
+		mozconfig_annotate '-java' --disable-javaxpcom
+	fi
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# -fstack-protector breaks us
+	if gcc-version ge 4 1; then
+		gcc-specs-ssp && append-flags -fno-stack-protector
+	else
+		gcc-specs-ssp && append-flags -fno-stack-protector-all
+	fi
+	filter-flags -fstack-protector -fstack-protector-all
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	econf || die
+
+	# 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}/xpfe/global/buildconfig.html
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	emake DESTDIR="${D}" install || die "emake install failed"
+	X_DATE=`date +%Y%m%d`
+
+	# Add Gentoo package version to preferences - copied from debian rules
+	echo // Gentoo package version \
+		> ${D}/usr/$(get_libdir)/xulrunner/defaults/pref/vendor.js
+	echo "pref(\"general.useragent.product\",\"Gecko\");" \
+		>> ${D}/usr/$(get_libdir)/xulrunner/defaults/pref/vendor.js
+	echo "pref(\"general.useragent.productSub\",\"${X_DATE}\");" \
+		>> ${D}/usr/$(get_libdir)/xulrunner/defaults/pref/vendor.js
+	echo "pref(\"general.useragent.productComment\",\"Gentoo\");" \
+		>> ${D}/usr/$(get_libdir)/xulrunner/defaults/pref/vendor.js
+
+	if use java ; then
+	    java-pkg_dojar ${D}${MOZILLA_FIVE_HOME}/javaxpcom.jar
+	    rm -f ${D}${MOZILLA_FIVE_HOME}/javaxpcom.jar
+	fi
+
+	# xulrunner registration, the gentoo way
+	insinto /etc/gre.d
+	newins ${FILESDIR}/${PN}.conf ${PV}.conf
+	sed -i -e \
+		"s|version|${PV}|
+			s|instpath|${MOZILLA_FIVE_HOME}|" \
+		${D}/etc/gre.d/${PV}.conf
+}
+
+pkg_postinst() {
+	elog "Please remember to rebuild any packages that you have built"
+	elog "against xulrunner. Some packages might be broken by the upgrade; if this"
+	elog "is the case, please search at http://bugs.gentoo.org and open a new bug"
+	elog "if one does not exist."
+}