# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1402524150 -7200
# Node ID d43937f702f4f4e0926eb4deea49d1c0e5a42dfc
# Parent  aa4b2ebc0785eac043b2fa458213b314d1cfff2e
24.6.0 release

diff -r aa4b2ebc0785 -r d43937f702f4 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Tue Apr 29 23:40:58 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu Jun 12 00:02:30 2014 +0200
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Sat Jun  7 06:45:33 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 24.6.0 (bnc#881874)
+  * MFSA 2014-48/CVE-2014-1533/CVE-2014-1534
+    (bmo#921622, bmo#967354, bmo#969517, bmo#969549, bmo#973874,
+     bmo#978652, bmo#978811, bmo#988719, bmo#990868, bmo#991981,
+     bmo#992274, bmo#994907, bmo#995679, bmo#995816, bmo#995817,
+     bmo#996536, bmo#996715, bmo#999651, bmo#1000598,
+     bmo#1000960, bmo#1002340, bmo#1005578, bmo#1007223,
+     bmo#1009952, bmo#1011007)
+    Miscellaneous memory safety hazards (rv:30.0 / rv:24.6)
+  * MFSA 2014-49/CVE-2014-1536/CVE-2014-1537/CVE-2014-1538
+    (bmo#989994, bmo#999274, bmo#1005584)
+    Use-after-free and out of bounds issues found using Address Sanitizer
+  * MFSA 2014-52/CVE-2014-1541 (bmo#1000185)
+    Use-after-free with SMIL Animation Controller
+  * MFSA 2014-55/CVE-2014-1545 (bmo#1018783)
+    Out of bounds write in NSPR
+- require NSPR 4.10.6 because of MFSA 2014-55/CVE-2014-1545
+
+-------------------------------------------------------------------
 Fri Apr 25 08:25:17 UTC 2014 - wr@rosenauer.org
 
 - update to Firefox 24.5.0 (bnc#875378)
diff -r aa4b2ebc0785 -r d43937f702f4 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Apr 29 23:40:58 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Jun 12 00:02:30 2014 +0200
@@ -18,7 +18,7 @@
 
 
 %define major 24
-%define mainver %major.5.0
+%define mainver %major.6.0
 %define update_channel esr24
 
 %if %suse_version > 1220
@@ -50,7 +50,7 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.10.2
+BuildRequires:  mozilla-nspr-devel >= 4.10.6
 BuildRequires:  mozilla-nss-devel >= 3.15.4
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1210
@@ -63,7 +63,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014042400
+%define         releasedate 2014061000
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
diff -r aa4b2ebc0785 -r d43937f702f4 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Tue Apr 29 23:40:58 2014 +0200
+++ b/MozillaFirefox/create-tar.sh	Thu Jun 12 00:02:30 2014 +0200
@@ -2,8 +2,8 @@
 
 CHANNEL="esr24"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_24_5_0esr_RELEASE"
-VERSION="24.5.0"
+RELEASE_TAG="FIREFOX_24_6_0esr_RELEASE"
+VERSION="24.6.0"
 
 # mozilla
 if [ -d mozilla ]; then
diff -r aa4b2ebc0785 -r d43937f702f4 MozillaFirefox/firefox-esr.changes
--- a/MozillaFirefox/firefox-esr.changes	Tue Apr 29 23:40:58 2014 +0200
+++ b/MozillaFirefox/firefox-esr.changes	Thu Jun 12 00:02:30 2014 +0200
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Sat Jun  7 06:45:33 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 24.6.0 (bnc#881874)
+  * MFSA 2014-48/CVE-2014-1533/CVE-2014-1534
+    (bmo#921622, bmo#967354, bmo#969517, bmo#969549, bmo#973874,
+     bmo#978652, bmo#978811, bmo#988719, bmo#990868, bmo#991981,
+     bmo#992274, bmo#994907, bmo#995679, bmo#995816, bmo#995817,
+     bmo#996536, bmo#996715, bmo#999651, bmo#1000598,
+     bmo#1000960, bmo#1002340, bmo#1005578, bmo#1007223,
+     bmo#1009952, bmo#1011007)
+    Miscellaneous memory safety hazards (rv:30.0 / rv:24.6)
+  * MFSA 2014-49/CVE-2014-1536/CVE-2014-1537/CVE-2014-1538
+    (bmo#989994, bmo#999274, bmo#1005584)
+    Use-after-free and out of bounds issues found using Address Sanitizer
+  * MFSA 2014-52/CVE-2014-1541 (bmo#1000185)
+    Use-after-free with SMIL Animation Controller
+  * MFSA 2014-55/CVE-2014-1545 (bmo#1018783)
+    Out of bounds write in NSPR
+- require NSPR 4.10.6 because of MFSA 2014-55/CVE-2014-1545
+
+-------------------------------------------------------------------
 Fri Apr 25 08:25:17 UTC 2014 - wr@rosenauer.org
 
 - update to Firefox 24.5.0 (bnc#875378)
diff -r aa4b2ebc0785 -r d43937f702f4 MozillaFirefox/firefox-esr.spec
--- a/MozillaFirefox/firefox-esr.spec	Tue Apr 29 23:40:58 2014 +0200
+++ b/MozillaFirefox/firefox-esr.spec	Thu Jun 12 00:02:30 2014 +0200
@@ -18,7 +18,7 @@
 
 
 %define major 24
-%define mainver %major.5.0
+%define mainver %major.6.0
 %define update_channel release
 
 %define gstreamer_ver 0.10
@@ -46,7 +46,7 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.10.2
+BuildRequires:  mozilla-nspr-devel >= 4.10.6
 BuildRequires:  mozilla-nss-devel >= 3.15.4
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1210
@@ -59,7 +59,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014042400
+%define         releasedate 2014061000
 Provides:       firefox-esr = %{mainver}
 Provides:       firefox-esr = %{version}-%{release}
 Provides:       web_browser