# HG changeset patch # User Wolfgang Rosenauer # Date 1274442436 -7200 # Node ID 4708409c896c964c06f5ead9c69b0ab1eafd76d7 # Parent 7c4c13361550f9a196d84ce614f8aba3b6af8c9d# Parent 053863c0cba80e6289e5d0e77ebccb4cacf25c3d merge from 1.9.2 branch diff -r 7c4c13361550 -r 4708409c896c MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Sun Apr 11 13:02:13 2010 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Fri May 21 13:47:16 2010 +0200 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- -Fri Apr 9 16:53:57 CEST 2010 - wr@rosenauer.org - -- update to 3.6.4pre (Lorentz) +Sun Apr 18 09:42:40 CEST 2010 - wr@rosenauer.org + +- security update to 3.6.4 (Lorentz) + * enable crashreporter also for x86-64 + * Flash runs in a separate process to avoid crashing Firefox + (ix86 only; x86-64 still uses nspluginwrapper) ------------------------------------------------------------------- Thu Apr 1 11:15:38 UTC 2010 - wr@rosenauer.org diff -r 7c4c13361550 -r 4708409c896c MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sun Apr 11 13:02:13 2010 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Fri May 21 13:47:16 2010 +0200 @@ -36,7 +36,7 @@ Provides: firefox Version: 3.6.4 Release: 1 -%define releasedate 2010041000 +%define releasedate 2010050300 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers diff -r 7c4c13361550 -r 4708409c896c mozilla-libproxy.patch --- a/mozilla-libproxy.patch Sun Apr 11 13:02:13 2010 +0200 +++ b/mozilla-libproxy.patch Fri May 21 13:47:16 2010 +0200 @@ -6,7 +6,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -537,16 +537,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ +@@ -539,16 +539,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_LIBS = @FT2_LIBS@ MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ @@ -30,7 +30,7 @@ diff --git a/config/system-headers b/config/system-headers --- a/config/system-headers +++ b/config/system-headers -@@ -1012,8 +1012,11 @@ hunspell.hxx +@@ -1013,8 +1013,11 @@ hunspell.hxx #if MOZ_NATIVE_BZ2==1 bzlib.h #endif @@ -309,7 +309,7 @@ + c++; + } + -+printf("returned PAC proxy string: %s\n", PromiseFlatCString(aResult).get()); ++//printf("returned PAC proxy string: %s\n", PromiseFlatCString(aResult).get()); + + PR_Free(proxyArray); + return NS_OK; diff -r 7c4c13361550 -r 4708409c896c mozilla-xulrunner192/create-tar.sh --- a/mozilla-xulrunner192/create-tar.sh Sun Apr 11 13:02:13 2010 +0200 +++ b/mozilla-xulrunner192/create-tar.sh Fri May 21 13:47:16 2010 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -RELEASE_TAG="default" +RELEASE_TAG="FIREFOX_3_6_4_RELEASE" VERSION="1.9.2.4" # mozilla diff -r 7c4c13361550 -r 4708409c896c mozilla-xulrunner192/mozilla-xulrunner192.changes --- a/mozilla-xulrunner192/mozilla-xulrunner192.changes Sun Apr 11 13:02:13 2010 +0200 +++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes Fri May 21 13:47:16 2010 +0200 @@ -1,8 +1,21 @@ ------------------------------------------------------------------- -Fri Apr 9 14:38:20 CEST 2010 - wr@rosenauer.org +Tue May 4 08:03:37 CEST 2010 - wr@rosenauer.org + +- security update to 1.9.2.4 (Lorentz) + * enable crashreporter also for x86-64 + * provide mozilla-runtime to host NPAPI out of process plugins +- removed libproxy debug message (bnc#604711) -- update to 1.9.2.4pre (Lorentz) - * enable crashreporter also for x86-64 +------------------------------------------------------------------- +Mon Apr 26 07:18:09 CEST 2010 - wr@rosenauer.org + +- point alternatives link to the stable version to improve + robustness (bnc#589037) + +------------------------------------------------------------------- +Sat Apr 24 11:38:24 UTC 2010 - coolo@novell.com + +- buildrequire pkg-config to fix provides ------------------------------------------------------------------- Thu Apr 1 11:15:38 UTC 2010 - wr@rosenauer.org diff -r 7c4c13361550 -r 4708409c896c mozilla-xulrunner192/mozilla-xulrunner192.spec --- a/mozilla-xulrunner192/mozilla-xulrunner192.spec Sun Apr 11 13:02:13 2010 +0200 +++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec Fri May 21 13:47:16 2010 +0200 @@ -20,7 +20,7 @@ Name: mozilla-xulrunner192 -BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip pkg-config # needed for brp-check-bytecode-version (jar, fastjar would do as well) BuildRequires: unzip %if %suse_version > 1020 @@ -41,8 +41,8 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 1.9.2.4 Release: 1 -%define releasedate 2010041000 -%define version_internal 1.9.2.4pre +%define releasedate 2010050300 +%define version_internal 1.9.2.4 %define apiversion 1.9.2 %define uaweight 192040 Summary: Mozilla Runtime Environment 1.9.2 @@ -437,8 +437,8 @@ %post /usr/sbin/update-alternatives --install %{_bindir}/xulrunner \ - xulrunner %{_libdir}/xulrunner-%{version_internal}/xulrunner %{uaweight} || : -%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1 + xulrunner %{_libdir}/xulrunner-%{apiversion}/xulrunner %{uaweight} || : +%{_libdir}/xulrunner-%{apiversion}/add-plugins.sh > /dev/null 2>&1 exit 0 %posttrans @@ -455,7 +455,7 @@ if [ "$1" = "0" ]; then # deinstallation # that's not quite nice since old versions should be removed on update as well # but that's problematic for updates w/o raising the version number - /usr/sbin/update-alternatives --remove xulrunner %{_libdir}/xulrunner-%{version_internal}/xulrunner + /usr/sbin/update-alternatives --remove xulrunner %{_libdir}/xulrunner-%{apiversion}/xulrunner fi rm -f %{_libdir}/xulrunner-%{version_internal}/dictionaries/* exit 0 @@ -504,7 +504,7 @@ %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh %{_libdir}/xulrunner-%{version_internal}/dependentlibs.list %{_libdir}/xulrunner-%{version_internal}/mozilla-xremote-client -%{_libdir}/xulrunner-%{version_internal}/mozilla-runtime +%{_libdir}/xulrunner-%{version_internal}/plugin-container %{_libdir}/xulrunner-%{version_internal}/run-mozilla.sh %{_libdir}/xulrunner-%{version_internal}/xulrunner %{_libdir}/xulrunner-%{version_internal}/xulrunner-bin