diff --git a/0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch b/0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch deleted file mode 100644 index f38eba0..0000000 --- a/0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 38a3ee1f792f586aef412ebc04980a93825612c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Mon, 5 Feb 2018 09:46:44 -0500 -Subject: [PATCH] Bug 1435695 - WebRTC fails to build with GCC 8; r=dminor - ---HG-- -extra : rebase_source : d26e183b2082fa4f88ce3b837e2db5fc8acbff5b ---- - media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c | 5 +++-- - .../webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c b/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c -index 0340165eb505..d09314720ddd 100644 ---- a/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c -+++ b/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c -@@ -115,8 +115,9 @@ static int32_t WeightedAverage(int16_t* data, int16_t offset, - // undefined behavior, so not a good idea; this just makes UBSan ignore the - // violation, so that our old code can continue to do what it's always been - // doing.) --static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) -- RTC_NO_SANITIZE("signed-integer-overflow") { -+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") -+OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) -+{ - return a * b; - } - -diff --git a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c -index 2b92acb64a3d..c10014f6a108 100644 ---- a/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c -+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c -@@ -209,8 +209,9 @@ void WebRtcIsacfix_NormLatticeFilterMa(size_t orderCoef, - // Left shift of an int32_t that's allowed to overflow. (It's still undefined - // behavior, so not a good idea; this just makes UBSan ignore the violation, so - // that our old code can continue to do what it's always been doing.) --static inline int32_t OverflowingLShiftS32(int32_t x, int shift) -- RTC_NO_SANITIZE("shift") { -+static inline int32_t RTC_NO_SANITIZE("shift") -+OverflowingLShiftS32(int32_t x, int shift) -+{ - return x << shift; - } - --- -2.16.3 - diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 057dbd1..3997ed4 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,90 @@ +------------------------------------------------------------------- +Mon May 7 08:32:28 UTC 2018 - wr@rosenauer.org + +- update to Firefox 60.0 + * Added a policy engine that allows customized Firefox deployments + in enterprise environments, using Windows Group Policy or a + cross-platform JSON file + * Applied Quantum CSS to render browser UI + * Added support for Web Authentication, allowing the use of USB + tokens for authentication to web sites + * Locale added: Occitan (oc) + MFSA 2018-11 (bsc#1092548) + * CVE-2018-5154 (bmo#1443092) + Use-after-free with SVG animations and clip paths + * CVE-2018-5155 (bmo#1448774) + Use-after-free with SVG animations and text paths + * CVE-2018-5157 (bmo#1449898) + Same-origin bypass of PDF Viewer to view protected PDF files + * CVE-2018-5158 (bmo#1452075) + Malicious PDF can inject JavaScript into PDF Viewer + * CVE-2018-5159 (bmo#1441941) + Integer overflow and out-of-bounds write in Skia + * CVE-2018-5160 (bmo#1436117) + Uninitialized memory use by WebRTC encoder + * CVE-2018-5152 (bmo#1415644, bmo#1427289) + WebExtensions information leak through webRequest API + * CVE-2018-5153 (bmo#1436809) + Out-of-bounds read in mixed content websocket messages + * CVE-2018-5163 (bmo#1426353) + Replacing cached data in JavaScript Start-up Bytecode Cache + * CVE-2018-5164 (bmo#1416045) + CSP not applied to all multipart content sent with + multipart/x-mixed-replace + * CVE-2018-5166 (bmo#1437325) + WebExtension host permission bypass through filterReponseData + * CVE-2018-5167 (bmo#1447969) + Improper linkification of chrome: and javascript: content in + web console and JavaScript debugger + * CVE-2018-5168 (bmo#1449548) + Lightweight themes can be installed without user interaction + * CVE-2018-5169 (bmo#1319157) + Dragging and dropping link text onto home button can set home page + to include chrome pages + * CVE-2018-5172 (bmo#1436482) + Pasted script from clipboard can run in the Live Bookmarks page + or PDF viewer + * CVE-2018-5173 (bmo#1438025) + File name spoofing of Downloads panel with Unicode characters + * CVE-2018-5174 (bmo#1447080) (Windows-only) + Windows Defender SmartScreen UI runs with less secure behavior + for downloaded files in Windows 10 April 2018 Update + * CVE-2018-5175 (bmo#1432358) + Universal CSP bypass on sites using strict-dynamic in their policies + * CVE-2018-5176 (bmo#1442840) + JSON Viewer script injection + * CVE-2018-5177 (bmo#1451908) + Buffer overflow in XSLT during number formatting + * CVE-2018-5165 (bmo#1451452) + Checkbox for enabling Flash protected mode is inverted in 32-bit + Firefox + * CVE-2018-5180 (bmo#1444086) + heap-use-after-free in mozilla::WebGLContext::DrawElementsInstanced + * CVE-2018-5181 (bmo#1424107) + Local file can be displayed in noopener tab through drag and + drop of hyperlink + * CVE-2018-5182 (bmo#1435908) + Local file can be displayed from hyperlink dragged and dropped + on addressbar + * CVE-2018-5151 + Memory safety bugs fixed in Firefox 60 + * CVE-2018-5150 + Memory safety bugs fixed in Firefox 60 and Firefox ESR 52.8 +- removed obsolete patches + 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch + mozilla-bmo1005535.patch +- requires NSPR 4.19 and NSS 3.36.1 +- requires rust 1.24 or higher +- use upstream source archive and detached signature for + source verification + +------------------------------------------------------------------- +Thu May 3 14:33:37 UTC 2018 - guillaume.gardet@opensuse.org + +- Fix armv7 build by: + * adding RUSTFLAGS="-Cdebuginfo=0" + * updating _constraints for %arm + ------------------------------------------------------------------- Wed May 2 20:46:37 UTC 2018 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 593167d..afd2af1 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,11 +18,12 @@ # changed with every update -%define major 59 -%define mainver %major.0.3 +%define major 60 +%define mainver %major.0 %define update_channel release %define branding 1 -%define releasedate 20180340000000 +%define releasedate 20180503143129 +%define source_prefix firefox-%{mainver} # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -70,11 +71,11 @@ BuildRequires: libiw-devel BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.18 -BuildRequires: mozilla-nss-devel >= 3.35 +BuildRequires: mozilla-nspr-devel >= 4.19 +BuildRequires: mozilla-nss-devel >= 3.36.1 BuildRequires: python-devel BuildRequires: python2-xml -BuildRequires: rust >= 1.22.1 +BuildRequires: rust >= 1.24 BuildRequires: rust-std BuildRequires: startup-notification-devel BuildRequires: unzip @@ -120,7 +121,7 @@ Summary: Mozilla %{appname} Web Browser License: MPL-2.0 Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ -Source: firefox-%{version}-source.tar.xz +Source: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz Source1: MozillaFirefox.desktop Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in @@ -141,6 +142,8 @@ Source16: MozillaFirefox.changes # please get your own set of keys. Source18: mozilla-api-key Source19: google-api-key +Source20: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz.asc +Source21: mozilla.keyring # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-kde.patch @@ -150,11 +153,9 @@ Patch5: mozilla-no-stdcxx-check.patch Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bmo256180.patch -Patch9: mozilla-bmo1005535.patch -Patch10: mozilla-i586-DecoderDoctorLogger.patch -Patch11: mozilla-i586-domPrefs.patch -Patch12: mozilla-enable-csd.patch -Patch13: 0001-Bug-1435695-WebRTC-fails-to-build-with-GCC-8-r-dmino.patch +Patch9: mozilla-i586-DecoderDoctorLogger.patch +Patch10: mozilla-i586-domPrefs.patch +Patch11: mozilla-enable-csd.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -208,7 +209,7 @@ of %{appname}. %package translations-other Summary: Extra translations for %{appname} Group: System/Localization -Provides: locale(%{name}:ach;af;an;as;ast;az;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;ka;kab;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;ne-NP;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh) +Provides: locale(%{name}:ach;af;an;as;ast;az;bg;bn_BD;bn_IN;br;bs;cak;cy;dsb;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gn;gu_IN;he;hi_IN;hr;hsb;hy_AM;id;is;ka;kab;kk;km;kn;lij;lt;lv;mai;mk;ml;mr;ms;ne-NP;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;uz;vi;xh) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -250,11 +251,11 @@ symbols meant for upload to Mozilla's crash collector database. %prep %if %localize -%setup -q -n mozilla -b 7 -b 10 +%setup -q -n %{source_prefix} -b 7 -b 10 %else -%setup -q -n mozilla +%setup -q -n %{source_prefix} %endif -cd $RPM_BUILD_DIR/mozilla +cd $RPM_BUILD_DIR/%{source_prefix} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -265,13 +266,11 @@ cd $RPM_BUILD_DIR/mozilla %endif %patch7 -p1 %patch8 -p1 -%patch9 -p1 %ifarch %ix86 +%patch9 -p1 %patch10 -p1 -%patch11 -p1 %endif -%patch12 -p1 -%patch13 -p1 +%patch11 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -321,6 +320,9 @@ export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now" export CFLAGS="$CFLAGS -mminimal-toc" %endif export CXXFLAGS="$CFLAGS" +%ifarch %{arm} +export RUSTFLAGS="-Cdebuginfo=0" +%endif export MOZCONFIG=$RPM_BUILD_DIR/mozconfig cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 @@ -375,8 +377,12 @@ ac_add_options --disable-crashreporter %ifarch %arm ac_add_options --with-fpu=vfpv3-d16 ac_add_options --with-float-abi=hard +%ifarch armv6l armv6hl +ac_add_options --with-arch=armv6 +%else ac_add_options --with-arch=armv7-a %endif +%endif %ifarch %arm s390x ac_add_options --disable-webrtc %endif @@ -409,7 +415,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 $(cat $RPM_BUILD_DIR/mozilla/browser/locales/shipped-locales) ; do +for locale in $(cat $RPM_BUILD_DIR/%{source_prefix}/browser/locales/shipped-locales) ; do case $locale in ja-JP-mac|en-US|'') ;; @@ -417,7 +423,7 @@ for locale in $(cat $RPM_BUILD_DIR/mozilla/browser/locales/shipped-locales) ; do pushd $RPM_BUILD_DIR/compare-locales PYTHONPATH=lib \ scripts/compare-locales -m ../l10n-merged/$locale \ - ../mozilla/browser/locales/l10n.ini ../l10n $locale + ../%{source_prefix}/browser/locales/l10n.ini ../l10n $locale popd LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ make -C browser/locales langpack-$locale @@ -448,7 +454,7 @@ find %{buildroot}%{progdir} \ -name "*.xml" -o \ -name "*.css" | xargs chmod a-x # remove mkdir.done files from installed base -find %{buildroot}%{progdir} -name ".mkdir.done" | xargs rm +find %{buildroot}%{progdir} -name ".mkdir.done" | xargs rm || : # overwrite the mozilla start-script and link it to /usr/bin mkdir --parents %{buildroot}/usr/bin sed "s:%%PREFIX:%{_prefix}:g @@ -589,7 +595,7 @@ exit 0 %{progdir}/application.ini %{progdir}/chrome.manifest %{progdir}/dependentlibs.list -%{progdir}/icudt*.dat +#%{progdir}/icudt*.dat %{progdir}/*.so %{progdir}/omni.ja %{progdir}/fonts/ diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index ac1daa1..b799ae2 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:37774ab800fa0eb9045c834ebe7ada3cd82b866c3ef00c23cd7abac312e414ac -size 28864 +oid sha256:971053a42b39417bb7d549e3de0d4b267732bb961e5178bbc3a2340b58f84b31 +size 28368 diff --git a/create-tar.sh b/create-tar.sh index de400b9..0ac7713 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -7,8 +7,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_59_0_3_RELEASE" -VERSION="59.0.3" +RELEASE_TAG="ea4f3168c604994f051644b467aad92723448d12" +VERSION="60.0" # check required tools test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 ) @@ -54,7 +54,7 @@ if (($? != 127)); then fi echo "creating archive..." -tar $compression -cf firefox-$VERSION-source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla +tar $compression -cf firefox-$VERSION.source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla # l10n echo "fetching locales..." diff --git a/firefox-59.0.3-source.tar.xz b/firefox-59.0.3-source.tar.xz deleted file mode 100644 index 094f58c..0000000 --- a/firefox-59.0.3-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c64851cc34baa35b54680d4339d940dbd81ec297c78b1ac1b57d3b6b5271a92b -size 270321944 diff --git a/firefox-60.0.source.tar.xz b/firefox-60.0.source.tar.xz new file mode 100644 index 0000000..fdeb131 --- /dev/null +++ b/firefox-60.0.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bc4fd997e6239f53e16a70b04f197791e5c5d09367e2916bcfe4a427999f842 +size 266717500 diff --git a/firefox-60.0.source.tar.xz.asc b/firefox-60.0.source.tar.xz.asc new file mode 100644 index 0000000..ec8c83a --- /dev/null +++ b/firefox-60.0.source.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAABCAAGBQJa60C4AAoJELu+vbskxvNVUDcQAJ1hl00Be6Gfm+Vmt/mD0RI/ +1iRV+2tESmzdeI4QPvzHw1H5lLbxkXi/LsOgT33jxtGVVWyS2XKhh598bQKF0AV9 +D1yVChoLjt5xIvb7Fo9qH3HdPPtJfff6t88Nj/Or+TbCjmUQQIzOPeUPwHG7YFoM +xYjdHIVTw5IYMJoAD7cbWTknQZcwNlhPG0MeT/M5nEfi311i5oR1ExSyk/W1EOCJ +C337uFt6DqrLm75eeYNYsKE9+PA2DMRrS5FUVVtTeAtGZelyiUjSzmKnbJShl5tt +kUnfz1xExdEAh837EtWJ2evX9f+xAqu1r2jZ3g/NO71LdFTbPJNcqlPqYhza5kw5 +s6IDWnB70pMviVVBXYWFwECZ9Jiz0+CQ9+qj2E4qNlUuq8AyJ7leW5K1dIsAcGQH +bAy57CT4Q/Q+3n1hOCBInWkQqhO9BxZ1JSk30obYDlmfE6QYoPYyvojyO3Z2aZ3G +K6CUOYs5kmBWNdD0HNhO2WUrffrXaMyNsvlicZQKpNR1GPZ3r8aznWgG1x1X7mIF +2IK4jcFvJlsi/sTqEZDyADHrTnruerWq330LXLXOLzmZC+/pkTmzMFaVqC3BOE4I +KbC2QsePQRge0nGpz7U099SW6wNy5zEcHKTfTGMqwQH3FkB0Ep9BVgoE+mUuWsIv +aZZGvCTjbDaGBHlHxkaA +=/KN9 +-----END PGP SIGNATURE----- diff --git a/firefox-kde.patch b/firefox-kde.patch index f81ad40..6c57040 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,11 +1,11 @@ # HG changeset patch -# Parent ffcd96e120857e207bd357b2005f0b5bc776e375 +# Parent 1b44c077e473c5a7d02fab26e2a220ebf219e0ab 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,1238 @@ +@@ -0,0 +1,1280 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -15,14 +15,15 @@ new file mode 100644 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + + ++ + + + + ++ + ++ + -+ -+ + + +# All DTD information is stored in a separate file so that it can be shared by @@ -59,7 +60,6 @@ new file mode 100644 + tabsintitlebar="true" +#endif + titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" -+ lightweightthemes="true" + windowtype="navigator:browser" + macanimationtype="document" + screenX="4" screenY="4" @@ -75,6 +75,7 @@ new file mode 100644 + + + +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the @@ -104,8 +105,9 @@ new file mode 100644 + accesskey="&moveToNewWindow.accesskey;" + tbattr="tabbrowser-multiple" + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> -+ ++ + + @@ -144,6 +146,7 @@ new file mode 100644 + + @@ -1196,13 +1223,28 @@ new file mode 100644 +