--- a/MozillaFirefox/create-tar.sh Fri Oct 12 11:48:16 2012 +0200
+++ b/MozillaFirefox/create-tar.sh Fri Oct 26 23:25:51 2012 +0200
@@ -2,8 +2,8 @@
CHANNEL="esr10"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_10_0_9esr_RELEASE"
-VERSION="10.0.9"
+RELEASE_TAG="FIREFOX_10_0_10esr_RELEASE"
+VERSION="10.0.10"
# mozilla
hg clone -r $RELEASE_TAG http://hg.mozilla.org/$BRANCH mozilla
--- a/MozillaFirefox/firefox-esr.changes Fri Oct 12 11:48:16 2012 +0200
+++ b/MozillaFirefox/firefox-esr.changes Fri Oct 26 23:25:51 2012 +0200
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct 25 05:46:38 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 10.0.10esr (bnc#786522)
+ * MFSA 2012-90/CVE-2012-4194/CVE-2012-4195/CVE-2012-4196
+ (bmo#800666, bmo#793121, bmo#802557)
+ Fixes for Location object issues
+- added mozilla-sqlite-nfs.patch
+ (add hidden boolean pref storage.nfs_filesystem to true if your
+ home directoy resides on an NFS share to avoid corruption in
+ sqlite databases)
+
-------------------------------------------------------------------
Fri Oct 12 09:46:12 UTC 2012 - wr@rosenauer.org
--- a/MozillaFirefox/firefox-esr.spec Fri Oct 12 11:48:16 2012 +0200
+++ b/MozillaFirefox/firefox-esr.spec Fri Oct 26 23:25:51 2012 +0200
@@ -18,7 +18,7 @@
%define major 10
-%define mainver %major.0.9
+%define mainver %major.0.10
Name: firefox-esr
BuildRequires: Mesa-devel
@@ -48,7 +48,7 @@
BuildRequires: nss-shared-helper-devel
Version: %{mainver}
Release: 0
-%define releasedate 2012101100
+%define releasedate 2012102400
Provides: web_browser
Provides: firefox-esr = %{mainver}
# this is needed to match this package with the kde4 helper package without the main package
@@ -99,6 +99,7 @@
Patch15: mozilla-bmo703534.patch
Patch16: mozilla-yarr-pcre.patch
Patch17: mozilla-gcc47.patch
+Patch18: mozilla-sqlite-nfs.patch
# Firefox/browser
Patch31: firefox-browser-css.patch
Patch32: firefox-cross-desktop.patch
@@ -238,6 +239,7 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
#
%patch31 -p1
%patch32 -p1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-sqlite-nfs.patch Fri Oct 26 23:25:51 2012 +0200
@@ -0,0 +1,1 @@
+../mozilla-sqlite-nfs.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-sqlite-nfs.patch Fri Oct 26 23:25:51 2012 +0200
@@ -0,0 +1,79 @@
+# HG changeset patch
+# Parent 7854b317f3c3258c89887b3fbd5f88509445c8e5
+# User Martin Stransky <stransky@redhat.com>
+Bug 433129 - nfs hosted profiles/browsers result in broken search and history, r=asuth
+
+diff --git a/storage/src/TelemetryVFS.cpp b/storage/src/TelemetryVFS.cpp
+--- a/storage/src/TelemetryVFS.cpp
++++ b/storage/src/TelemetryVFS.cpp
+@@ -34,20 +34,31 @@
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+ #include <string.h>
+ #include "mozilla/Telemetry.h"
++#include "mozilla/Preferences.h"
+ #include "sqlite3.h"
+ #include "nsThreadUtils.h"
+ #include "mozilla/Util.h"
+
++/**
++ * This preference is a workaround to allow users/sysadmins to identify
++ * that the profile exists on an NFS share whose implementation
++ * is incompatible with SQLite's default locking implementation.
++ * Bug 433129 attempted to automatically identify such file-systems,
++ * but a reliable way was not found and it was determined that the fallback
++ * locking is slower than POSIX locking, so we do not want to do it by default.
++*/
++#define PREF_NFS_FILESYSTEM "storage.nfs_filesystem"
++
+ namespace {
+
+ using namespace mozilla;
+
+ struct Histograms {
+ const char *name;
+ const Telemetry::ID readB;
+ const Telemetry::ID writeB;
+@@ -463,23 +474,33 @@ xNextSystemCall(sqlite3_vfs *vfs, const
+ }
+
+ namespace mozilla {
+ namespace storage {
+
+ sqlite3_vfs* ConstructTelemetryVFS()
+ {
+ #if defined(XP_WIN)
+-#define EXPECTED_VFS "win32"
++#define EXPECTED_VFS "win32"
++#define EXPECTED_VFS_NFS "win32"
+ #else
+-#define EXPECTED_VFS "unix"
++#define EXPECTED_VFS "unix"
++#define EXPECTED_VFS_NFS "unix-excl"
+ #endif
+-
+- sqlite3_vfs *vfs = sqlite3_vfs_find(NULL);
+- const bool expected_vfs = vfs->zName && !strcmp(vfs->zName, EXPECTED_VFS);
++
++ bool expected_vfs;
++ sqlite3_vfs *vfs;
++ if (Preferences::GetBool(PREF_NFS_FILESYSTEM)) {
++ vfs = sqlite3_vfs_find(EXPECTED_VFS_NFS);
++ expected_vfs = (vfs != nsnull);
++ }
++ else {
++ vfs = sqlite3_vfs_find(NULL);
++ expected_vfs = vfs->zName && !strcmp(vfs->zName, EXPECTED_VFS);
++ }
+ if (!expected_vfs) {
+ return NULL;
+ }
+
+ sqlite3_vfs *tvfs = new ::sqlite3_vfs;
+ memset(tvfs, 0, sizeof(::sqlite3_vfs));
+ tvfs->iVersion = 3;
+ // If the SQLite VFS version is updated, this shim must be updated as well.
--- a/series Fri Oct 12 11:48:16 2012 +0200
+++ b/series Fri Oct 26 23:25:51 2012 +0200
@@ -21,6 +21,7 @@
mozilla-bmo703534.patch
mozilla-yarr-pcre.patch
mozilla-gcc47.patch
+mozilla-sqlite-nfs.patch
# Firefox patches
firefox-browser-css.patch
--- a/xulrunner/create-tar.sh Fri Oct 12 11:48:16 2012 +0200
+++ b/xulrunner/create-tar.sh Fri Oct 26 23:25:51 2012 +0200
@@ -2,8 +2,8 @@
CHANNEL="esr10"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_10_0_9esr_RELEASE"
-VERSION="10.0.9"
+RELEASE_TAG="FIREFOX_10_0_10esr_RELEASE"
+VERSION="10.0.10"
# mozilla
hg clone -r $RELEASE_TAG http://hg.mozilla.org/$BRANCH mozilla
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-sqlite-nfs.patch Fri Oct 26 23:25:51 2012 +0200
@@ -0,0 +1,1 @@
+../mozilla-sqlite-nfs.patch
\ No newline at end of file
--- a/xulrunner/xulrunner-esr.changes Fri Oct 12 11:48:16 2012 +0200
+++ b/xulrunner/xulrunner-esr.changes Fri Oct 26 23:25:51 2012 +0200
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct 25 08:03:09 UTC 2012 - wr@rosenauer.org
+
+- update to 10.0.10esr (bnc#786522)
+ * MFSA 2012-90/CVE-2012-4194/CVE-2012-4195/CVE-2012-4196
+ (bmo#800666, bmo#793121, bmo#802557)
+ Fixes for Location object issues
+- added mozilla-sqlite-nfs.patch
+ (add hidden boolean pref storage.nfs_filesystem to true if your
+ home directoy resides on an NFS share to avoid corruption in
+ sqlite databases)
+
-------------------------------------------------------------------
Fri Oct 12 09:47:36 UTC 2012 - wr@rosenauer.org
--- a/xulrunner/xulrunner-esr.spec Fri Oct 12 11:48:16 2012 +0200
+++ b/xulrunner/xulrunner-esr.spec Fri Oct 26 23:25:51 2012 +0200
@@ -44,12 +44,12 @@
%endif
BuildRequires: mozilla-nspr-devel >= 4.9.0
BuildRequires: mozilla-nss-devel >= 3.13.5
-Version: 10.0.9
+Version: 10.0.10
Release: 0
-%define releasedate 2012100700
-%define version_internal 10.0.9
+%define releasedate 2012102400
+%define version_internal 10.0.10
%define apiversion 10
-%define uaweight 1000009
+%define uaweight 1000010
Summary: Mozilla Runtime Environment ESR
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Group: Productivity/Other
@@ -75,6 +75,7 @@
Patch3: idldir.patch
Patch4: mozilla-nongnome-proxies.patch
Patch5: mozilla-prefer_plugin_pref.patch
+Patch6: mozilla-sqlite-nfs.patch
Patch9: mozilla-language.patch
Patch11: mozilla-ntlm-full-path.patch
Patch12: mozilla-dump_syms-static.patch
@@ -195,6 +196,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch9 -p1
%patch11 -p1
%patch12 -p1