rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

Accepting request 728229 from mozilla:Factory

Browse Source 
Due to release timing and vacation time as well as security considerations Tumbleweed is getting 68.1esr as intermediate before switching back to regular and release 69.

- Mozilla Firefox 68.1.0
  MFSA 2019-26
  * CVE-2019-11751 (bmo#1572838; Windows only)
    Malicious code execution through command line parameters
  * CVE-2019-11746 (bmo#1564449)
    Use-after-free while manipulating video
  * CVE-2019-11744 (bmo#1562033)
    XSS by breaking out of title and textarea elements using innerHTML
  * CVE-2019-11742 (bmo#1559715)
    Same-origin policy violation with SVG filters and canvas to steal
    cross-origin images
  * CVE-2019-11736 (bmo#1551913, bmo#1552206; Windows only))
    File manipulation and privilege escalation in Mozilla Maintenance Service
  * CVE-2019-11753 (bmo#1574980; Windows only)
    Privilege escalation with Mozilla Maintenance Service in custom
    Firefox installation location
  * CVE-2019-11752 (bmo#1501152)
    Use-after-free while extracting a key value in IndexedDB
  * CVE-2019-9812 (bmo#1538008, bmo#1538015)
    Sandbox escape through Firefox Sync
  * CVE-2019-11743 (bmo#1560495)
    Cross-origin access to unload event attributes
  * CVE-2019-11748 (bmo#1564588)
    Persistence of WebRTC permissions in a third party context
  * CVE-2019-11749 (bmo#1565374)
    Camera information available without prompting using getUserMedia
  * CVE-2019-11750 (bmo#1568397)
    Type confusion in Spidermonkey
  * CVE-2019-11738 (bmo#1452037)
    Content security policy bypass through hash-based sources in directives

OBS-URL: https://build.opensuse.org/request/show/728229
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=294
This commit is contained in:
Dominique Leuenberger 2019-09-07 09:27:17 +00:00 committed by Git OBS Bridge
commit 818bf60851
15 changed files with 239 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
MozillaFirefox.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Fri Aug 30 20:49:11 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
- Mozilla Firefox 68.1.0
MFSA 2019-26
* CVE-2019-11751 (bmo#1572838; Windows only)
Malicious code execution through command line parameters
* CVE-2019-11746 (bmo#1564449)
Use-after-free while manipulating video
* CVE-2019-11744 (bmo#1562033)
XSS by breaking out of title and textarea elements using innerHTML
* CVE-2019-11742 (bmo#1559715)
Same-origin policy violation with SVG filters and canvas to steal
cross-origin images
* CVE-2019-11736 (bmo#1551913, bmo#1552206; Windows only))
File manipulation and privilege escalation in Mozilla Maintenance Service
* CVE-2019-11753 (bmo#1574980; Windows only)
Privilege escalation with Mozilla Maintenance Service in custom
Firefox installation location
* CVE-2019-11752 (bmo#1501152)
Use-after-free while extracting a key value in IndexedDB
* CVE-2019-9812 (bmo#1538008, bmo#1538015)
Sandbox escape through Firefox Sync
* CVE-2019-11743 (bmo#1560495)
Cross-origin access to unload event attributes
* CVE-2019-11748 (bmo#1564588)
Persistence of WebRTC permissions in a third party context
* CVE-2019-11749 (bmo#1565374)
Camera information available without prompting using getUserMedia
* CVE-2019-11750 (bmo#1568397)
Type confusion in Spidermonkey
* CVE-2019-11738 (bmo#1452037)
Content security policy bypass through hash-based sources in directives
* CVE-2019-11747 (bmo#1564481)
'Forget about this site' removes sites from pre-loaded HSTS list
* CVE-2019-11735i (bmo#1561404,bmo#1561484,bmo#1568047,bmo#1561912,
bmo#1565744,bmo#1568858,bmo#1570358)
Memory safety bugs fixed in Firefox 69 and Firefox ESR 68.1
* CVE-2019-11740 (bmo#1563133,bmo#1573160)
Memory safety bugs fixed in Firefox 69, Firefox ESR 68.1, and Firefox ESR 60.9
- switched package to ESR branch
- added mozilla-bmo1568145.patch to make builds reproducible
- removed upstreamed patch mozilla-gcc-internal-compiler-error.patch
-------------------------------------------------------------------
Sun Aug 18 17:29:25 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>

30
MozillaFirefox.spec
View File

@ -19,12 +19,12 @@
# changed with every update
%define major 68
%define mainver %major.0.2
%define orig_version 68.0.2
%define orig_suffix %{nil}
%define update_channel release
%define mainver %major.1.0
%define orig_version 68.1.0
%define orig_suffix esr
%define update_channel esr68
%define branding 1
%define releasedate 20190813150448
%define releasedate 20190826132627
%define source_prefix firefox-%{orig_version}
# always build with GCC as SUSE Security Team requires that
@ -134,7 +134,7 @@ Summary: Mozilla %{appname} Web Browser
License: MPL-2.0
Group: Productivity/Networking/Web/Browsers
Url: http://www.mozilla.org/
Source: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz
Source: http://ftp.mozilla.org/pub/firefox/releases/%{version}%{orig_suffix}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz
Source1: MozillaFirefox.desktop
Source2: MozillaFirefox-rpmlintrc
Source3: mozilla.sh.in
@ -156,7 +156,7 @@ Source16: MozillaFirefox.changes
# please get your own set of keys.
Source18: mozilla-api-key
Source19: google-api-key
Source20: https://ftp.mozilla.org/pub/%{progname}/releases/%{version}/source/%{progname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc
Source20: https://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/source/%{progname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc
Source21: mozilla.keyring
# Gecko/Toolkit
Patch1: mozilla-nongnome-proxies.patch
@ -168,12 +168,12 @@ Patch6: mozilla-bmo1463035.patch
Patch7: mozilla-cubeb-noreturn.patch
Patch8: mozilla-fix-aarch64-libopus.patch
Patch9: mozilla-disable-wasm-emulate-arm-unaligned-fp-access.patch
Patch10: mozilla-gcc-internal-compiler-error.patch
Patch11: mozilla-s390-context.patch
Patch12: mozilla-s390-bigendian.patch
Patch13: mozilla-reduce-rust-debuginfo.patch
Patch14: mozilla-ppc-altivec_static_inline.patch
Patch15: mozilla-bmo1005535.patch
Patch10: mozilla-s390-context.patch
Patch11: mozilla-s390-bigendian.patch
Patch12: mozilla-reduce-rust-debuginfo.patch
Patch13: mozilla-ppc-altivec_static_inline.patch
Patch14: mozilla-bmo1005535.patch
Patch15: mozilla-bmo1568145.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch
@ -293,10 +293,10 @@ cd $RPM_BUILD_DIR/%{source_prefix}
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%ifarch s390x
%patch12 -p1
%patch11 -p1
%endif
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1

4
compare-locales.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0b227610f62dee41b8ddfbe121d6f3a00e113c4085f43aeeef6d0b4c706c2c1
size 28572
oid sha256:892b06ef50e2a0f3db6ecefacd620186362913304b932ecb16c888a0243c497c
size 28536

3
firefox-68.0.2.source.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
size 311257408

16
firefox-68.0.2.source.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl1S/owACgkQ8aZmj7t9
Vy7fKA//dhTyNWniTTcyq/WDP1XNNuStre6KRPZmmtiO+vA0xxx0AnbrITvogOAg
waqKpy4a/SvpKK0wZ3n6fRVWizIumJV56c5S5kxSexDKokmScHYSMcX5eVNtJqWg
scftDcfpXOYCKlQfuLMvkbHzr6VQvizELknmihI208kgCRV4GBDjDqWAs6dAtwSA
xCDwH1V+M9a5ubs3gdqWPnGcxT5W00+e5F64YXFUvK17vjohWLmt6HUkBj47MxNg
kdaXB4FAmfaON/kl4VIe5n9Kgzr+DhRIdUQYSFovEE02GBlqoR5NjZPttwghfFgU
YZjOIoRXvBl6qMoEGITastc+DuoPfQ02IXnvyBtAajnR+UknECxfPu4DHKwigm1F
ptBEtAdxiBlWMtNd/wmrvVsXyHcQE+lJdPufGEUUoSAV5m4vE7ly92tzA45VVcm5
HO1H+YHihzvamsTD6FnFRZ/XzAqjYspJRs4xpdiPl9okfmekZJAKwI7nMkhRC3GO
RtgYSY7rM/OpOv9QZ0vTj3/Ln7UUjvR+LEHAYpgw5ECE7nmuupkgQYKUh7lWa7G2
/Y2zpmE2q2DKbmKsJlg06pBeVT3c2ueTGd8D8+nsLY96gnn5XYbky7Aeo378ceZz
n0/+q8tljk7FM//BneJ2wEabEu5ISt7oUWs7OcXsXCGV/r4YKV4=
=e/EW
-----END PGP SIGNATURE-----

3
firefox-68.1.0esr.source.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac
size 312155752

16
firefox-68.1.0esr.source.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl1kD6oACgkQ8aZmj7t9
Vy7zgw//daumocgMPaRkjqsbwsa2PkgdNGv1Doyx3ryKUvAVI0FQYJC2RW5/y++W
Fv92d8ib4Mh8nsmykR4L7jAN+ovdF3mzY0EyoRpC41aWaC0Uw9lLnDVk9s/U46Y3
8IPKEzfNVS4vKETIYviArOLU8AXa/3GT9PtVLZ+VhzMOqe4qnYJTW93s06y0VXUE
r7Bzfe+dwUxLzVtc3d5HfuOmiKYRRjhI1U+Tx8p+DVY7gXhES4r/BmT/bbvNYpdh
i0HzWRH53J7//wiV18WKPxX1UqTYIVMwEhHZZ9+MA11LN2HTLKPmNL/wnh+zx6Wg
arVJQYIIdH7CvNt0/ewJmsFgUmU9inSUd/zJ+7Absq3eDDBwYvsiNNexW+cpgDIe
axWgtQBkp0m73gZ8wzcYO7lI4KhbfraWwBiSubIrZRSuJAbyowKVees/hRtFFeI2
Uhzefr+Cn9RS6vGm7DKme36c6VOZGP7kRO8u+sNrxu4NeOakoG4J7pwFbCnLAVO2
vT0a4xScznXQ9inqrYRdnUiUQv2PLOLCC8uullaPvyd99LPmhbgYaVrii/8S4Ozo
zU95mzbBUbvMPg3OrLNbcszRHeLV9EK0if/+GGr6fSVNrEmShqsFpbceSsbrGg0+
tOWi7PM4iHhlzaFt2TVLV4+xfQWoH7kBW2qNA0dmGjYP1poh1WE=
=Q1b3
-----END PGP SIGNATURE-----

121
firefox-kde.patch
View File

@ -3,7 +3,7 @@
# Date 1559300151 -7200
# Fri May 31 12:55:51 2019 +0200
# Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec
# Parent 428161c3b9599083e1b8710eda1760f1f707ab11
# Parent 28bde69150771a1530f784903bf68214dd5790ea
How to apply this patch:
1. Import and apply it
2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
@ -11,9 +11,10 @@ How to apply this patch:
4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
5. hg qrefresh
diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/base/content/browser-kde.xul Fri May 31 12:55:51 2019 +0200
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,1375 @@
+#filter substitution
+<?xml version="1.0"?>
@ -1390,10 +1391,15 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul
+ <!-- gNotificationBox will be added here lazily. -->
+ </vbox>
+</window>
diff -r 428161c3b959 -r 54d41b0033b8 browser/base/jar.mn
--- a/browser/base/jar.mn Mon Jun 17 09:02:06 2019 +0200
+++ b/browser/base/jar.mn Fri May 31 12:55:51 2019 +0200
@@ -33,6 +33,8 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -28,16 +28,18 @@ browser.jar:
content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml)
* content/browser/browser.css (content/browser.css)
content/browser/browser.js (content/browser.js)
#ifdef MOZ_BROWSER_XHTML
* content/browser/browser.xhtml (content/browser.xhtml)
#else
* content/browser/browser.xul (content/browser.xul)
#endif
@ -1402,10 +1408,20 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/base/jar.mn
content/browser/browser-addons.js (content/browser-addons.js)
content/browser/browser-allTabsMenu.js (content/browser-allTabsMenu.js)
content/browser/browser-captivePortal.js (content/browser-captivePortal.js)
diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js Mon Jun 17 09:02:06 2019 +0200
+++ b/browser/components/preferences/in-content/main.js Fri May 31 12:55:51 2019 +0200
@@ -294,6 +294,13 @@
content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js)
content/browser/browser-customization.js (content/browser-customization.js)
content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
content/browser/browser-contentblocking.js (content/browser-contentblocking.js)
#ifndef MOZILLA_OFFICIAL
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -339,16 +339,23 @@ var gMainPane = {
}, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]);
};
window.setTimeout(() => {
window.requestIdleCallback(pollForDefaultBrowser);
}, backoffTimes[this._backoffIndex]);
}
@ -1419,8 +1435,18 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/m
this.initBrowserContainers();
this.buildContentProcessCountMenuList();
@@ -983,6 +990,17 @@
let performanceSettingsLink = document.getElementById(
"performanceSettingsLearnMore"
);
let performanceSettingsUrl =
Services.urlFormatter.formatURLPref("app.support.baseURL") +
@@ -1146,16 +1153,27 @@ var gMainPane = {
this._backoffIndex = 0;
let shellSvc = getShellService();
if (!shellSvc) {
return;
}
try {
shellSvc.setDefaultBrowser(true, false);
+ if (kde_session == 1) {
@ -1437,10 +1463,20 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/m
} catch (ex) {
Cu.reportError(ex);
return;
diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/moz.build
--- a/browser/components/shell/moz.build Mon Jun 17 09:02:06 2019 +0200
+++ b/browser/components/shell/moz.build Fri May 31 12:55:51 2019 +0200
@@ -33,6 +33,8 @@
}
let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
}
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
@@ -28,16 +28,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
]
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
XPIDL_SOURCES += [
'nsIGNOMEShellService.idl',
]
SOURCES += [
'nsGNOMEShellService.cpp',
@ -1449,9 +1485,15 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/moz.build
]
elif CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/shell/nsKDEShellService.cpp Fri May 31 12:55:51 2019 +0200
'nsWindowsShellService.cpp',
]
LOCAL_INCLUDES += [
'../../../other-licenses/nsis/Contrib/CityHash/cityhash',
]
diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/nsKDEShellService.cpp
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
@ -1603,9 +1645,10 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+}
+
diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/shell/nsKDEShellService.h Fri May 31 12:55:51 2019 +0200
diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/nsKDEShellService.h
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
@ -1639,9 +1682,10 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.
+};
+
+#endif // nskdeshellservice_h____
diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/shell/nsUnixShellService.cpp Fri May 31 12:55:51 2019 +0200
diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/nsUnixShellService.cpp
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
@ -1665,9 +1709,10 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
+}
diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/shell/nsUnixShellService.h Fri May 31 12:55:51 2019 +0200
diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
new file mode 100644
--- /dev/null
+++ b/browser/components/shell/nsUnixShellService.h
@@ -0,0 +1,15 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
@ -1684,10 +1729,15 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+#endif // nsunixshellservice_h____
diff -r 428161c3b959 -r 54d41b0033b8 browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in Mon Jun 17 09:02:06 2019 +0200
+++ b/browser/installer/package-manifest.in Fri May 31 12:55:51 2019 +0200
@@ -299,6 +299,8 @@
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
@@ -295,16 +295,18 @@
@RESPATH@/browser/defaults/settings/main
@RESPATH@/browser/defaults/settings/security-state
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
; Technically this is an app pref file, but we are keeping it in the original
; gre location for now.
@RESPATH@/defaults/pref/channel-prefs.js
@ -1696,3 +1746,8 @@ diff -r 428161c3b959 -r 54d41b0033b8 browser/installer/package-manifest.in
; Services (gre) prefs
@RESPATH@/defaults/pref/services-sync.js
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.
@RESPATH@/res/EditorOverride.css
@RESPATH@/res/contenteditable.css
@RESPATH@/res/designmode.css

3
l10n-68.0.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44dd2756b8666b42e39794952918073a9de16a0e470a57f17baa47703ae3f111
size 49050600

3
l10n-68.1.0esr.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:043dc60ede681bba9c691fde2481af55858a106b527fe133803482061c3d81ec
size 49123892

30
mozilla-bmo1568145.patch Normal file
View File

@ -0,0 +1,30 @@
Author: Bernhard M. Wiedemann <bwiedemann suse de>
Date: 2019-07-22
Allow to override build date with SOURCE_DATE_EPOCH
in order to make builds reproducible.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.
diff --git a/python/mozbuild/mozbuild/action/langpack_manifest.py b/python/mozbuild/mozbuild/action/langpack_manifest.py
index 6f72697..d4cca96 100644
--- a/python/mozbuild/mozbuild/action/langpack_manifest.py
+++ b/python/mozbuild/mozbuild/action/langpack_manifest.py
@@ -16,6 +16,7 @@ import os
import json
import io
import datetime
+import time
import requests
import mozversioncontrol
import mozpack.path as mozpath
@@ -100,7 +101,7 @@ def get_timestamp_for_locale(path):
dt = get_dt_from_hg(path)
if dt is None:
- dt = datetime.datetime.utcnow()
+ dt = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
dt = dt.replace(microsecond=0)
return dt.strftime("%Y%m%d%H%M%S")

29
mozilla-gcc-internal-compiler-error.patch
View File

@ -1,29 +0,0 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 88217eaa8804fc699c02411b1b5377ef7eb5d2db
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90756
https://bugzilla.mozilla.org/show_bug.cgi?id=1562886
diff --git a/gfx/skia/skia/third_party/skcms/src/Transform_inl.h b/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
--- a/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
+++ b/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
@@ -554,17 +554,18 @@ SI void sample_clut_16(const skcms_A2B*
*r = cast<F>((rgb >> 0) & 0xffff) * (1/65535.0f);
*g = cast<F>((rgb >> 16) & 0xffff) * (1/65535.0f);
*b = cast<F>((rgb >> 32) & 0xffff) * (1/65535.0f);
#endif
}
// GCC 7.2.0 hits an internal compiler error with -finline-functions (or -O3)
// when targeting MIPS 64, I think attempting to inline clut() into exec_ops().
-#if 1 && defined(__GNUC__) && !defined(__clang__) && defined(__mips64)
+// s390x and i*86 also hit this with GCC 7.4 and -O2
+#if 1 && defined(__GNUC__) && !defined(__clang__) && ( defined(__mips64) || defined(__s390x__) || defined( __i586__ ) || defined( __i486__ ) || defined( __i386__ ))
#define MAYBE_NOINLINE __attribute__((noinline))
#else
#define MAYBE_NOINLINE
#endif
MAYBE_NOINLINE
static void clut(const skcms_A2B* a2b, F* r, F* g, F* b, F a) {
const int dim = (int)a2b->input_channels;

52
mozilla-kde.patch
View File

@ -3,7 +3,7 @@
# Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
# Parent f11c2d7239c0caa4dc74272716d9e30ced1a1ca3
# Parent 93495ad6fa0fe292eadcbfef14e0e27273528497
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@ -701,23 +701,29 @@ new file mode 100644
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -1042,30 +1042,60 @@ nsUnknownContentTypeDialog.prototype = {
if (params.handlerApp &&
params.handlerApp.executable &&
params.handlerApp.executable.isFile()) {
@@ -1204,36 +1204,66 @@ nsUnknownContentTypeDialog.prototype = {
params.handlerApp &&
params.handlerApp.executable &&
params.handlerApp.executable.isFile()
) {
// Remember the file they chose to run.
this.chosenApp = params.handlerApp;
}
} else if ("@mozilla.org/applicationchooser;1" in Cc) {
- var nsIApplicationChooser = Ci.nsIApplicationChooser;
- var appChooser = Cc["@mozilla.org/applicationchooser;1"]
- .createInstance(nsIApplicationChooser);
- appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle"));
- var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance(
- nsIApplicationChooser
- );
- appChooser.init(
- this.mDialog,
- this.dialogElement("strings").getString("chooseAppFilePickerTitle")
- );
- var contentTypeDialogObj = this;
- let appChooserCallback = function appChooserCallback_done(aResult) {
- if (aResult) {
- contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp);
- contentTypeDialogObj.chosenApp = aResult.QueryInterface(
- Ci.nsILocalHandlerApp
- );
- }
- contentTypeDialogObj.finishChooseApp();
- };
@ -754,13 +760,19 @@ diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downlo
+ });
+ } else {
+ var nsIApplicationChooser = Ci.nsIApplicationChooser;
+ var appChooser = Cc["@mozilla.org/applicationchooser;1"]
+ .createInstance(nsIApplicationChooser);
+ appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle"));
+ var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance(
+ nsIApplicationChooser
+ );
+ appChooser.init(
+ this.mDialog,
+ this.dialogElement("strings").getString("chooseAppFilePickerTitle")
+ );
+ var contentTypeDialogObj = this;
+ let appChooserCallback = function appChooserCallback_done(aResult) {
+ if (aResult) {
+ contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp);
+ contentTypeDialogObj.chosenApp = aResult.QueryInterface(
+ Ci.nsILocalHandlerApp
+ );
+ }
+ contentTypeDialogObj.finishChooseApp();
+ };
@ -770,12 +782,12 @@ diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downlo
+ }
} else {
var nsIFilePicker = Ci.nsIFilePicker;
var fp = Cc["@mozilla.org/filepicker;1"]
.createInstance(nsIFilePicker);
fp.init(this.mDialog,
this.dialogElement("strings").getString("chooseAppFilePickerTitle"),
nsIFilePicker.modeOpen);
var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
fp.init(
this.mDialog,
this.dialogElement("strings").getString("chooseAppFilePickerTitle"),
nsIFilePicker.modeOpen
);
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp

4
source-stamp.txt
View File

@ -1,2 +1,2 @@
REV=7ece03f6971968eede29275477502309bbe399da
REPO=http://hg.mozilla.org/releases/mozilla-release
REV=380fedbb18002297f1b233bd9c09764e59ddaa86
REPO=http://hg.mozilla.org/releases/mozilla-esr68

8
tar_stamps
View File

@ -1,8 +1,8 @@
PRODUCT="firefox"
CHANNEL="release"
VERSION="68.0.2"
VERSION_SUFFIX=""
FF_RELEASE_TAG="7ece03f6971968eede29275477502309bbe399da"
CHANNEL="esr68"
VERSION="68.1.0"
VERSION_SUFFIX="esr"
FF_RELEASE_TAG="380fedbb18002297f1b233bd9c09764e59ddaa86"
TB_RELEASE_TAG=""
PREV_VERSION=""
PREV_VERSION_SUFFIX=""