diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 381ec30..d75d62d 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Thu Oct 24 18:16:19 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 25.0 (bnc#847708)
+ * rebased patches
+ * requires NSS 3.15.2 or above
+ * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592
+ Miscellaneous memory safety hazards
+ * MFSA 2013-94/CVE-2013-5593 (bmo#868327)
+ Spoofing addressbar through SELECT element
+ * MFSA 2013-95/CVE-2013-5604 (bmo#914017)
+ Access violation with XSLT and uninitialized data
+ * MFSA 2013-96/CVE-2013-5595 (bmo#916580)
+ Improperly initialized memory and overflows in some JavaScript
+ functions
+ * MFSA 2013-97/CVE-2013-5596 (bmo#910881)
+ Writing to cycle collected object during image decoding
+ * MFSA 2013-98/CVE-2013-5597 (bmo#918864)
+ Use-after-free when updating offline cache
+ * MFSA 2013-99/CVE-2013-5598 (bmo#920515)
+ Security bypass of PDF.js checks using iframes
+ * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601
+ (bmo#915210, bmo#915576, bmo#916685)
+ Miscellaneous use-after-free issues found through ASAN fuzzing
+ * MFSA 2013-101/CVE-2013-5602 (bmo#897678)
+ Memory corruption in workers
+ * MFSA 2013-102/CVE-2013-5603 (bmo#916404)
+ Use-after-free in HTML document templates
+
-------------------------------------------------------------------
Tue Sep 24 07:31:30 UTC 2013 - wr@rosenauer.org
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 54330e3..d672b85 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -17,7 +17,7 @@
#
-%define major 24
+%define major 25
%define mainver %major.0
%define update_channel release
@@ -50,8 +50,8 @@ BuildRequires: libproxy-devel
%else
BuildRequires: wireless-tools
%endif
-BuildRequires: mozilla-nspr-devel >= 4.10
-BuildRequires: mozilla-nss-devel >= 3.15.1
+BuildRequires: mozilla-nspr-devel >= 4.10.1
+BuildRequires: mozilla-nss-devel >= 3.15.2
BuildRequires: nss-shared-helper-devel
%if %suse_version > 1210
BuildRequires: pkgconfig(gstreamer-%gstreamer_ver)
@@ -63,7 +63,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2013091200
+%define releasedate 2013102400
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
diff --git a/_constraints b/_constraints
index c510e01..ca61b24 100644
--- a/_constraints
+++ b/_constraints
@@ -5,7 +5,7 @@
9
- 3500
+ 3800
diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2
index d488510..ad0a074 100644
--- a/compare-locales.tar.bz2
+++ b/compare-locales.tar.bz2
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4c8e6c204cd5aed68fc6a290f26f44980c5d9cece37eba8f5c0f8ce971f10068
-size 29932
+oid sha256:a2dc72bf30a7defc9046866286cce2ca2f5d255248d3625d6c6a23bfc91420ca
+size 29959
diff --git a/create-tar.sh b/create-tar.sh
index 9153a65..27ae551 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_24_0_RELEASE"
-VERSION="24.0"
+RELEASE_TAG="FIREFOX_25_0_RELEASE"
+VERSION="25.0"
# mozilla
if [ -d mozilla ]; then
diff --git a/firefox-24.0-source.tar.bz2 b/firefox-24.0-source.tar.bz2
deleted file mode 100644
index 6c4db1e..0000000
--- a/firefox-24.0-source.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a174f14e75774211548510c9e91f40b74c25ca3a013cd64e62138fef96688a15
-size 121150373
diff --git a/firefox-25.0-source.tar.bz2 b/firefox-25.0-source.tar.bz2
new file mode 100644
index 0000000..0cf9078
--- /dev/null
+++ b/firefox-25.0-source.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3debc8f5e6f92abb2d38644ad0b302c91d518827729e49340ef64053180d24b7
+size 128652118
diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch
index 2f28531..c264ec9 100644
--- a/firefox-browser-css.patch
+++ b/firefox-browser-css.patch
@@ -9,15 +9,15 @@ https://bugzilla.novell.com/show_bug.cgi?id=561027
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
-@@ -1026,16 +1026,30 @@ toolbar[iconsize="small"] #feed-button {
-
- #urlbar-display {
+@@ -980,16 +980,30 @@ toolbar[iconsize="small"] #webrtc-status
margin-top: 0;
margin-bottom: 0;
-moz-margin-start: 0;
color: GrayText;
}
+ %include ../shared/identity-block.inc.css
+
+#PopupAutoCompleteRichResult .autocomplete-richlistitem {
+ background-color: -moz-Field !important;
+}
@@ -32,11 +32,11 @@ diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
+ color: -moz-Fieldtext !important;
+}
+
- /* Favicon */
#page-proxy-favicon {
- width: 16px;
- height: 16px;
margin-top: 2px;
margin-bottom: 2px;
-moz-margin-start: 4px;
-moz-margin-end: 3px;
+ -moz-image-region: rect(0, 16px, 16px, 0);
+ }
+
diff --git a/firefox-kde.patch b/firefox-kde.patch
index d2485de..dbc9d2b 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1097 @@
+@@ -0,0 +1,1161 @@
+#filter substitution
+
+# -*- Mode: HTML -*-
@@ -292,6 +292,63 @@ new file mode 100644
+
+
+
++
++
+
+
+
@@ -974,7 +1031,6 @@ new file mode 100644
+ contentcontextmenu="contentAreaContextMenu"
+ autocompletepopup="PopupAutoComplete"/>
+
-+
+
+