From f786a71dcd38fe3b9cc8ef6b26b062b2f052fd55408aaca8046cc91e0ffc53d5 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 5 Sep 2017 10:10:37 +0000 Subject: [PATCH] - update to Firefox 55.0.3 * Fix an issue with addons when using a path containing non-ascii characters (bmo#1389160) * Fix file uploads to some websites, including YouTube (bmo#1383518) - fix Google API key build integration - add mozilla-ucontext.patch to fix Tumbleweed build - do not enable XINPUT2 for now (boo#1053959) - update to Firefox 55.0.1 * Fix a regression the tab restoration process (bmo#1388160) * Fix a problem causing What's new pages not to be displayed (bmo#1386224) * Fix a rendering issue with some PKCS#11 libraries (bmo#1388370) * Disable the predictor prefetch (bmo#1388160) - update to Firefox 55.0 (boo#1052829) * Browsing sessions with a high number of tabs are now restored in an instant * Sidebar (bookmarks, history, synced tabs) can now be moved to the right edge of the window * Fine-tune your browser performance from the Preferences/Options page. * Make screenshots of webpages, and save them locally or upload them to the cloud. This feature will undergo A/B testing and will not be visible for some users. * Added Belarusian (be) locale * Simplify print jobs from within print preview * Use virtual reality devices with the web with the introduction of WebVR * Search suggestions are now enabled by default for users who haven't explicitly opted-out * Search with any installed search engine directly from the OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=601 --- MozillaFirefox.changes | 234 +++++++++++------- MozillaFirefox.spec | 88 +++---- _constraints | 4 +- compare-locales.tar.xz | 4 +- create-tar.sh | 8 +- firefox-52.3.0-source.tar.xz | 3 - firefox-55.0.3-source.tar.xz | 3 + firefox-branded-icons.patch | 8 +- firefox-kde.patch | 274 +++++++++++++++++---- google-api-key | 1 + l10n-52.3.0.tar.xz | 3 - l10n-55.0.3.tar.xz | 3 + l10n_changesets.txt | 187 ++++++++------- mozilla-aarch64-startup-crash.patch | 9 +- mozilla-kde.patch | 356 ++++++++++------------------ mozilla-shared-nss-db.patch | 143 ----------- mozilla-ucontext.patch | 182 +++++++++++--- mozilla.sh.in | 4 + source-stamp.txt | 4 +- 19 files changed, 797 insertions(+), 721 deletions(-) delete mode 100644 firefox-52.3.0-source.tar.xz create mode 100644 firefox-55.0.3-source.tar.xz create mode 100644 google-api-key delete mode 100644 l10n-52.3.0.tar.xz create mode 100644 l10n-55.0.3.tar.xz delete mode 100644 mozilla-shared-nss-db.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index c842c976..3dfdd855 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,19 +1,66 @@ ------------------------------------------------------------------- -Wed Aug 9 09:47:39 UTC 2017 - schwab@suse.de +Mon Sep 4 18:27:44 UTC 2017 - wr@rosenauer.org -- mozilla-ucontext.patch: use ucontext_t instead of struct ucontext +- update to Firefox 55.0.3 + * Fix an issue with addons when using a path containing non-ascii + characters (bmo#1389160) + * Fix file uploads to some websites, including YouTube (bmo#1383518) +- fix Google API key build integration +- add mozilla-ucontext.patch to fix Tumbleweed build +- do not enable XINPUT2 for now (boo#1053959) ------------------------------------------------------------------- -Tue Aug 8 18:13:34 UTC 2017 - wr@rosenauer.org +Fri Aug 11 08:32:30 UTC 2017 - wr@rosenauer.org -- update to Firefox 52.3esr (boo#1052829) - MFSA 2017-19 +- update to Firefox 55.0.1 + * Fix a regression the tab restoration process (bmo#1388160) + * Fix a problem causing What's new pages not to be displayed (bmo#1386224) + * Fix a rendering issue with some PKCS#11 libraries (bmo#1388370) + * Disable the predictor prefetch (bmo#1388160) + +------------------------------------------------------------------- +Sat Aug 5 13:22:16 UTC 2017 - wr@rosenauer.org + +- update to Firefox 55.0 (boo#1052829) + * Browsing sessions with a high number of tabs are now restored + in an instant + * Sidebar (bookmarks, history, synced tabs) can now be moved to + the right edge of the window + * Fine-tune your browser performance from the Preferences/Options page. + * Make screenshots of webpages, and save them locally or upload + them to the cloud. This feature will undergo A/B testing and + will not be visible for some users. + * Added Belarusian (be) locale + * Simplify print jobs from within print preview + * Use virtual reality devices with the web with the introduction + of WebVR + * Search suggestions are now enabled by default for users who + haven't explicitly opted-out + * Search with any installed search engine directly from the + location bar + * IMPORTANT: Breaking profile changes - do not downgrade Firefox + and use a profile that has been opened with Firefox 55+. + * The Adobe Flash plugin is now click-to-activate by default and + only allowed on http:// and https:// URL schemes. This change + will be rolled out progressively and so will not be visible to + all users immediately. For more information see the Firefox + plugin roadmap + * Modernized application update UI to be less intrusive and more + aligned with the rest of the browser. Only users who have not + restarted their browser 8 days after downloading an update or + users who opted out of automatic updates will see this change. + * Insecure sites can no longer access the Geolocation APIs to get + access to your physical location + * requires NSPR 4.15 and NSS 3.31 + MFSA 2017-18 * CVE-2017-7798 (bmo#1371586, bmo#1372112) XUL injection in the style editor in devtools * CVE-2017-7800 (bmo#1374047) Use-after-free in WebSockets during disconnection * CVE-2017-7801 (bmo#1371259) Use-after-free with marquee during window resizing + * CVE-2017-7809 (bmo#1380284) + Use-after-free while deleting attached editor DOM node * CVE-2017-7784 (bmo#1376087) Use-after-free with image observers * CVE-2017-7802 (bmo#1378147) @@ -22,6 +69,8 @@ Tue Aug 8 18:13:34 UTC 2017 - wr@rosenauer.org Buffer overflow manipulating ARIA attributes in DOM * CVE-2017-7786 (bmo#1365189) Buffer overflow while painting non-displayable SVG + * CVE-2017-7806 (bmo#1378113) + Use-after-free in layer manager with SVG * CVE-2017-7753 (bmo#1353312) Out-of-bounds read with cached style data and pseudo-elements# * CVE-2017-7787 (bmo#1322896) @@ -34,88 +83,75 @@ Tue Aug 8 18:13:34 UTC 2017 - wr@rosenauer.org Memory protection bypass through WindowsDllDetourPatcher * CVE-2017-7791 (bmo#1365875) Spoofing following page navigation with data: protocol and modal alerts + * CVE-2017-7808 (bmo#1367531) + CSP information leak with frame-ancestors containing paths * CVE-2017-7782 (bmo#1344034) WindowsDllDetourPatcher allocates memory without DEP protections + * CVE-2017-7781 (bmo#1352039) + Elliptic curve point addition error when using mixed Jacobian-affine coordinates + * CVE-2017-7794 (bmo#1374281) + Linux file truncation via sandbox broker * CVE-2017-7803 (bmo#1377426) CSP containing 'sandbox' improperly applied + * CVE-2017-7799 (bmo#1372509) + Self-XSS XUL injection in about:webrtc + * CVE-2017-7783 (bmo#1360842) + DOS attack through long username in URL + * CVE-2017-7788 (bmo#1073952) + Sandboxed about:srcdoc iframes do not inherit CSP directives + * CVE-2017-7789 (bmo#1074642) + Failure to enable HSTS when two STS headers are sent for a connection + * CVE-2017-7790 (bmo#1350460) (Windows-only) + Windows crash reporter reads extra memory for some non-null-terminated registry values + * CVE-2017-7796 (bmo#1234401) (Windows-only) + Windows updater can delete any file named update.log + * CVE-2017-7797 (bmo#1334776) + Response header name interning leaks across origins + * CVE-2017-7780 + Memory safety bugs fixed in Firefox 55 * CVE-2017-7779 Memory safety bugs fixed in Firefox 55 and Firefox ESR 52.3 +- updated mozilla-kde.patch: + * removed "downloadfinished" alert as Firefox reimplemented the + whole thing (TODO: check if there is another function we should + hook in) ------------------------------------------------------------------- -Wed Jul 5 07:26:32 UTC 2017 - astieger@suse.com +Tue Jul 4 20:08:47 UTC 2017 - wr@rosenauer.org -- Mozilla Firefox 52.2.1esr: - * Printing text does not work on Windows when Direct2D is - disabled (bmo#1318845) +- update to Firefox 54.0.1 + * Fix a display issue of tab title (bmo#1357656) + * Fix a display issue of opening new tab (bmo#1371995) + * Fix a display issue when opening multiple tabs (bmo#1371962) + * Fix a tab display issue when downloading files (bmo#1373109) + * Fix a PDF printing issue (bmo#1366744) + * Fix a Netflix issue on Linux (bmo#1375708) ------------------------------------------------------------------- -Wed Jun 14 07:08:29 UTC 2017 - wr@rosenauer.org +Thu Jun 15 13:56:05 UTC 2017 - wr@rosenauer.org -- update to Firefox 52.2esr (boo#1043960) - MFSA 2017-16 - * CVE-2017-5472 (bmo#1365602) - Use-after-free using destroyed node when regenerating trees - * CVE-2017-7749 (bmo#1355039) - Use-after-free during docshell reloading - * CVE-2017-7750 (bmo#1356558) - Use-after-free with track elements - * CVE-2017-7751 (bmo#1363396) - Use-after-free with content viewer listeners - * CVE-2017-7752 (bmo#1359547) - Use-after-free with IME input - * CVE-2017-7754 (bmo#1357090) - Out-of-bounds read in WebGL with ImageInfo object - * CVE-2017-7755 (bmo#1361326) - Privilege escalation through Firefox Installer with same - directory DLL files (Windows only) - * CVE-2017-7756 (bmo#1366595) - Use-after-free and use-after-scope logging XHR header errors - * CVE-2017-7757 (bmo#1356824) - Use-after-free in IndexedDB - * CVE-2017-7778, CVE-2017-7778, CVE-2017-7771, CVE-2017-7772, - CVE-2017-7773, CVE-2017-7774, CVE-2017-7775, CVE-2017-7776, - CVE-2017-7777 - Vulnerabilities in the Graphite 2 library - * CVE-2017-7758 (bmo#1368490) - Out-of-bounds read in Opus encoder - * CVE-2017-7760 (bmo#1348645) - File manipulation and privilege escalation via callback parameter - in Mozilla Windows Updater and Maintenance Service (Windows only) - * CVE-2017-7761 (bmo#1215648) - File deletion and privilege escalation through Mozilla Maintenance - Service helper.exe application (Windows only) - * CVE-2017-7764 (bmo#1364283) - Domain spoofing with combination of Canadian Syllabics and other - unicode blocks - * CVE-2017-7765 (bmo#1273265) - Mark of the Web bypass when saving executable files (Windows only) - * CVE-2017-7766 (bmo#1342742) - File execution and privilege escalation through updater.ini, - Mozilla Windows Updater, and Mozilla Maintenance Service - (Windows only) - * CVE-2017-7767 (bmo#1336964) - Privilege escalation and arbitrary file overwrites through Mozilla - Windows Updater and Mozilla Maintenance Service (Windows only) - * CVE-2017-7768 (bmo#1336979) - 32 byte arbitrary file read through Mozilla Maintenance Service - (Windows only) - * CVE-2017-5470 - Memory safety bugs fixed in Firefox 54 and Firefox ESR 52.2 -- requires NSS 3.28.5 +- update to Firefox 54.0 + * Clearer and more detailed information for download items in the + download panel + * Added Burmese (my) locale + * Bookmarks created on mobile devices are now shown in + "Mobile Bookmarks” folder in the drop down list from the toolbar + and Bookmarks option in the menu bar in Desktop Firefox + * added support for multiple content processes (e10s-multi) +- requires NSPR 4.14 and NSS 3.30.2 +- requires rust 1.15.1 +- removed mozilla-shared-nss-db.patch as it seems to be a rather + unused feature ------------------------------------------------------------------- -Tue May 23 14:00:40 UTC 2017 - wr@rosenauer.org +Thu Jun 1 04:25:05 UTC 2017 - kah0922@gmail.com - remove -fno-inline-small-functions and explicitely optimize with -O2 for openSUSE > 13.2/Leap 42 to work with gcc7 (boo#1040105) ------------------------------------------------------------------- -Mon May 8 08:28:17 UTC 2017 - wr@rosenauer.org +Wed Apr 26 12:37:38 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 @@ -123,10 +159,27 @@ Mon May 8 08:28:17 UTC 2017 - wr@rosenauer.org (boo#1015998) ------------------------------------------------------------------- -Wed Apr 12 21:43:16 UTC 2017 - wr@rosenauer.org +Mon Apr 17 12:52:10 UTC 2017 - wr@rosenauer.org -- update to Firefox 52.1.0esr (boo#1035082) - MFSA 2017-12 +- update to Firefox 53.0 + * requires NSS 3.29.5 + * Lightweight themes are now applied in private browsing windows + * Reader Mode now displays estimated reading time for the page + * Two new 'compact' themes available in Firefox, dark and light, + based on the Firefox Developer Edition theme + * Ended Firefox Linux support for processors older than Pentium 4 + and AMD Opteron + * Refresh of the media controls user interface + * Shortened titles on tabs are faded out instead of using ellipsis + for improved readability + * Media playback on new tabs is blocked until the tab is visible + * Permission notifications have a cleaner design and cannot be + easily missed + MFSA 2017-10 + * CVE-2017-5456 (bmo#1344415) + Sandbox escape allowing local file system access + * CVE-2017-5442 (bmo#1347979) + Use-after-free during style changes * CVE-2017-5443 (bmo#1342661) Out-of-bounds write during BinHex decoding * CVE-2017-5429 (bmo#1341096, bmo#1342823, bmo#1343261, bmo#1348894, @@ -158,8 +211,8 @@ Wed Apr 12 21:43:16 UTC 2017 - wr@rosenauer.org * CVE-2017-5445 (bmo#1344467) Uninitialized values used while parsing application/http-index-format content - * CVE-2017-5442 (bmo#1347979) - Use-after-free during style changes + * CVE-2017-5468 (bmo#1329521) + Incorrect ownership model for Private Browsing information * CVE-2017-5469 (bmo#1292534) Potential Buffer overflow in flex-generated code * CVE-2017-5440 (bmo#1336832) @@ -183,36 +236,33 @@ Wed Apr 12 21:43:16 UTC 2017 - wr@rosenauer.org * CVE-2017-5432 (bmo#1346654) Use-after-free in text input selection * CVE-2017-5430 (bmo#1329796, bmo#1337418, bmo#1339722, bmo#1340482, - bmo#1342101, bmo#1344081, bmo#1344305, bmo#1344686, bmo#1346140, - bmo#1346419, bmo#1348143, bmo#1349621, bmo#1349719, bmo#1353476) + bmo#1342101, bmo#1344081, bmo#1344305, bmo#1344686, + bmo#1346140, bmo#1346419, bmo#1348143, bmo#1349621, + bmo#1349719, bmo#1353476) Memory safety bugs fixed in Firefox 53 and Firefox ESR 52.1 * CVE-2017-5459 (bmo#1333858) Buffer overflow in WebGL - * CVE-2017-5462 (bmo#1345089) - DRBG flaw in NSS + * CVE-2017-5458 (bmo#1229426) + Drag and drop of javascript: URLs can allow for self-XSS * CVE-2017-5455 (bmo#1341191) Sandbox escape through internal feed reader APIs * CVE-2017-5454 (bmo#1349276) - Sandbox escape allowing file system read access through file - picker - * CVE-2017-5456 (bmo#1344415) - Sandbox escape allowing local file system access + Sandbox escape allowing file system read access through file picker * CVE-2017-5451 (bmo#1273537) Addressbar spoofing with onblur event -- requires NSS 3.28.4 -- rebased patches + * CVE-2017-5453 (bmo#1321247) + HTML injection into RSS Reader feed preview page through + TITLE element + * CVE-2017-5462 (bmo#1345089) + DRBG flaw in NSS +- removed browser(npapi) provides as these plugins are deprecated +- switch used compiler to gcc5 (FF requires gcc >= 4.9 now) for + Leap 42 +- Gtk2 is not longer an option; switched to Gtk3 +- apply MOZ_USE_XINPUT2=1 for better touchpad and touchscreen support + (boo#1032003) ------------------------------------------------------------------- -Mon Apr 3 06:28:34 UTC 2017 - wr@rosenauer.org - -- switch package to use ESR52 branch - * enables plugin support by default - * service workers are disabled by default - * push notifications are disabled by default - * WebAssembly (wasm) is disabled - * Less use of multiprocess architecture Electrolysis (e10s) - -+------------------------------------------------------------------- Mon Apr 3 06:16:26 UTC 2017 - wr@rosenauer.org - update to Firefox 52.0.2 diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 8f6d3a43..2e800692 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,31 +18,26 @@ # changed with every update -%define major 52 -%define mainver %major.3.0 -%define update_channel esr52 -%define releasedate 20170807000000 +%define major 55 +%define mainver %major.0.3 +%define update_channel release +%define branding 1 +%define releasedate 20170824000000 # PIE, full relro (x86_64 for now) %define build_hardened 1 -%if 0%{?suse_version} > 1320 -%define firefox_use_gtk3 1 -%ifarch %ix86 x86_64 -%define firefox_use_rust 0 -%endif +# Firefox only supports i686 +%ifarch %ix86 +ExclusiveArch: i586 i686 +BuildArch: i686 +%{expand:%%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic} %endif # general build definitions -%if "%{update_channel}" != "aurora" %define progname firefox %define pkgname MozillaFirefox %define appname Firefox -%else -%define progname firefox-dev -%define pkgname firefox-dev-edition -%define appname Firefox Developer Edition -%endif %define progdir %{_prefix}/%_lib/%{progname} %define gnome_dir %{_prefix} %define desktop_file_name %{progname} @@ -51,15 +46,6 @@ %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind -# Set up Google 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. -%define _google_api_key AIzaSyD1hTe85_a14kr1Ks8T3Ce75rvbR1_Dx7Q -%if %update_channel == "aurora" -%define branding 0 -%else -%define branding 1 -%endif %define localize 1 %ifarch %ix86 x86_64 %define crashreporter 1 @@ -72,7 +58,12 @@ BuildRequires: Mesa-devel BuildRequires: autoconf213 BuildRequires: dbus-1-glib-devel BuildRequires: fdupes +%if 0%{?suse_version} <= 1320 +BuildRequires: gcc5-c++ +%else BuildRequires: gcc-c++ +%endif +BuildRequires: cargo BuildRequires: libXcomposite-devel BuildRequires: libcurl-devel BuildRequires: libgnomeui-devel @@ -81,29 +72,23 @@ BuildRequires: libiw-devel BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo -BuildRequires: mozilla-nspr-devel >= 4.13.1 -BuildRequires: mozilla-nss-devel >= 3.28.5 -BuildRequires: nss-shared-helper-devel +BuildRequires: mozilla-nspr-devel >= 4.15 +BuildRequires: mozilla-nss-devel >= 3.31 BuildRequires: python-devel +BuildRequires: rust >= 1.15.1 +BuildRequires: rust-std BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip -BuildRequires: pkgconfig(libffi) -BuildRequires: pkgconfig(libpulse) -%if 0%{?firefox_use_gtk3} BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0 BuildRequires: pkgconfig(gtk+-unix-print-3.0) -%endif -%if 0%{?firefox_use_rust} -BuildRequires: cargo -BuildRequires: rust >= 1.10 -BuildRequires: rust-std -%endif +BuildRequires: pkgconfig(libffi) +BuildRequires: pkgconfig(libpulse) # libavcodec is required for H.264 support but the # openSUSE version is currently not able to play H.264 # therefore the Packman version is required @@ -116,11 +101,8 @@ Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} %endif Provides: web_browser -Provides: browser(npapi) -%if "%{update_channel}" != "aurora" Provides: appdata() Provides: appdata(firefox.appdata.xml) -%endif # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package %define kde_helper_version 6 @@ -147,10 +129,13 @@ 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. Source18: mozilla-api-key +Source19: google-api-key # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch -Patch2: mozilla-shared-nss-db.patch Patch3: mozilla-kde.patch Patch5: mozilla-language.patch Patch6: mozilla-ntlm-full-path.patch @@ -180,6 +165,7 @@ Obsoletes: tracker-miner-firefox < 0.15 %if 0%{?suse_version} < 1220 Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 %endif +##BuildArch: i686 x86_64 aarch64 ppc64le %description Mozilla Firefox is a standalone web browser, designed for standards @@ -260,13 +246,14 @@ symbols meant for upload to Mozilla's crash collector database. %endif cd $RPM_BUILD_DIR/mozilla %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%ifarch %ix86 %patch9 -p1 +%endif %patch10 -p1 %patch11 -p1 # Firefox @@ -295,7 +282,9 @@ export MOZ_BUILD_DATE=%{releasedate} export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -export MOZ_GOOGLE_API_KEY=%{_google_api_key} +%if 0%{?suse_version} <= 1320 +export CC=gcc-5 +%endif export CFLAGS="%{optflags} -fno-strict-aliasing" # boo#986541: add -fno-delete-null-pointer-checks for gcc6 %if 0%{?suse_version} > 1320 @@ -328,14 +317,7 @@ ac_add_options --prefix=%{_prefix} ac_add_options --libdir=%{_libdir} ac_add_options --includedir=%{_includedir} ac_add_options --enable-release -%if 0%{?firefox_use_rust} -ac_add_options --enable-rust -%endif -%if 0%{?firefox_use_gtk3} ac_add_options --enable-default-toolkit=cairo-gtk3 -%else -ac_add_options --enable-default-toolkit=cairo-gtk2 -%endif %if 0%{?build_hardened} ac_add_options --enable-pie %endif @@ -367,6 +349,7 @@ 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} +ac_add_options --with-google-api-keyfile=%{SOURCE19} %if %branding ac_add_options --enable-official-branding %endif @@ -471,10 +454,8 @@ s:%%ICON:%{progname}:g" \ mkdir -p %{buildroot}%{_datadir}/mime/packages cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata -%if "%{update_channel}" != "aurora" mkdir -p %{buildroot}%{_datadir}/appdata cp %{SOURCE15} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml -%endif # install man-page mkdir -p %{buildroot}%{_mandir}/man1/ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 @@ -585,10 +566,8 @@ exit 0 %{progdir}/distribution/extensions/ %{progdir}/defaults/ %{progdir}/dictionaries/ -%if 0%{?firefox_use_gtk3} %dir %{progdir}/gtk2 %{progdir}/gtk2/libmozgtk.so -%endif %{progdir}/gmp-clearkey/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox @@ -600,6 +579,7 @@ exit 0 %{progdir}/*.so %{progdir}/omni.ja %{progdir}/fonts/ +%{progdir}/pingsender %{progdir}/platform.ini %{progdir}/plugin-container %if %crashreporter @@ -621,9 +601,7 @@ exit 0 %{gnome_dir}/share/icons/hicolor/ %{_bindir}/%{progname} %doc %{_mandir}/man1/%{progname}.1.gz -%if "%{update_channel}" != "aurora" %{_datadir}/appdata/ -%endif %files devel %defattr(-,root,root) diff --git a/_constraints b/_constraints index 57c2694d..e38f9de0 100644 --- a/_constraints +++ b/_constraints @@ -2,10 +2,10 @@ - 13 + 18 - 6000 + 7000 diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index eb66ea38..c909ddc4 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:0c012241138a66dea1995518f245898791d94cb31d11b2472c889dbe464418bb -size 28392 +oid sha256:8ab1d8d34c78ec2a2acae648582d499c8d2c80b496c6e33016c51acf1dfb25e3 +size 28364 diff --git a/create-tar.sh b/create-tar.sh index f24c3ea3..ad8458a7 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -5,10 +5,10 @@ # "moz_source_stamp": "c1de04f39fa956cfce83f6065b0e709369215ed5" # http://ftp.mozilla.org/pub/firefox/candidates/48.0-candidates/build2/l10n_changesets.txt -CHANNEL="esr52" +CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_52_3_0esr_RELEASE" -VERSION="52.3.0" +RELEASE_TAG="FIREFOX_55_0_3_RELEASE" # 55.0.3 build2 +VERSION="55.0.3" # mozilla if [ -d mozilla ]; then @@ -62,7 +62,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do 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/releases/l10n/mozilla-release/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $_changeset ;; esac diff --git a/firefox-52.3.0-source.tar.xz b/firefox-52.3.0-source.tar.xz deleted file mode 100644 index f45968ba..00000000 --- a/firefox-52.3.0-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81cda681a593c1737ff6a448e73288beab6e1499f638002f5cfaa6726896420b -size 223189032 diff --git a/firefox-55.0.3-source.tar.xz b/firefox-55.0.3-source.tar.xz new file mode 100644 index 00000000..a08b6332 --- /dev/null +++ b/firefox-55.0.3-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f128780884d758bc065642534ae736a7200bcec5913794505b32e5ebcc80608 +size 249204976 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index d4685322..f4aa29ce 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,11 +1,11 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent 2bffb52e07b587a6c755d67c6fc971fed6509783 +# Parent 6309c3625e39216f9cf5a7a35cbf6932adfabc1d 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 -@@ -34,18 +34,24 @@ def FirefoxBranding(): +@@ -41,18 +41,24 @@ def FirefoxBranding(): 'disk.icns', 'document.icns', 'dsstore', @@ -33,8 +33,8 @@ diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/brandi 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 -@@ -650,18 +650,21 @@ - @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png +@@ -599,18 +599,21 @@ + @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest diff --git a/firefox-kde.patch b/firefox-kde.patch index 939353d2..a0bc7438 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 1c4e33861cfcffe5a189802cf97957b0701260db +# Parent 9ccba8e6b5fad738ce924ff40b4c5aa6f4bc12dd 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,1134 @@ +@@ -0,0 +1,1306 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -17,11 +17,9 @@ new file mode 100644 + + + -+ + + + -+ + + + @@ -35,6 +33,7 @@ new file mode 100644 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:html="http://www.w3.org/1999/xhtml" ++ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();" + title="&mainWindow.title;" @@ -61,7 +60,6 @@ new file mode 100644 +#endif + titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" + lightweightthemes="true" -+ lightweightthemesfooter="browser-bottombox" + windowtype="navigator:browser" + macanimationtype="document" + screenX="4" screenY="4" @@ -116,7 +114,7 @@ new file mode 100644 + + +