diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 399a0572..15292199 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Aug 29 16:39:43 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 31.1.0esr (bnc#894370)
+ * MFSA 2014-67/CVE-2014-1553/CVE-2014-1562
+ Miscellaneous memory safety hazards
+ * MFSA 2014-68/CVE-2014-1563 (bmo#1018524)
+ Use-after-free during DOM interactions with SVG
+ * MFSA 2014-69/CVE-2014-1564 (bmo#1045977)
+ Uninitialized memory use during GIF rendering
+ * MFSA 2014-70/CVE-2014-1565 (bmo#1047831)
+ Out-of-bounds read in Web Audio audio timeline
+ * MFSA 2014-72/CVE-2014-1567 (bmo#1037641)
+ Use-after-free setting text directionality
+- changes to support compilation on 11.4
+ * explicit xz BuildRequires
+ * mozilla-nullptr-gcc45.patch
+ * remove unresolved makeinfo BuildRequires
+
+-------------------------------------------------------------------
+Wed Aug 20 13:50:58 CEST 2014 - behlert@suse.de
+
+- adapted _constraints, used more than 3900MB on s390x during
+ last build
+
-------------------------------------------------------------------
Sun Jul 20 18:11:44 UTC 2014 - wr@rosenauer.org
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 4788c3a8..fd5db24f 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -18,8 +18,8 @@
%define major 31
-%define mainver %major.0
-%define update_channel release
+%define mainver %major.1.0
+%define update_channel esr31
%if %suse_version > 1210
%if %suse_version > 1310
@@ -40,12 +40,15 @@ BuildRequires: libcurl-devel
BuildRequires: libgnomeui-devel
BuildRequires: libidl-devel
BuildRequires: libnotify-devel
+%if %suse_version > 1140
BuildRequires: makeinfo
+%endif
BuildRequires: python-devel
BuildRequires: startup-notification-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXt-devel
+BuildRequires: xz
BuildRequires: yasm
BuildRequires: zip
%if %suse_version > 1110
@@ -74,7 +77,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2014072000
+%define releasedate 2014082900
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@@ -117,6 +120,7 @@ Patch11: mozilla-icu-strncat.patch
Patch12: mozilla-arm-disable-edsp.patch
Patch13: mozilla-ppc.patch
Patch14: mozilla-libproxy-compat.patch
+Patch15: mozilla-nullptr-gcc45.patch
# Gecko/Toolkit AArch64 Porting
Patch30: mozilla-aarch64-bmo-810631.patch
@@ -259,6 +263,7 @@ cd $RPM_BUILD_DIR/mozilla
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
%patch30 -p1
# Firefox
diff --git a/_constraints b/_constraints
index ca61b241..1b9b5b6d 100644
--- a/_constraints
+++ b/_constraints
@@ -5,7 +5,7 @@
9
- 3800
+ 4500
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index 40acef16..a321c5e0 100644
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0711a6e8cb68050de808a96c9e0b5b5c1d39992749e88239a714df1285b1fc17
-size 28420
+oid sha256:328677ca3556b96d5ef845ebb60766e4c786b272baae7ef890a7bb86b0962fa7
+size 28428
diff --git a/create-tar.sh b/create-tar.sh
index 624b53d5..b5283fe9 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -1,9 +1,9 @@
#!/bin/bash
-CHANNEL="release"
+CHANNEL="esr31"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_31_0_RELEASE"
-VERSION="31.0"
+RELEASE_TAG="FIREFOX_31_1_0esr_RELEASE"
+VERSION="31.1.0"
# mozilla
if [ -d mozilla ]; then
@@ -47,7 +47,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do
;;
*)
echo "fetching $locale ..."
- hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale
+ hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale
[ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
;;
esac
diff --git a/firefox-31.0-source.tar.xz b/firefox-31.0-source.tar.xz
deleted file mode 100644
index db92cec7..00000000
--- a/firefox-31.0-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e62ec32aa7a1fe90af08062df4f4a4750a430a7f384c4abfd6b22149bdd12af0
-size 125311096
diff --git a/firefox-31.1.0-source.tar.xz b/firefox-31.1.0-source.tar.xz
new file mode 100644
index 00000000..7dae33e8
--- /dev/null
+++ b/firefox-31.1.0-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:625cef5c1d416a19050fe897afee340f1635cfd52c956b5016a2f5424f7cad5d
+size 125750996
diff --git a/l10n-31.0.tar.xz b/l10n-31.0.tar.xz
deleted file mode 100644
index 7230a54d..00000000
--- a/l10n-31.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:475dead32b497029f817389c06c6ceb374032aa34e125667ea20361feed76c8d
-size 40772080
diff --git a/l10n-31.1.0.tar.xz b/l10n-31.1.0.tar.xz
new file mode 100644
index 00000000..a3d8de54
--- /dev/null
+++ b/l10n-31.1.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b0cea785c6185347ca9770b7dac3fe371f1be39cacf1c1b959c77eb421951c9
+size 40812668
diff --git a/mozilla-nullptr-gcc45.patch b/mozilla-nullptr-gcc45.patch
new file mode 100644
index 00000000..63414418
--- /dev/null
+++ b/mozilla-nullptr-gcc45.patch
@@ -0,0 +1,55 @@
+# HG changeset patch
+# Parent c7f2d830f66744f9da21b93f80017d28b5fba9a0
+# User Wolfgang Rosenauer
+Bug 1044581 - compilation error: bit_reader.cc:12:3: error: 'nullptr' was not declared in this scope
+
+diff --git a/content/media/fmp4/demuxer/bit_reader.cc b/content/media/fmp4/demuxer/bit_reader.cc
+--- a/content/media/fmp4/demuxer/bit_reader.cc
++++ b/content/media/fmp4/demuxer/bit_reader.cc
+@@ -1,12 +1,13 @@
+ // Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include "nullptr.h"
+ #include "mp4_demuxer/bit_reader.h"
+ #include
+
+ namespace mp4_demuxer {
+
+ BitReader::BitReader(const uint8_t* data, off_t size)
+ : data_(data), bytes_left_(size), num_remaining_bits_in_curr_byte_(0) {
+ DCHECK(data_ != nullptr && bytes_left_ > 0);
+diff --git a/content/media/fmp4/moz.build b/content/media/fmp4/moz.build
+--- a/content/media/fmp4/moz.build
++++ b/content/media/fmp4/moz.build
+@@ -2,16 +2,17 @@
+ # vim: set filetype=python:
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ EXPORTS += [
+ 'MP4Decoder.h',
+ 'MP4Reader.h',
++ 'nullptr.h',
+ 'PlatformDecoderModule.h',
+ ]
+
+ EXPORTS.mp4_demuxer += [
+ 'demuxer/aac.h',
+ 'demuxer/audio_decoder_config.h',
+ 'demuxer/avc.h',
+ 'demuxer/basictypes.h',
+diff --git a/content/media/fmp4/nullptr.h b/content/media/fmp4/nullptr.h
+new file mode 100644
+--- /dev/null
++++ b/content/media/fmp4/nullptr.h
+@@ -0,0 +1,7 @@
++
++// GCC does not understand nullptr until 4.6
++#if defined(__GNUC__) && !defined(__clang__)
++#if __GNUC__ * 100 + __GNUC_MINOR__ < 406
++#define nullptr __null
++#endif
++#endif
diff --git a/source-stamp.txt b/source-stamp.txt
index 4fc7b29b..d2cb1cf5 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=32dddf30405a
-REPO=http://hg.mozilla.org/releases/mozilla-release
+REV=81747568d309
+REPO=http://hg.mozilla.org/releases/mozilla-esr31