diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index db6c29c3..0a7dc07b 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Sun Mar 11 22:12:12 UTC 2018 - wr@rosenauer.org
+
+- update to Firefox 59.0
+ * Performance enhancements
+ * Drag-and-drop to rearrange Top Sites on the Firefox Home page
+ * added features for Firefox Screenshots
+ * Enhanced WebExtensions API
+ * Improved RTC capabilities
+ MFSA 2018-06 (bsc#1085130)
+ * CVE-2018-5127 (bmo#1430557)
+ Buffer overflow manipulating SVG animatedPathSegList
+ * CVE-2018-5128 (bmo#1431336)
+ Use-after-free manipulating editor selection ranges
+ * CVE-2018-5129 (bmo#1428947)
+ Out-of-bounds write with malformed IPC messages
+ * CVE-2018-5130 (bmo#1433005)
+ Mismatched RTP payload type can trigger memory corruption
+ * CVE-2018-5131 (bmo#1440775)
+ Fetch API improperly returns cached copies of no-store/no-cache resources
+ * CVE-2018-5132 (bmo#1408194)
+ WebExtension Find API can search privileged pages
+ * CVE-2018-5133 (bmo#1430511, bmo#1430974)
+ Value of the app.support.baseURL preference is not properly sanitized
+ * CVE-2018-5134 (bmo#1429379)
+ WebExtensions may use view-source: URLs to bypass content restrictions
+ * CVE-2018-5135 (bmo#1431371)
+ WebExtension browserAction can inject scripts into unintended contexts
+ * CVE-2018-5136 (bmo#1419166)
+ Same-origin policy violation with data: URL shared workers
+ * CVE-2018-5137 (bmo#1432870)
+ Script content can access legacy extension non-contentaccessible resources
+ * CVE-2018-5138 (bmo#1432624) (Android only)
+ Android Custom Tab address spoofing through long domain names
+ * CVE-2018-5140 (bmo#1424261)
+ Moz-icon images accessible to web content through moz-icon: protocol
+ * CVE-2018-5141 (bmo#1429093)
+ DOS attack through notifications Push API
+ * CVE-2018-5142 (bmo#1366357)
+ Media Capture and Streams API permissions display incorrect origin
+ with data: and blob: URLs
+ * CVE-2018-5143 (bmo#1422643)
+ Self-XSS pasting javascript: URL with embedded tab into addressbar
+ * CVE-2018-5126
+ Memory safety bugs fixed in Firefox 59
+ * CVE-2018-5125
+ Memory safety bugs fixed in Firefox 59 and Firefox ESR 52.7
+- requires NSPR 4.18 and NSS 3.35
+- requires rust >= 1.22.1
+- removed obsolete patches:
+ mozilla-alsa-sandbox.patch
+ mozilla-enable-csd.patch
+ firefox-no-default-ualocale.patch
+- removed l10n_changesets.txt since same information is now in
+ Firefox source tree (updated create-tar.sh now requires jq)
+
-------------------------------------------------------------------
Fri Feb 9 13:37:46 UTC 2018 - astieger@suse.com
@@ -25,7 +81,7 @@ Mon Jan 29 22:32:21 UTC 2018 - wr@rosenauer.org
- update to Firefox 58.0.1
MFSA 2018-05
- * Arbitrary code execution through unsanitized browser UI (bmo#1432966)
+ * Arbitrary code execution through unsanitized browser UI (bmo#1432966)
- use correct language packs
- readd mozilla-enable-csd.patch as it only lands for FF59 upstream
- allow larger number of nested elements (mozilla-bmo256180.patch)
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 3e9e2132..7af137d7 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -18,11 +18,11 @@
# changed with every update
-%define major 58
-%define mainver %major.0.2
+%define major 59
+%define mainver %major.0
%define update_channel release
%define branding 1
-%define releasedate 20180207000000
+%define releasedate 20180310025718
# PIE, full relro (x86_64 for now)
%define build_hardened 1
@@ -70,11 +70,11 @@ BuildRequires: libiw-devel
BuildRequires: libnotify-devel
BuildRequires: libproxy-devel
BuildRequires: makeinfo
-BuildRequires: mozilla-nspr-devel >= 4.17
-BuildRequires: mozilla-nss-devel >= 3.34.1
+BuildRequires: mozilla-nspr-devel >= 4.18
+BuildRequires: mozilla-nss-devel >= 3.35
BuildRequires: python-devel
BuildRequires: python2-xml
-BuildRequires: rust >= 1.21
+BuildRequires: rust >= 1.22.1
BuildRequires: rust-std
BuildRequires: startup-notification-devel
BuildRequires: unzip
@@ -136,7 +136,6 @@ Source13: spellcheck.js
Source14: create-tar.sh
Source15: firefox-appdata.xml
Source16: MozillaFirefox.changes
-Source17: l10n_changesets.txt
# Set up API keys, see http://www.chromium.org/developers/how-tos/api-keys
# Note: these are for the openSUSE Firefox builds ONLY. For your own distribution,
# please get your own set of keys.
@@ -150,13 +149,10 @@ Patch4: mozilla-openaes-decl.patch
Patch5: mozilla-no-stdcxx-check.patch
Patch6: mozilla-reduce-files-per-UnifiedBindings.patch
Patch7: mozilla-aarch64-startup-crash.patch
-Patch8: mozilla-enable-csd.patch
-Patch9: mozilla-bmo256180.patch
-Patch10: mozilla-alsa-sandbox.patch
+Patch8: mozilla-bmo256180.patch
# Firefox/browser
Patch101: firefox-kde.patch
-Patch102: firefox-no-default-ualocale.patch
-Patch103: firefox-branded-icons.patch
+Patch102: firefox-branded-icons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
@@ -264,12 +260,9 @@ cd $RPM_BUILD_DIR/mozilla
%endif
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
# Firefox
%patch101 -p1
%patch102 -p1
-%patch103 -p1
%build
# no need to add build time to binaries
@@ -404,7 +397,7 @@ install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/fi
%if %localize
rm -f %{_tmppath}/translations.*
touch %{_tmppath}/translations.{common,other}
-for locale in $(awk '{ print $1; }' %{SOURCE17}); do
+for locale in $(cat $RPM_BUILD_DIR/mozilla/browser/locales/shipped-locales) ; do
case $locale in
ja-JP-mac|en-US|'')
;;
@@ -475,10 +468,10 @@ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1
mkdir -p %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid}
mkdir -p %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid}
mkdir -p %{buildroot}/usr/share/pixmaps/
-ln -sf %{progdir}/browser/icons/mozicon128.png %{buildroot}/usr/share/pixmaps/%{progname}.png
-ln -sf %{progdir}/browser/icons/mozicon128.png %{buildroot}/usr/share/pixmaps/%{progname}-gnome.png
+ln -sf %{progdir}/browser/chrome/icons/default/default128.png %{buildroot}/usr/share/pixmaps/%{progname}.png
+ln -sf %{progdir}/browser/chrome/icons/default/default128.png %{buildroot}/usr/share/pixmaps/%{progname}-gnome.png
%if %branding
-for size in 16 22 24 32 48 256; do
+for size in 16 22 24 32 48 64 128 256; do
%else
for size in 16 32 48; do
%endif
@@ -566,7 +559,6 @@ exit 0
%dir %{progdir}/browser/extensions/
%{progdir}/browser/defaults
%{progdir}/browser/features/
-%{progdir}/browser/icons/
%{progdir}/browser/chrome/icons
%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
%{progdir}/browser/blocklist.xml
@@ -585,7 +577,7 @@ exit 0
%{progdir}/application.ini
%{progdir}/chrome.manifest
%{progdir}/dependentlibs.list
-%{progdir}/icudt59l.dat
+%{progdir}/icudt*.dat
%{progdir}/*.so
%{progdir}/omni.ja
%{progdir}/fonts/
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index 981431ea..a182f796 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:b2528402c5a3381c83db0116efe05064251b57a7597ef936d3d831b57b2870b3
-size 28816
+oid sha256:d862283072ef0cda760c0566d6aa8d3dc350ff6f273f4429b296fe9636127688
+size 28372
diff --git a/create-tar.sh b/create-tar.sh
index e43286ba..15720384 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -7,8 +7,13 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_58_0_2_RELEASE"
-VERSION="58.0.2"
+RELEASE_TAG="c61f5f5ead48c78a80c80db5c489bdc7cfaf8175"
+VERSION="59.0"
+
+# check required tools
+test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 )
+test -x /usr/bin/jq || ( echo "jq missing: execute zypper in jq"; exit 5 )
+
# mozilla
if [ -d mozilla ]; then
@@ -54,19 +59,19 @@ tar $compression -cf firefox-$VERSION-source.tar.xz --exclude=.hgtags --exclude=
# l10n
echo "fetching locales..."
test ! -d l10n && mkdir l10n
-for locale in $(awk '{ print $1; }' l10n_changesets.txt); do
- case $locale in
- ja-JP-mac|en-US)
- ;;
- *)
- echo "reading changeset information for $locale"
- _changeset=$(grep ^$locale l10n_changesets.txt | awk '{ print $2; }')
- echo "fetching $locale changeset $_changeset ..."
- hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale
- [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $_changeset
- ;;
- esac
-done
+jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' mozilla/browser/locales/l10n-changesets.json | \
+ while read locale changeset ; do
+ case $locale in
+ ja-JP-mac|en-US)
+ ;;
+ *)
+ echo "reading changeset information for $locale"
+ echo "fetching $locale changeset $changeset ..."
+ hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale
+ [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $changeset
+ ;;
+ esac
+ done
echo "creating l10n archive..."
tar $compression -cf l10n-$VERSION.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n
diff --git a/firefox-58.0.2-source.tar.xz b/firefox-58.0.2-source.tar.xz
deleted file mode 100644
index 761d56b8..00000000
--- a/firefox-58.0.2-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4dda38d4eea0b9be6ee116cb304e43d1fdfcf74a32dfcad56068c50255665eb2
-size 274076776
diff --git a/firefox-59.0-source.tar.xz b/firefox-59.0-source.tar.xz
new file mode 100644
index 00000000..cb4f3c97
--- /dev/null
+++ b/firefox-59.0-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b8050ac93c9fff4858e2e616a251c65dd34b63d409023bc09a0b613a7f09659
+size 262740492
diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch
index 8a47c13e..8c1ffa1a 100644
--- a/firefox-branded-icons.patch
+++ b/firefox-branded-icons.patch
@@ -1,39 +1,30 @@
# HG changeset patch
# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
-# Parent 75308bbaaf73d672c88cb283591d4aefc7db9804
+# Parent 38e46d7f98d3e392de95d83660ecd147b30dc9aa
diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
--- a/browser/branding/branding-common.mozbuild
+++ b/browser/branding/branding-common.mozbuild
-@@ -38,18 +38,24 @@ def FirefoxBranding():
- 'disk.icns',
- 'document.icns',
- 'dsstore',
- 'firefox.icns',
+@@ -17,12 +17,15 @@ def FirefoxBranding():
+ FINAL_TARGET_FILES.VisualElements += [
+ 'VisualElements_150.png',
+ 'VisualElements_70.png',
]
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
- BRANDING_FILES += [
- 'default16.png',
-+ 'default22.png',
-+ 'default24.png',
-+ 'default256.png',
- 'default32.png',
- 'default48.png',
- 'mozicon128.png',
- ]
- FINAL_TARGET_FILES.icons += ['mozicon128.png']
FINAL_TARGET_FILES.chrome.icons.default += [
+ 'default128.png',
'default16.png',
-+ 'default22.png',
-+ 'default24.png',
-+ 'default256.png',
++ 'default22.png',
++ 'default24.png',
++ 'default256.png',
'default32.png',
'default48.png',
+ 'default64.png',
]
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -618,18 +618,21 @@
+@@ -601,20 +601,23 @@
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@RESPATH@/chrome/toolkit@JAREXT@
@@ -46,6 +37,8 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
+@RESPATH@/browser/chrome/icons/default/default24.png
@RESPATH@/browser/chrome/icons/default/default32.png
@RESPATH@/browser/chrome/icons/default/default48.png
+ @RESPATH@/browser/chrome/icons/default/default64.png
+ @RESPATH@/browser/chrome/icons/default/default128.png
+@RESPATH@/browser/chrome/icons/default/default256.png
#endif
@RESPATH@/browser/features/*
diff --git a/firefox-kde.patch b/firefox-kde.patch
index ff51f53c..f81ad402 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent 89cbe8c49d05965b87815143d1944ab6964f12c7
+# Parent ffcd96e120857e207bd357b2005f0b5bc776e375
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1248 @@
+@@ -0,0 +1,1238 @@
+#filter substitution
+
+# -*- Mode: HTML -*-
@@ -286,26 +286,26 @@ new file mode 100644
+ key="viewBookmarksSidebarKb"
+ observes="viewBookmarksSidebar"
+ oncommand="SidebarUI.show('viewBookmarksSidebar');">
-+
-+
++
++
+
++
++
+
-+
-+
++
++
+
++
++
+
@@ -425,15 +425,15 @@ new file mode 100644
+ emailLink-title="&emailPageCmd.label;"
+ sendToDevice-title="&pageAction.sendTabToDevice.label;"
+ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
-+
++
+
+
+
-+
++
+
+
++ sendToDeviceFeedback="&sendToDeviceFeedback.label;"
++ sendToDeviceOfflineFeedback="&sendToDeviceOfflineFeedback.label;">
+
+
+
@@ -603,13 +604,10 @@ new file mode 100644
+
+#endif
+
-+
-+
-+
-+
++
+
+
+
-+
-+
+
+
+
+
+
-+
-+#