diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 92c3e04..5c71efb 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon May 8 08:28:17 UTC 2017 - wr@rosenauer.org + +- update to Firefox 52.1.1 + MFSA 2017-14 + * CVE-2017-5031: Use after free in ANGLE (bmo#1328762) + (Windows only, Linux not affected) +- switch to Mozilla's geolocation service (boo#1026989) +- removed mozilla-preferences.patch obsoleted by overriding via + firefox.js +- fixed KDE integration to avoid crash caused by filepicker + (boo#1015998) + ------------------------------------------------------------------- Wed Apr 12 21:43:16 UTC 2017 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 3b94658..da0406f 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -19,9 +19,9 @@ # changed with every update %define major 52 -%define mainver %major.1.0 +%define mainver %major.1.1 %define update_channel esr52 -%define releasedate 20170413000000 +%define releasedate 20170504000000 # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -147,11 +147,11 @@ Source14: create-tar.sh Source15: firefox-appdata.xml Source16: MozillaFirefox.changes Source17: l10n_changesets.txt +Source18: mozilla-api-key # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-shared-nss-db.patch Patch3: mozilla-kde.patch -Patch4: mozilla-preferences.patch Patch5: mozilla-language.patch Patch6: mozilla-ntlm-full-path.patch Patch7: mozilla-openaes-decl.patch @@ -261,7 +261,6 @@ cd $RPM_BUILD_DIR/mozilla %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 @@ -361,6 +360,7 @@ ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar ac_add_options --enable-update-channel=%{update_channel} +ac_add_options --with-mozilla-api-keyfile=%{SOURCE18} %if %branding ac_add_options --enable-official-branding %endif diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index 38a9b7e..c75806e 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:5be68698db7c554bdfdbcd64bb49468f6a4239ac9cceddfb6e2df3047b4bad31 -size 28360 +oid sha256:e214ffffe1a35265eb8ea61ba630866a252b2402ecbec6e7137868b4edebafe2 +size 28356 diff --git a/create-tar.sh b/create-tar.sh index f57060d..3267f04 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -7,8 +7,8 @@ CHANNEL="esr52" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="3ea0e075203185d7f2d42f439455e97735bd1b20" -VERSION="52.1.0" +RELEASE_TAG="FIREFOX_52_1_1esr_RELEASE" +VERSION="52.1.1" # mozilla if [ -d mozilla ]; then diff --git a/firefox-52.1.0-source.tar.xz b/firefox-52.1.0-source.tar.xz deleted file mode 100644 index b002c2d..0000000 --- a/firefox-52.1.0-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79a8b253bc37c54f0e98c384cbcbc2123e17452d987d4b9824de2ec867357b17 -size 223223316 diff --git a/firefox-52.1.1-source.tar.xz b/firefox-52.1.1-source.tar.xz new file mode 100644 index 0000000..8a538cc --- /dev/null +++ b/firefox-52.1.1-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ccdee46cb8d78145281de57501dee34f4e5eb71f6e98746e3d4b1b6faf09920 +size 222469016 diff --git a/firefox.js b/firefox.js index 0df9f9e..857b153 100644 --- a/firefox.js +++ b/firefox.js @@ -1 +1,3 @@ +pref("intl.locale.matchOS", true); pref("browser.preferences.instantApply", true); +pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); diff --git a/l10n-52.1.0.tar.xz b/l10n-52.1.0.tar.xz deleted file mode 100644 index b6453f9..0000000 --- a/l10n-52.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44f49d7171d54d98cb65eeb21c4669cf832faa1f125ca4ada17ed8d1e799f9ad -size 45022468 diff --git a/l10n-52.1.1.tar.xz b/l10n-52.1.1.tar.xz new file mode 100644 index 0000000..a7b4e54 --- /dev/null +++ b/l10n-52.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a856562b32f7d214bd71f756e2e360c702faebc2b739ddbd2adc77063f893cc0 +size 45025968 diff --git a/mozilla-api-key b/mozilla-api-key new file mode 100644 index 0000000..0f586ff --- /dev/null +++ b/mozilla-api-key @@ -0,0 +1 @@ +4605624048be48fda932495844d16fbb diff --git a/mozilla-kde.patch b/mozilla-kde.patch index 06a423a..3dfdfbb 100644 --- a/mozilla-kde.patch +++ b/mozilla-kde.patch @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 5f1979729aa3c6bc50f7097202991e73be677e5e +# Parent aff14a54f25dc3146ba7a64408ceb9f486a832db Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -3347,7 +3347,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -371,16 +375,32 @@ nsFilePicker::Show(int16_t *aReturn) +@@ -371,16 +375,34 @@ nsFilePicker::Show(int16_t *aReturn) NS_IMETHODIMP nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) @@ -3361,6 +3361,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp + int16_t result; + mCallback = aCallback; + mRunning = true; ++ NS_ADDREF_THIS(); + kdeFileDialog(&result); + if (mCallback) { + mCallback->Done(result); @@ -3369,6 +3370,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp + mResult = result; + } + mRunning = false; ++ NS_RELEASE_THIS(); + return NS_OK; + } + @@ -3380,7 +3382,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp GtkFileChooserAction action = GetGtkFileChooserAction(mMode); -@@ -603,8 +623,235 @@ nsFilePicker::Done(GtkWidget* file_choos +@@ -603,8 +625,235 @@ nsFilePicker::Done(GtkWidget* file_choos if (mCallback) { mCallback->Done(result); mCallback = nullptr; diff --git a/mozilla-preferences.patch b/mozilla-preferences.patch deleted file mode 100644 index 9400723..0000000 --- a/mozilla-preferences.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Wolfgang Rosenauer -Subject: use system locale if available -This setting used to live in the branding-openSUSE package but this is causing too much -confusion and therefore is currently the only setting we switch in the unbranded -package unconditionally. - -# HG changeset patch -# Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c -# Parent 35b625807600ea4a5a3c49bd1cab22fac5188406 - -diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js ---- a/modules/libpref/init/all.js -+++ b/modules/libpref/init/all.js -@@ -1790,17 +1790,17 @@ pref("converter.html2txt.always_include_ - - pref("intl.accept_languages", "chrome://global/locale/intl.properties"); - pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); - pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties"); - pref("intl.charset.detector", "chrome://global/locale/intl.properties"); - pref("intl.charset.fallback.override", ""); - pref("intl.charset.fallback.tld", true); - pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); --pref("intl.locale.matchOS", false); -+pref("intl.locale.matchOS", true); - // fallback charset list for Unicode conversion (converting from Unicode) - // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) - // for ISO-8859-1 - pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252"); - pref("font.language.group", "chrome://global/locale/intl.properties"); - - // Android-specific pref to use key-events-only mode for IME-unaware webapps. - #ifdef MOZ_WIDGET_ANDROID diff --git a/source-stamp.txt b/source-stamp.txt index a3c18be..efdaa44 100644 --- a/source-stamp.txt +++ b/source-stamp.txt @@ -1,2 +1,2 @@ -REV=3ea0e0752031 +REV=120111e65bc4 REPO=http://hg.mozilla.org/releases/mozilla-esr52