From 1ae294355d1f00a4a6c46df1bdcd0d7a6a7ad519 Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Mon, 5 Apr 2010 05:07:05 +0000 Subject: [PATCH] Security Bump Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- net-libs/xulrunner/ChangeLog | 7 +- net-libs/xulrunner/Manifest | 4 +- net-libs/xulrunner/xulrunner-1.9.2.3.ebuild | 224 ++++++++++++++++++++ 3 files changed, 233 insertions(+), 2 deletions(-) create mode 100644 net-libs/xulrunner/xulrunner-1.9.2.3.ebuild diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog index a114084b442d..bb1280950437 100644 --- a/net-libs/xulrunner/ChangeLog +++ b/net-libs/xulrunner/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/xulrunner # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.303 2010/04/05 04:18:25 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.304 2010/04/05 05:07:05 anarchy Exp $ + +*xulrunner-1.9.2.3 (05 Apr 2010) + + 05 Apr 2010; +xulrunner-1.9.2.3.ebuild: + Security Bump *xulrunner-1.9.2.2-r2 (05 Apr 2010) diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest index b84d2b4a4053..99ec6b7d460a 100644 --- a/net-libs/xulrunner/Manifest +++ b/net-libs/xulrunner/Manifest @@ -12,6 +12,7 @@ AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cc DIST firefox-3.5.6.source.tar.bz2 46914620 RMD160 1002ff196eb8e281c06ef451154b64a903104664 SHA1 fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4 SHA256 60462020c1935702cf87928a886778b3b52e73b0121a8264630b72d370ea3fd1 DIST firefox-3.5.8.source.tar.bz2 46954234 RMD160 97a4394d895fc0d8e7be34c090ebe75540108a90 SHA1 4bfb9a274113fb9ee590c00da69d995dc500d4cc SHA256 9b9b9b0f6e783fd4184a2f08264a3470de4cbf1c41cf9cf887a8373d220bb4db DIST firefox-3.6.2.source.tar.bz2 48919538 RMD160 89243e2815351e132ad7d139808d3c89b5524762 SHA1 7befdbcc2bd658c136bdce1c1bd8b54201c1d1d1 SHA256 0f8398efabb14da83e14c7fbabdff99a619752cadb43348b27adf302382046f0 +DIST firefox-3.6.3.source.tar.bz2 48633061 RMD160 de556e8606bbc61cb7d20fe6f308f0c5e8b9dd77 SHA1 f3bcd808356d16bdb26bfcf1a64a251488c4fd02 SHA256 35a0b35d79baa502b6c5781ed3e9c4b5eb623bdaf1940460dcf465192848a2d0 DIST firefox-3.6.source.tar.bz2 48206915 RMD160 4b44951e4281e57e391c98b4b9e2774ded91d4a2 SHA1 33226b45a0bcd795545a980cab475c5492f0ea69 SHA256 8d4f12fff7bc361d83e6b486f9ec4264c60114ed86c805e1221b3d30efec0a4b DIST xulrunner-1.8.1.19-patches-0.1.tar.bz2 62219 RMD160 ecc59c5204090c6aa9c475bc181f745a6be84e98 SHA1 1b19bb5b4203a582d990175189b11f0215531327 SHA256 621a9e7abdfd667b05d0c8cee7b3cc284decd3ee50958ea849969f9ac3475f73 DIST xulrunner-1.8.1.19-source.tar.bz2 38110248 RMD160 2b742243c6370a2790f48d2ceae2be756b4737ce SHA1 fb1b85088000142e24609d5ab9e6e483a82f8917 SHA256 3c1873b3e6c660acdae9e102391bbc64274cea3ed6238d9d693ab09fcf2b53ee @@ -29,5 +30,6 @@ EBUILD xulrunner-1.9.1.8.ebuild 7951 RMD160 235df30f6c383961147c5114ab2bbc39e12a EBUILD xulrunner-1.9.2-r5.ebuild 6827 RMD160 fced58215af98c88adfc4713c21e53520cecec6a SHA1 3f3189b15c76854507060d9e83812dd323c66fae SHA256 ce7e92c9e89aa461d0a9e0d7984f725d60be91117d9b53a5b13d4c493651ec40 EBUILD xulrunner-1.9.2.2-r1.ebuild 6830 RMD160 9d1bbc1145577962e0be7354ed80e2b4c0ad71db SHA1 5e0b1ba092277700a84646d91223ebcadbf56a6b SHA256 bdd0dac97d1678a8bf01bd3e2bacc4e59c95fb516afcdf3c974a9f807e914fb0 EBUILD xulrunner-1.9.2.2-r2.ebuild 6915 RMD160 29aec61eee77f406ddc2009f6c2fad845244fc18 SHA1 8e46dac4371dfb1a5e3cf94ae729bdd4f4429bdb SHA256 9dc3f15a5d5c3aa58e24c451f962cbc7cd2974b00b374306e952db4b150a49e5 -MISC ChangeLog 41162 RMD160 2bafdeea452d6a0bb8f0d7f1f4596cbac5589846 SHA1 bce3a61f85493a7c50f7f0898f6b1071e4ad5c21 SHA256 eadd8c232a23d7acfc7b5516507570e8f581c143e17cfee959ff97bcfecc095b +EBUILD xulrunner-1.9.2.3.ebuild 6912 RMD160 dd421b8936012e837985194523cabe25369524fe SHA1 bc4b7782a8696810ea3440e5163eee16d6d87b91 SHA256 2a26eeb38c31324c1f716c580685e2dccab3bd6c95f4411e4de721f0e39ef133 +MISC ChangeLog 41276 RMD160 a58219740688726c1c39b624bc01506e39279a02 SHA1 9ae3e9ff5e52c11dd1036bffe6dc35662624c04a SHA256 cf5694c554b40c5f937e2f37949e1755a73e4e282aa99ceefbff1175e6d65355 MISC metadata.xml 394 RMD160 87c4429eed631c2727f7d3372f664d39db20be7f SHA1 30b52729cbc65b0d0f683c576d3e9f8865d9e893 SHA256 c0acfe25d1d0e91b0df61729e61ce47fb8f97ec02a4eb94ca21fd48fda20102e diff --git a/net-libs/xulrunner/xulrunner-1.9.2.3.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.3.ebuild new file mode 100644 index 000000000000..8b3bfe9e6401 --- /dev/null +++ b/net-libs/xulrunner/xulrunner-1.9.2.3.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2010 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.3.ebuild,v 1.1 2010/04/05 05:07:05 anarchy Exp $ + +EAPI="2" +WANT_AUTOCONF="2.1" + +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools + +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.4" + +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/dist/${PATCH}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +SLOT="1.9" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="+alsa debug libnotify system-sqlite wifi" + +RDEPEND="java? ( >=virtual/jre-1.4 ) + >=dev-lang/python-2.3[threads] + >=sys-devel/binutils-2.16.1 + >=dev-libs/nss-3.12.6 + >=dev-libs/nspr-4.8 + system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) + alsa? ( media-libs/alsa-lib ) + >=app-text/hunspell-1.2 + >=media-libs/lcms-1.17 + >=x11-libs/cairo-1.8.8[X] + x11-libs/pango[X] + x11-libs/libXt + wifi? ( net-wireless/wireless-tools ) + libnotify? ( >=x11-libs/libnotify-0.4 )" + +DEPEND="java? ( >=virtual/jdk-1.4 ) + ${RDEPEND} + dev-util/pkgconfig" + +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 +} + +src_prepare() { + # Apply our patches + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}" + + # Fix build error for xpctools + epatch "${FILESDIR}/301-xulrunner-xpctools.diff" + + # Fix broken mozilla-plugin.pc + epatch "${FILESDIR}/${PN}-1.9.2-fix-pkgconfig-file.patch" + + # Fix broken media support + epatch "${FILESDIR}/${PN}-1.9.2-noalsa-fixup.patch" + + # Fix broken alignment + epatch "${FILESDIR}/1000_fix_alignment.patch" + + # Ensure we find myspell dict. + epatch "${FILESDIR}/1001_fix-system-hunspell.patch" + + # 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 '' --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 + mozconfig_annotate '' --with-system-nss + mozconfig_annotate '' --enable-system-lcms + mozconfig_annotate '' --with-system-bz2 + + 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!" + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + rm "${D}"/usr/bin/xulrunner + + MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}" + SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk" + + 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=${MOZLIBDIR}" > "${D}"/etc/env.d/08xulrunner || die "env.d failed" + + # Add our defaults to xulrunner and out of firefox + cp "${FILESDIR}"/xulrunner-default-prefs.js \ + "${D}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \ + die "failed to cp xulrunner-default-prefs.js" + + if use java ; then + java-pkg_regjar "${D}/${MOZLIBDIR}/javaxpcom.jar" + java-pkg_regjar "${D}/${SDKDIR}/lib/MozillaGlue.jar" + java-pkg_regjar "${D}/${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 ." +} -- 2.26.2