# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1399104884 -7200
# Node ID b2202fea7983a2d58003e55889ff62affbad03b0
# Parent  727fef76f8d7a63cc191c8c39e62fbb790013355
manual forward merge from 29 and 30 branches

diff -r 727fef76f8d7 -r b2202fea7983 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sun Apr 27 17:53:05 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat May 03 10:14:44 2014 +0200
@@ -1,16 +1,58 @@
 -------------------------------------------------------------------
-Sun Apr 27 15:51:18 UTC 2014 - wr@rosenauer.org
-
-- update to Aurora 30 (20140422)
-  * rebased patches
-  * removed obsolete patches
+Thu May  1 15:35:25 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 30.0b1
+- rebased patches
+- removed obsolete patches
+  * firefox-browser-css.patch
+  * mozilla-aarch64-bmo-962488.patch
+  * mozilla-aarch64-bmo-963023.patch
+  * mozilla-aarch64-bmo-963024.patch
+  * mozilla-aarch64-bmo-963027.patch
+  * mozilla-ppc64-xpcom.patch
+  * mozilla-ppc64le-javascript.patch
+  * mozilla-ppc64le-libffi.patch
+  * mozilla-ppc64le-mfbt.patch
+  * mozilla-ppc64le-webrtc.patch
+  * mozilla-ppc64le-xpcom.patch
 - requires NSPR 4.10.4
 - enabled GStreamer 1.0 usage for 13.2 and above
 
 -------------------------------------------------------------------
+Thu May  1 15:29:04 UTC 2014 - wr@rosenauer.org
+
+- general.useragent.locale gets overwritten with en-US while it
+  should be using the active langpack's setting
+
+-------------------------------------------------------------------
 Sat Apr 26 12:18:07 UTC 2014 - wr@rosenauer.org
 
 - update to Firefox 29.0 (bnc#875378)
+  * MFSA 2014-34/CVE-2014-1518/CVE-2014-1519
+    Miscellaneous memory safety hazards
+  * MFSA 2014-36/CVE-2014-1522 (bmo#995289)
+    Web Audio memory corruption issues
+  * MFSA 2014-37/CVE-2014-1523 (bmo#969226)
+    Out of bounds read while decoding JPG images
+  * MFSA 2014-38/CVE-2014-1524 (bmo#989183)
+    Buffer overflow when using non-XBL object as XBL
+  * MFSA 2014-39/CVE-2014-1525 (bmo#989210)
+    Use-after-free in the Text Track Manager for HTML video
+  * MFSA 2014-41/CVE-2014-1528 (bmo#963962)
+    Out-of-bounds write in Cairo
+  * MFSA 2014-42/CVE-2014-1529 (bmo#987003)
+    Privilege escalation through Web Notification API
+  * MFSA 2014-43/CVE-2014-1530 (bmo#895557)
+    Cross-site scripting (XSS) using history navigations
+  * MFSA 2014-44/CVE-2014-1531 (bmo#987140)
+    Use-after-free in imgLoader while resizing images
+  * MFSA 2014-45/CVE-2014-1492 (bmo#903885)
+    Incorrect IDNA domain name matching for wildcard certificates
+    (fixed by NSS 3.16)
+  * MFSA 2014-46/CVE-2014-1532 (bmo#966006)
+    Use-after-free in nsHostResolver
+  * MFSA 2014-47/CVE-2014-1526 (bmo#988106)
+    Debugger can bypass XrayWrappers with JavaScript
 - rebased patches
 - removed obsolete patches
   * firefox-browser-css.patch
diff -r 727fef76f8d7 -r b2202fea7983 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Apr 27 17:53:05 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat May 03 10:14:44 2014 +0200
@@ -17,7 +17,7 @@
 #
 
 
-%define major 29
+%define major 30
 %define mainver %major.98
 %define update_channel aurora
 
@@ -54,8 +54,8 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.10.4
-BuildRequires:  mozilla-nss-devel >= 3.16
+BuildRequires:  mozilla-nspr-devel >= 4.10.5
+BuildRequires:  mozilla-nss-devel >= 3.16.1
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  pkgconfig(libpulse)
 %if %suse_version > 1210
@@ -74,7 +74,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014042200
+%define         releasedate 2014050300
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -361,6 +361,10 @@
 source %{SOURCE5}
 export MOZ_SOURCE_STAMP=$REV
 export MOZ_SOURCE_REPO=$REPO
+# need to remove default en-US firefox-l10n.js before it gets
+# populated into browser's omni.ja; it only contains general.useragent.locale
+# which should be loaded from each language pack (set in firefox.js)
+rm dist/bin/browser/defaults/preferences/firefox-l10n.js
 make -C browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
 #DEBUG (break the build if searchplugins are missing / temporary)
 grep amazondotcom dist/firefox/browser/omni.ja
diff -r 727fef76f8d7 -r b2202fea7983 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Sun Apr 27 17:53:05 2014 +0200
+++ b/MozillaFirefox/create-tar.sh	Sat May 03 10:14:44 2014 +0200
@@ -3,7 +3,7 @@
 CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
 RELEASE_TAG="default"
-VERSION="29.98"
+VERSION="30.98"
 
 # mozilla
 if [ -d mozilla ]; then