diff options
author | Jory Pratt <anarchy@gentoo.org> | 2009-10-29 00:29:10 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2009-10-29 00:29:10 +0000 |
commit | 776ea1c3d3784b370a99f7bda5d46d00a6790e33 (patch) | |
tree | fd33cd12a378e1a097642f8286fa5e921fb1692c /net-libs/xulrunner | |
parent | call java-pkg-2_src_prepare in src_prepare (diff) | |
download | historical-776ea1c3d3784b370a99f7bda5d46d00a6790e33.tar.gz historical-776ea1c3d3784b370a99f7bda5d46d00a6790e33.tar.bz2 historical-776ea1c3d3784b370a99f7bda5d46d00a6790e33.zip |
security updates
Package-Manager: portage-2.1.7.1/cvs/Linux x86_64
Diffstat (limited to 'net-libs/xulrunner')
-rw-r--r-- | net-libs/xulrunner/ChangeLog | 7 | ||||
-rw-r--r-- | net-libs/xulrunner/Manifest | 5 | ||||
-rw-r--r-- | net-libs/xulrunner/xulrunner-1.9.1.4.ebuild | 266 |
3 files changed, 276 insertions, 2 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog index 571b25f26c09..d8a2e923301e 100644 --- a/net-libs/xulrunner/ChangeLog +++ b/net-libs/xulrunner/ChangeLog @@ -1,6 +1,11 @@ # 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.258 2009/10/25 20:09:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.259 2009/10/29 00:29:10 anarchy Exp $ + +*xulrunner-1.9.1.4 (29 Oct 2009) + + 29 Oct 2009; Jory A. Pratt <anarchy@gentoo.org> +xulrunner-1.9.1.4.ebuild: + update for security bug fixes. 25 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> -xulrunner-1.9.1.2-r2.ebuild, xulrunner-1.9.1.3-r1.ebuild: diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest index 0e4c8baaba10..b300a619b31a 100644 --- a/net-libs/xulrunner/Manifest +++ b/net-libs/xulrunner/Manifest @@ -5,6 +5,7 @@ AUX xulrunner-1.8.1.19-glibc-2.10-support.patch 696 RMD160 171629110f94ecf974e7d AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8 AUX xulrunner.conf 113 RMD160 8be48cf5040eb5753c8eb35c048cc6b2c1a8a057 SHA1 62cce7ee5b1e51343c3dbc388894011da913d9d4 SHA256 9ac56b42cfb48854d23c299330ad327af5f0815140dcb7fdee905b660cd9a8a3 DIST firefox-3.5.3.source.tar.bz2 46766383 RMD160 c2487c90b4a9490840817c7b00dcccd68a0c4422 SHA1 83b2625eb74e81b473ac40ac52505e5fc9a497eb SHA256 e6327807ed1dd0c0685f7c2fba1427e7e38b5c92f36811f243861fbd9b7ad2d2 +DIST firefox-3.5.4.source.tar.bz2 46905557 RMD160 e89ff54fef6d036538c9779176f5086a8eaa721e SHA1 ce250208371326d03e72a02d223bc136cd376e5d SHA256 b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4 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 DIST xulrunner-1.9.0.10-patches-0.1.tar.bz2 7077 RMD160 73612f1b619fef5d02e8c8f8318afe192e435e42 SHA1 8a48e53951216c330d4908def93a5c0201f5a890 SHA256 bc0c0d26258bc17ffa5cd513089fe94395ff8f6c17023cd363fac30cdd675410 @@ -14,6 +15,7 @@ DIST xulrunner-1.9.0.12-patches-0.1.tar.bz2 6548 RMD160 135cf202dd34c2dce5624d15 DIST xulrunner-1.9.0.13.tar.bz2 34400077 RMD160 a58cf7845eb28d8db16996050b99c093582ac21a SHA1 0df1d8eff4c1b0fceddf6e17921cc27aaeb81ac2 SHA256 51e25eaaad90c9f6f945de49b5c0e21869076a4037a6ca796ef35ed6411b5c4c DIST xulrunner-1.9.0.14.tar.bz2 34461953 RMD160 63d9e54f1a1ca5f1457ce4e59ebc330ae6e93c9b SHA1 8493943e9e2af37b447b178f5485792e2bd87f5a SHA256 17ff6bf9d87431962773eaaeebeb7fb7c0d4eac4c920bf4d65738932c47a2f15 DIST xulrunner-1.9.1.2-patches-0.3.tar.bz2 8839 RMD160 aa1902800aedf3323e1836bb9befea41b2b0d90c SHA1 fc1689350cb3955ef6fceb942627003663464c64 SHA256 9c6bf20c29b0cddd06ba87943962a3870ea5a1beccf0d914bbd671404ea4105a +DIST xulrunner-1.9.1.4-patches-0.1.tar.bz2 8839 RMD160 5bb74a2ba19da3286b8945c01d1c6bbc648bf86a SHA1 a112fa5064362d63946b79168d6fbc1e71936ab8 SHA256 4dc2dde0ed6c1c91ecf38fea48af591ce0c177221751d0cb3a095aa061c12dfe EBUILD xulrunner-1.8.1.19.ebuild 5164 RMD160 35f73e1a6e27b86f3e94e3000a6d5e197f5eff9b SHA1 0874e166bb9f80c0032bb79c881f8d281be9931d SHA256 53ef65858659ae8843234751632f2a806b73aec3a34cc846e9a42f175e4a6a2b 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 @@ -21,5 +23,6 @@ EBUILD xulrunner-1.9.0.13.ebuild 4831 RMD160 018e5a2a043e516287f83a00e934d6a87f1 EBUILD xulrunner-1.9.0.14.ebuild 4825 RMD160 be352abdf1873f3a0f609000a5842f6f60d1fb42 SHA1 78311a474cd983b47c55ecd47371611ebd30a39a SHA256 2411d833e40ed9ebee13a6b4a8e95a4dfdc6cb7de1607b9dd522f1f03e6d4bf4 EBUILD xulrunner-1.9.1.3-r1.ebuild 8079 RMD160 ba7b7034f480ffaeedb80ab71019bfd85aaba303 SHA1 19265b3572d7ebdce893f8ebd6c26b6d91dcf731 SHA256 ab40d343d3f7e87b883607098fd27bbb9bdb134742c5fc6cadb7e2eab5c8f4fc EBUILD xulrunner-1.9.1.3.ebuild 7383 RMD160 d7809a938b402eb57e8763d2a19d6d0392339441 SHA1 98fb097fe48622cd0a1afa5ff5ab9d64c525214c SHA256 75d1f2c1e9512adfcf8e71fcf096056496b5376bd32cc6c8f57c540f5c58c27e -MISC ChangeLog 34539 RMD160 f1d0ac8dea0598b37f89088edcc14f0db225928d SHA1 91384bac4a7b5e3b9cf61c8b6bb43e2ba3cad28a SHA256 68ff67e1b930ff98d383821f1e8477142f899615f39e6849db43ebbcf8eb3a21 +EBUILD xulrunner-1.9.1.4.ebuild 8075 RMD160 7e59ba35873c6ff09aca994695df4111f0632c2b SHA1 73371e3f680a0db5d5d660219daf57a2223177b4 SHA256 3b45ee6da143d2608f998d7101583a880d7984544cf0125dd00fa671bde5a5ef +MISC ChangeLog 34682 RMD160 e0f149dab2168af5fa48dc15a0e530ebaaf7f4fe SHA1 b3f17861e1e819e2d91a33f39205e578e5817822 SHA256 e267fd87b2404802d2426fa72cc6c07c31a4ead0719e6420713dd930c6ef2524 MISC metadata.xml 263 RMD160 9ed9d79d17d0a991e88c31ae6342996519ffef5b SHA1 0de183203298ce0f1c2ecc3fc8149842c4a0ec60 SHA256 64bfc93c4ab02ef2fe9b61b8157eb722d6cca5d552eecc18eaaf8e95980d2550 diff --git a/net-libs/xulrunner/xulrunner-1.9.1.4.ebuild b/net-libs/xulrunner/xulrunner-1.9.1.4.ebuild new file mode 100644 index 000000000000..798f7b5ad9f9 --- /dev/null +++ b/net-libs/xulrunner/xulrunner-1.9.1.4.ebuild @@ -0,0 +1,266 @@ +# 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.4.ebuild,v 1.1 2009/10/29 00:29:10 anarchy Exp $ + +EAPI="2" +WANT_AUTOCONF="2.1" + +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 python autotools + +MY_PV="${PV/_beta/b}" # Handle betas +MY_PV="${PV/_/}" # Handle rc1, rc2 etc +MY_PV="${MY_PV/1.9.1.4/3.5.4}" +MAJ_PV="1.9.1" # from mozilla-* branch name +PATCH="${PN}-1.9.1.4-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://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 python sqlite" # qt-experimental + +# qt-experimental? ( +# x11-libs/qt-gui +# x11-libs/qt-core ) + +# nspr-4.8 due to BMO #499144 +RDEPEND="java? ( >=virtual/jre-1.4 ) + >=dev-lang/python-2.3[threads] + >=sys-devel/binutils-2.16.1 + >=dev-libs/nss-3.12.3 + >=dev-libs/nspr-4.8 + sqlite? ( >=dev-db/sqlite-3.6.10 ) + 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" + +DEPEND="java? ( >=virtual/jdk-1.4 ) + ${RDEPEND} + dev-util/pkgconfig" + +S="${WORKDIR}/mozilla-${MAJ_PV}" + +# Needed by src_compile() and src_install(). +# Would do in pkg_setup but that loses the export attribute, they +# become pure shell variables. +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 + +pkg_setup() { + java-pkg-opt-2_pkg_setup + + if use sqlite ; then + elog "You are enabling system sqlite. Do not file a bug with gentoo if you have" + elog "issues that arise from enabling system sqlite. All bugs will be considered" + elog "invalid. All patches are welcomed to fix any issues that might be found with" + elog "system sqlite. If you are starting with a fresh profile you can enable sqlite" + elog "without any major issues." + epause 10 + fi +} + +src_prepare() { + # Apply our patches + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}" + + # 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 + + # Patch in support to reset all LANG variables to C + # Do NOT add to patchset as it must be applied after eautoreconf + epatch "${FILESDIR}/000_flex-configure-LANG.patch" +} + +src_configure() { + #################################### + # + # mozconfig, CFLAGS and CXXFLAGS setup + # + #################################### + + mozconfig_init + mozconfig_config + + MEXTENSIONS="default" + 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" + + 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 + # 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 + + # 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 + + if use sqlite ; then + mozconfig_annotate 'sqlite' --enable-system-sqlite + else + mozconfig_annotate '-sqlite' --disable-system-sqlite + fi + + # IUSE qt-experimental +# 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." +# mozconfig_annotate '' --disable-system-cairo +# mozconfig_annotate 'qt-experimental' --enable-default-toolkit=cairo-qt +# else + mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2 +# fi + + # Other ff-specific settings + mozconfig_annotate '' --enable-jsd + mozconfig_annotate '' --enable-xpctools + mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}" + + # Disable/Enable audio support based on USE + mozconfig_use_enable alsa ogg + mozconfig_use_enable alsa wave + + # Disable java + if ! use java ; then + mozconfig_annotate '-java' --disable-javaxpcom + fi + + # 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 + + # Install python modules + dosym "${MOZLIBDIR}/python/xpcom" "/$(python_get_sitedir)/xpcom" || 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() { + + MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}" + + if use python ; then + python_need_rebuild + python_mod_optimize "${MOZLIBDIR}/python" + fi + + 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 "Please remember to rebuild your browser(s) after update to prevent an xpcom error." + ewarn "This bump is needed in order to bring iceat to the tree to replace iceweasel useflag." +} + +pkg_postrm() { + + MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}" + + if use python ; then + python_mod_cleanup "${MOZLIBDIR}/python" + fi +} |