Version bump wrt security #180436, thanks to Gergan Penkov <gpp666_999 at yahoo dot de> for the patchset

Package-Manager: portage-2.1.2.9

4 files changed, 180 insertions, 15 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index d6d4e9da947a..d5d0f668da45 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,12 @@
 # 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.26 2007/05/23 15:06:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.27 2007/06/01 12:33:14 armin76 Exp $
+
+*xulrunner-1.8.1.4 (01 Jun 2007)
+
+  01 Jun 2007; Raúl Porcel <armin76@gentoo.org> +xulrunner-1.8.1.4.ebuild:
+  Version bump wrt security #180436, thanks to Gergan Penkov <gpp666_999 at
+  yahoo dot de> for the patchset
 
   23 May 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   xulrunner-1.8.1.3.ebuild:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index f41e5362e384..4b23dd77bee9 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3
 MD5 1047668b701935bb42659431038d325a files/xulrunner.conf 113
 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 files/xulrunner.conf 113
@@ -9,6 +6,8 @@ DIST xulrunner-1.8.0.4-patches-1.1.tar.bz2 48808 RMD160 b9399adec6688d019a4b9065
 DIST xulrunner-1.8.0.4-source.tar.bz2 33846136 RMD160 7979de9b3bc85a6b44367283e343cddd12e70bdb SHA1 9484a4783b86c6dc1cb9b99331791be079b8697e SHA256 193825593ef37e29d82f8bcbff3119caf131390a0369709c1667b509f774ffa9
 DIST xulrunner-1.8.1.3-patches-0.2.tar.bz2 61608 RMD160 76cc30c3c1a5abcd5d315a68dde74ee8b81aea29 SHA1 acafd0b0e84839f4c5d12c16e46e6a1c6ba1e4d4 SHA256 aaaf5e39bf531ee58d8d01269a32e7abce2fc2b9a2705d24d8ad9fe3269540b0
 DIST xulrunner-1.8.1.3-source.tar.bz2 35258868 RMD160 f7d5bdbaeffa33d3789cc80adc107885bb80e029 SHA1 51b18537ff54c6fee7d6ecab783ce8f5703cbdc8 SHA256 bfff1ff35ef23edb40532ee7fde042671ee659ec6ed3a341d8925c7aa8954702
+DIST xulrunner-1.8.1.4-patches-0.1.tar.bz2 61728 RMD160 abeeef43afb3de3652382f514f918e85f92d2b83 SHA1 f75724df3dadba231f8b61112c4bd0ebaa2dd408 SHA256 8dd2389654b2640d5ddc3298fde8e1f74cde07b6fcd0aa6a3480f2c81e611145
+DIST xulrunner-1.8.1.4-source.tar.bz2 35471439 RMD160 a5bb693b706c12c73cc77532acdf7389f3197e2f SHA1 e823ea0de5f6cd149907a4b38690e2d96c532fc1 SHA256 099089124364b57481667c11f2b8807766b4b4ef3819033db47b5f654745f6bd
 EBUILD xulrunner-1.8.0.4.ebuild 4941 RMD160 627ceafdcb54bc0ca637af749f607fee14a70eee SHA1 d74cff40c144641723e08a9464db026f71974656 SHA256 387b068133fffd7c713278dbe98432de54ecf9b6a9221ff4525e483f253021c3
 MD5 9a6fe676f44c428b8b437ccaa00d0723 xulrunner-1.8.0.4.ebuild 4941
 RMD160 627ceafdcb54bc0ca637af749f607fee14a70eee xulrunner-1.8.0.4.ebuild 4941
@@ -17,10 +16,14 @@ EBUILD xulrunner-1.8.1.3.ebuild 4844 RMD160 db4dba3ad9176a838978b4103a424ef5b43c
 MD5 ea57d748ec631e6ccc704eb3f6a1a77c xulrunner-1.8.1.3.ebuild 4844
 RMD160 db4dba3ad9176a838978b4103a424ef5b43c3fc2 xulrunner-1.8.1.3.ebuild 4844
 SHA256 1aa0be71e33b4c2f12a2fab2282e1ca12bc3a65a6d8589246f9954f98d21ae0a xulrunner-1.8.1.3.ebuild 4844
-MISC ChangeLog 3683 RMD160 bd56fd5d952a62c1aebb144d1fb06a1105b62abe SHA1 e1174023cd6a46d34fd3e90cb461f613b6221e6c SHA256 2c2f6bb38079f54dabcde24bd0e6e43e2d429c7eb3c436c55d5d8c47be885199
-MD5 7c7fb25b69c259e397e57ad14bace052 ChangeLog 3683
-RMD160 bd56fd5d952a62c1aebb144d1fb06a1105b62abe ChangeLog 3683
-SHA256 2c2f6bb38079f54dabcde24bd0e6e43e2d429c7eb3c436c55d5d8c47be885199 ChangeLog 3683
+EBUILD xulrunner-1.8.1.4.ebuild 4845 RMD160 52eac9b4f04afd90ed18ec93c9790a2990059346 SHA1 aee2b3e3801ef7d5fd73af201b14a3849cd8ce0b SHA256 219d5e55bab2b46f3f3eaee8969d99b6f0ee21ff3ab67934e816c9ecd2900c27
+MD5 b416a006785e146baea109890ab01070 xulrunner-1.8.1.4.ebuild 4845
+RMD160 52eac9b4f04afd90ed18ec93c9790a2990059346 xulrunner-1.8.1.4.ebuild 4845
+SHA256 219d5e55bab2b46f3f3eaee8969d99b6f0ee21ff3ab67934e816c9ecd2900c27 xulrunner-1.8.1.4.ebuild 4845
+MISC ChangeLog 3902 RMD160 298feadf90ad72be25c69199cbe0bec909319e0c SHA1 2f17e7c33c19dab6cec1030f3f049c9bcce0c180 SHA256 0c535556353c90be2d0005f9ac217b4b618d2f21b934012fe5e3dd5103f61a32
+MD5 c0b8ca089aaba9342c0df9f2d624e20a ChangeLog 3902
+RMD160 298feadf90ad72be25c69199cbe0bec909319e0c ChangeLog 3902
+SHA256 0c535556353c90be2d0005f9ac217b4b618d2f21b934012fe5e3dd5103f61a32 ChangeLog 3902
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -31,10 +34,6 @@ SHA256 cdf6a3c41ea585fccd20c927a1492f4418e721b8194afe383f8814f006422865 files/di
 MD5 0a788956a4f79111c0a42331ed5652be files/digest-xulrunner-1.8.1.3 572
 RMD160 e03a402e50e926fa76f32e01182bd3a9f591bdd8 files/digest-xulrunner-1.8.1.3 572
 SHA256 834e450f977c7fa0b64aec5544228bbc6f0178a277d0369d603a4e0464c01d37 files/digest-xulrunner-1.8.1.3 572
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGVFiFKRy60XGEcJIRAnr0AJ9PjJncRm4L7yDQy2XzU2fzYtVAPgCbBbCV
-X9h5njsNaF3uBeFdiamvSOE=
-=0Dc2
------END PGP SIGNATURE-----
+MD5 077dc606b0720358d065c2dd1d3ce482 files/digest-xulrunner-1.8.1.4 572
+RMD160 f481e7e5426d4acb3a61749ba1396519c4c51683 files/digest-xulrunner-1.8.1.4 572
+SHA256 281187b87d3dfb4caf3b437869b741eb5a3d3a83e85702a836077cdcbddb6aaf files/digest-xulrunner-1.8.1.4 572
diff --git a/net-libs/xulrunner/files/digest-xulrunner-1.8.1.4 b/net-libs/xulrunner/files/digest-xulrunner-1.8.1.4
new file mode 100644
index 000000000000..6dd8859f8f1d
--- /dev/null
+++ b/net-libs/xulrunner/files/digest-xulrunner-1.8.1.4
@@ -0,0 +1,6 @@
+MD5 6e0eeada69004f30c7f6e6ad133ccb2f xulrunner-1.8.1.4-patches-0.1.tar.bz2 61728
+RMD160 abeeef43afb3de3652382f514f918e85f92d2b83 xulrunner-1.8.1.4-patches-0.1.tar.bz2 61728
+SHA256 8dd2389654b2640d5ddc3298fde8e1f74cde07b6fcd0aa6a3480f2c81e611145 xulrunner-1.8.1.4-patches-0.1.tar.bz2 61728
+MD5 f9422104ef62a02afb78becca010d9f1 xulrunner-1.8.1.4-source.tar.bz2 35471439
+RMD160 a5bb693b706c12c73cc77532acdf7389f3197e2f xulrunner-1.8.1.4-source.tar.bz2 35471439
+SHA256 099089124364b57481667c11f2b8807766b4b4ef3819033db47b5f654745f6bd xulrunner-1.8.1.4-source.tar.bz2 35471439
diff --git a/net-libs/xulrunner/xulrunner-1.8.1.4.ebuild b/net-libs/xulrunner/xulrunner-1.8.1.4.ebuild
new file mode 100644
index 000000000000..e8ee0cda7a26
--- /dev/null
+++ b/net-libs/xulrunner/xulrunner-1.8.1.4.ebuild
@@ -0,0 +1,154 @@
+# 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.4.ebuild,v 1.1 2007/06/01 12:33:14 armin76 Exp $
+
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils makeedit multilib autotools mozconfig-2 java-pkg-opt-2
+PATCH="${P}-patches-0.1"
+
+DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
+HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
+SRC_URI="http://www.archlinux.org/~jgc/mozilla/${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"
+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 -j1 || 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."
+}