From c6030257cf00880c6aaa048b091f5c6b8ef49a49df1fdd0b340493be43db39c0 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 24 Apr 2010 13:05:23 +0000 Subject: [PATCH] update to 3.6.4 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=150 --- MozillaFirefox.changes | 8 +++++++ MozillaFirefox.spec | 12 +++++----- firefox-3.6.3-source.tar.bz2 | 3 --- firefox-3.6.4-source.tar.bz2 | 3 +++ firefox-kde.patch | 6 ++--- firefox-ui-lockdown.patch | 20 ++++++++-------- l10n-3.6.3.tar.bz2 | 3 --- l10n-3.6.4.tar.bz2 | 3 +++ mozilla-crashreporter-x86_64.patch | 38 ++++++++++++++++++++++++++++++ 9 files changed, 71 insertions(+), 25 deletions(-) delete mode 100644 firefox-3.6.3-source.tar.bz2 create mode 100644 firefox-3.6.4-source.tar.bz2 delete mode 100644 l10n-3.6.3.tar.bz2 create mode 100644 l10n-3.6.4.tar.bz2 create mode 100644 mozilla-crashreporter-x86_64.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index d5c537fc..8fe1d246 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 --git a/MozillaFirefox.spec b/MozillaFirefox.spec index d203be50..7c95e56d 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.6.3) +# spec file for package MozillaFirefox (Version 3.6.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer @@ -22,7 +22,7 @@ Name: MozillaFirefox %define xulrunner mozilla-xulrunner192 BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip -BuildRequires: %{xulrunner}-devel = 1.9.2.3 +BuildRequires: %{xulrunner}-devel = 1.9.2.4 %if %suse_version > 1020 BuildRequires: fdupes %endif @@ -34,9 +34,9 @@ BuildRequires: wireless-tools License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser Provides: firefox -Version: 3.6.3 +Version: 3.6.4 Release: 1 -%define releasedate 2010040100 +%define releasedate 2010041700 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -63,6 +63,7 @@ Patch8: firefox-appname.patch Patch9: firefox-kde.patch Patch10: firefox-ui-lockdown.patch Patch11: firefox-crashreporter.patch +Patch12: mozilla-crashreporter-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -166,6 +167,7 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %endif %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build export MOZ_BUILD_DATE=%{releasedate} @@ -359,9 +361,7 @@ fi %{progdir}/%{progname} %{progdir}/application.ini %{progdir}/blocklist.xml -%ifarch %ix86 %{progdir}/crashreporter-override.ini -%endif %{_datadir}/applications/%{name}.desktop %{_datadir}/mime/packages/%{progname}.xml %{_datadir}/pixmaps/firefox* diff --git a/firefox-3.6.3-source.tar.bz2 b/firefox-3.6.3-source.tar.bz2 deleted file mode 100644 index b3808d63..00000000 --- a/firefox-3.6.3-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7211b6f12ea8a582f3a483cac0d97283436e5099b7c2a629a2d0093fa822b2c -size 48515639 diff --git a/firefox-3.6.4-source.tar.bz2 b/firefox-3.6.4-source.tar.bz2 new file mode 100644 index 00000000..5ec3dc5f --- /dev/null +++ b/firefox-3.6.4-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebca276020201c7e2ca4293496cb333ad5c4bfcb48927a9f19532f7929cfba1e +size 50963084 diff --git a/firefox-kde.patch b/firefox-kde.patch index 0b3cd301..93c36509 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -17,8 +17,8 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in # hardcode en-US for the moment AB_CD = en-US - DEFINES += -DAB_CD=$(AB_CD) - + DEFINES += \ + -DAB_CD=$(AB_CD) \ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 --- /dev/null @@ -1149,7 +1149,7 @@ new file mode 100644 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -395,16 +395,17 @@ +@@ -400,16 +400,17 @@ @BINPATH@/icons/*.png #endif diff --git a/firefox-ui-lockdown.patch b/firefox-ui-lockdown.patch index dd34cfd1..e12d515a 100644 --- a/firefox-ui-lockdown.patch +++ b/firefox-ui-lockdown.patch @@ -4,7 +4,7 @@ Subject: Firefox chrome lockdown hooks diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -1174,32 +1174,186 @@ function prepareForStartup() { +@@ -1180,32 +1180,186 @@ function prepareForStartup() { // setup our MozApplicationManifest listener gBrowser.addEventListener("MozApplicationManifest", OfflineApps, false); @@ -192,14 +192,14 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js PlacesStarButton.init(); // called when we go into full screen, even if it is -@@ -1399,16 +1553,18 @@ function BrowserShutdown() - Components.utils.reportError(ex); +@@ -1406,16 +1560,18 @@ function BrowserShutdown() } var os = Components.classes["@mozilla.org/observer-service;1"] .getService(Components.interfaces.nsIObserverService); os.removeObserver(gSessionHistoryObserver, "browser:purge-session-history"); os.removeObserver(gXPInstallObserver, "xpinstall-install-blocked"); + os.removeObserver(gMissingPluginInstaller, "plugin-crashed"); + gPrefService.removeObserver("config.lockdown.", lockdownObserver); + @@ -211,7 +211,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js PlacesStarButton.uninit(); -@@ -3208,16 +3364,23 @@ function FillHistoryMenu(aParent) { +@@ -3216,16 +3372,23 @@ function FillHistoryMenu(aParent) { // Remove old entries if any var children = aParent.childNodes; @@ -235,7 +235,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js return false; const MAX_HISTORY_MENU_ITEMS = 15; -@@ -3357,16 +3520,17 @@ function BrowserCustomizeToolbar() +@@ -3365,16 +3528,17 @@ function BrowserCustomizeToolbar() { // Disable the toolbar context menu items var menubar = document.getElementById("main-menubar"); @@ -253,7 +253,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js var customizeURL = "chrome://global/content/customizeToolbar.xul"; gCustomizeSheet = getBoolPref("toolbar.customization.usesheet", false); -@@ -3394,16 +3558,31 @@ function BrowserCustomizeToolbar() +@@ -3402,16 +3566,31 @@ function BrowserCustomizeToolbar() } else { return window.openDialog(customizeURL, "CustomizeToolbar", @@ -285,7 +285,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js // Update global UI elements that may have been added or removed if (aToolboxChanged) { -@@ -3411,16 +3590,27 @@ function BrowserToolboxCustomizeDone(aTo +@@ -3419,16 +3598,27 @@ function BrowserToolboxCustomizeDone(aTo if (gURLBar) gURLBar.emptyText = gURLBarEmptyText.value; @@ -313,7 +313,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js // support downgrading to Firefox 2.0 var navBar = document.getElementById("nav-bar"); -@@ -3445,18 +3635,17 @@ function BrowserToolboxCustomizeDone(aTo +@@ -3453,18 +3643,17 @@ function BrowserToolboxCustomizeDone(aTo XULBrowserWindow.asyncUpdateUI(); PlacesStarButton.updateState(); } @@ -333,7 +333,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js #endif // XXX Shouldn't have to do this, but I do -@@ -4544,16 +4733,19 @@ function onViewToolbarsPopupShowing(aEve +@@ -4552,16 +4741,19 @@ function onViewToolbarsPopupShowing(aEve var toolbarName = toolbar.getAttribute("toolbarname"); if (toolbarName) { let menuItem = document.createElement("menuitem"); @@ -353,7 +353,7 @@ diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js } toolbar = toolbar.nextSibling; } -@@ -6421,17 +6613,23 @@ BookmarkAllTabsHandler.prototype = { +@@ -6737,17 +6929,23 @@ BookmarkAllTabsHandler.prototype = { _updateCommandState: function BATH__updateCommandState(aTabClose) { var numTabs = gBrowser.tabContainer.childNodes.length; diff --git a/l10n-3.6.3.tar.bz2 b/l10n-3.6.3.tar.bz2 deleted file mode 100644 index de722bd5..00000000 --- a/l10n-3.6.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4de534dc1c5ad51a267042a409f0cf1be339b4b512a38e810fb9c84e229f23d6 -size 36338527 diff --git a/l10n-3.6.4.tar.bz2 b/l10n-3.6.4.tar.bz2 new file mode 100644 index 00000000..a654b9e0 --- /dev/null +++ b/l10n-3.6.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d7f313a0c4bdf630f3efd5791e05b5b6474a0d961fe8f0a8c151a9930ac4987 +size 36861440 diff --git a/mozilla-crashreporter-x86_64.patch b/mozilla-crashreporter-x86_64.patch new file mode 100644 index 00000000..16ec0470 --- /dev/null +++ b/mozilla-crashreporter-x86_64.patch @@ -0,0 +1,38 @@ +# HG changeset patch +# User Ted Mielczarek +# Date 1269522979 14400 +# Node ID a00284a2b2f0063b0f053938c1775cf207fe25bb +# Parent 33d05f60932bac3d66231a54840cbdd173297fff +bug 554021 - enable compiling Breakpad on Linux/x86-64 by default + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -5858,13 +5858,20 @@ + dnl = Breakpad crash reporting (on by default on supported platforms) + dnl ======================================================== + +-if (test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC" \ +- || test "$OS_ARCH" = "Darwin" \ +- || test "$OS_ARCH" = "Linux" -a "$CPU_ARCH" = "x86" \ +- || test "$OS_ARCH" = "SunOS") \ +- && test -z "$HAVE_64BIT_OS"; then +- MOZ_CRASHREPORTER=1 +-fi ++case $target in ++i?86-*-mingw*) ++ MOZ_CRASHREPORTER=1 ++ ;; ++i?86-apple-darwin*|powerpc-apple-darwin*) ++ MOZ_CRASHREPORTER=1 ++ ;; ++i?86-*-linux*|x86_64-*-linux*) ++ MOZ_CRASHREPORTER=1 ++ ;; ++*solaris*) ++ MOZ_CRASHREPORTER=1 ++ ;; ++esac + + MOZ_ARG_DISABLE_BOOL(crashreporter, + [ --disable-crashreporter Disable breakpad crash reporting],