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

Accepting request 929844 from mozilla:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/929844
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=349
This commit is contained in:
Dominique Leuenberger 2021-11-08 16:24:08 +00:00 committed by Git OBS Bridge
commit 577f513dd4
15 changed files with 114 additions and 710 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
MozillaFirefox.changes
View File

@ -1,3 +1,58 @@
-------------------------------------------------------------------
Fri Nov 5 18:02:48 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- Mozilla Firefox 94.0.1:
* fixes for other platforms
-------------------------------------------------------------------
Sat Oct 30 07:52:22 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
- Mozilla Firefox 94.0
* https://www.mozilla.org/en-US/firefox/94.0/releasenotes
MFSA 2021-48 (bsc#1192250)
* CVE-2021-38503 (bmo#1729517)
iframe sandbox rules did not apply to XSLT stylesheets
* CVE-2021-38504 (bmo#1730156)
Use-after-free in file picker dialog
* CVE-2021-38505 (bmo#1730194)
Windows 10 Cloud Clipboard may have recorded sensitive user data
* CVE-2021-38506 (bmo#1730750)
Firefox could be coaxed into going into fullscreen mode
without notification or warning
* CVE-2021-38507 (bmo#1730935)
Opportunistic Encryption in HTTP2 could be used to bypass the
Same-Origin-Policy on services hosted on other ports
* MOZ-2021-0003 (bmo#1736886)
Universal XSS in Firefox for Android via QR Code URLs
* CVE-2021-38508 (bmo#1366818)
Permission Prompt could be overlaid, resulting in user
confusion and potential spoofing
* MOZ-2021-0004 (bmo#1659155)
Web Extensions could access pre-redirect URL when their
context menu was triggered by a user
* CVE-2021-38509 (bmo#1718571)
Javascript alert box could have been spoofed onto an
arbitrary domain
* CVE-2021-38510 (bmo#1731779)
Download Protections were bypassed by .inetloc files on Mac OS
* MOZ-2021-0005 (bmo#1719203)
'Copy Image Link' context menu action could have been abused
to see authentication tokens
* MOZ-2021-0006 (bmo#1724233)
URL Parsing may incorrectly parse internationalized domains
* MOZ-2021-0007 (bmo#1606864, bmo#1712671, bmo#1730048, bmo#1735152)
Memory safety bugs fixed in Firefox 94 and Firefox ESR 91.3
- removed obsolete patches
* mozilla-bmo1602730.patch
* mozilla-bmo1725828.patch
* mozilla-bmo1729124.patch
- requires
NSS >= 3.71
rust >= 1.53
- fix Plasma detection (boo#1191825)
- fix Link error "undefined hidden symbol:"
https://github.com/openSUSE/firefox-maintenance/issues/37
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 26 19:48:24 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org> Tue Oct 26 19:48:24 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>

20
MozillaFirefox.spec
View File

@ -28,9 +28,9 @@
# orig_suffix b3 # orig_suffix b3
# major 69 # major 69
# mainver %major.99 # mainver %major.99
%define major 93 %define major 94
%define mainver %major.0 %define mainver %major.0.1
%define orig_version 93.0 %define orig_version 94.0.1
%define orig_suffix %{nil} %define orig_suffix %{nil}
%define update_channel release %define update_channel release
%define branding 1 %define branding 1
@ -100,13 +100,13 @@ BuildRequires: gcc9-c++
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif %endif
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300 %if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300
BuildRequires: cargo >= 1.51 BuildRequires: cargo >= 1.53
BuildRequires: rust >= 1.51 BuildRequires: rust >= 1.53
%else %else
# Newer sle/leap/tw use parallel versioned rust releases which have # Newer sle/leap/tw use parallel versioned rust releases which have
# a different method for provides that we can use to request a # a different method for provides that we can use to request a
# specific version # specific version
BuildRequires: rust+cargo >= 1.51 BuildRequires: rust+cargo >= 1.53
%endif %endif
%if 0%{useccache} != 0 %if 0%{useccache} != 0
BuildRequires: ccache BuildRequires: ccache
@ -118,7 +118,7 @@ BuildRequires: libiw-devel
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
BuildRequires: makeinfo BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.32 BuildRequires: mozilla-nspr-devel >= 4.32
BuildRequires: mozilla-nss-devel >= 3.70 BuildRequires: mozilla-nss-devel >= 3.71
BuildRequires: nasm >= 2.14 BuildRequires: nasm >= 2.14
BuildRequires: nodejs >= 10.22.1 BuildRequires: nodejs >= 10.22.1
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
@ -218,15 +218,12 @@ Patch19: mozilla-bmo1512162.patch
Patch20: mozilla-fix-top-level-asm.patch Patch20: mozilla-fix-top-level-asm.patch
Patch21: mozilla-bmo1504834-part4.patch Patch21: mozilla-bmo1504834-part4.patch
Patch22: mozilla-bmo849632.patch Patch22: mozilla-bmo849632.patch
Patch24: mozilla-bmo1602730.patch
Patch25: mozilla-bmo998749.patch Patch25: mozilla-bmo998749.patch
Patch26: mozilla-bmo1626236.patch Patch26: mozilla-bmo1626236.patch
Patch27: mozilla-s390x-skia-gradient.patch Patch27: mozilla-s390x-skia-gradient.patch
Patch28: mozilla-libavcodec58_91.patch Patch28: mozilla-libavcodec58_91.patch
Patch29: mozilla-silence-no-return-type.patch Patch29: mozilla-silence-no-return-type.patch
Patch30: mozilla-bmo1725828.patch
Patch31: mozilla-bmo531915.patch Patch31: mozilla-bmo531915.patch
Patch32: mozilla-bmo1729124.patch
# Firefox/browser # Firefox/browser
Patch101: firefox-kde.patch Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch Patch102: firefox-branded-icons.patch
@ -349,15 +346,12 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
%patch22 -p1 %patch22 -p1
%patch24 -p1
%patch25 -p1 %patch25 -p1
%patch26 -p1 %patch26 -p1
%patch27 -p1 %patch27 -p1
%patch28 -p1 %patch28 -p1
%patch29 -p1 %patch29 -p1
%patch30 -p1
%patch31 -p1 %patch31 -p1
%patch32 -p1
# Firefox # Firefox
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmFSUkoACgkQ6+QekPbx
L21kLg/+M7Bkacd7Tteq58iHOZQPbKbQqWAfDUjUh3wS66oxqZJbyxkzk9CN6o5e
f91WnoFLXN7RkxlXl8kAKYFgvjPfhJmeGHYDgZ50Yuyey42y5w2k+Aoefl0svTOY
gQrCU1txt67VnsC51oqrfMxIJiePGzGGMr76QqVmEsS5nkqzzs3YzPL1A63ifrUU
h+AnHdkxqZNtTN5CsYVuwVAWXfTF4oZrC3jNkQhOtHokKTWwmwUXCsE88mnEn9b1
wohuOuaIscKj4M/RQfYWm+9IJKEj/Ov+53XV5wHg2hF+9qaaaYd7WI12PPXtFEl9
h/dbu/8nw6OooQlH54ImkVA51mIlx1WFo8gOv6NtXFIQo9ggowX0u42yflogYSzS
kiDelRGZ+wv9GbTHB1/iBlV+JcRba67Mu2r0dxkjXDTHI3VRfkio2fuhgMxXqqfg
5/Wh8laLAseLQjjlJcWi0RNAL25QxVQk3dwTuQN8Hch8IZk6F+prt8GEDbovxrIz
vaD28L2cLf3E40HyKMOEZUEaBEp3V5yMWf3arBLg3XbYIQg0AG45x212OUDtxVw8
8rMGUsDtIsLX/skN0kPgVoyZHVX7XUqwa0HIDu7mBoQti36xjZ//F+HY0KxCkpj0
cVJRP2cXIhcOQhRL0XS3FZ9ZLBYvT2j69Oa5YRTsgNN1HG9zERc=
=m1VV
-----END PGP SIGNATURE-----

3
firefox-94.0.1.source.tar.xz Normal file
View File

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmGCuVoACgkQ6+QekPbx
L23WjA/9Hdd6nOFRxKVl+kE6zOh6wi2/wj0xPDa7CdV3fT8deZ+2HwkfH5Wq7fV2
4UC2HkpbN2xIxkWNu3AaBrPmIZvtW+82UTQOR1q7BdC3WMTTjjDsYqepRbNGP/1C
HDJ3jVg2bQvD/k8NLiA0QwSxFvvaWiMFA8EZVXsLcr5acSwEndz7dxJs4BTvETfB
nW16gwCfnl3aZ36/wfTl9IOCO0a7YB852ycejSTlI0T/a4Z9FFtDiBma05tmJD6F
lArHxZzrXk9W6F1WwSNlnbOLeIbA1fmLIFNLRn67inzyDaSJobLZCmR5NBQ6mvWV
7Cik9W1Adn7uLpsYXlkHizFlAdxLUjWbjgL7aB1yWMbRONYQ1+YTxIH+0S6PoTwG
R016qglsQdviQtEJpYDENBDNmNnZ/3MOmATOVftH2lm+DMAGJT4wrrMqZr9cB4Xi
LEDMqJogw1sT89PE0rs40SjemVqxshv/UdDuyTI88gVVUCFo8nBvr84rbzSKdxUb
gOS0WEti9gmFelPx85FJP9RgswPezSBTCTZtDe2BomljzBENJs/90+ciaHT5+iLS
OpKt1fDMJdMSU24snN7eoRWJ20CW/mSS7+1mDEzANVpjw3GwAbBS1oLDqc8TmUEN
43bb2XQEW52tRTXSnX/MTIWcoHhLjkX5y0BJDOaJUuNxqWKLd2E=
=fBbA
-----END PGP SIGNATURE-----

16
firefox-kde.patch
View File

@ -3,7 +3,7 @@
# Date 1559300151 -7200 # Date 1559300151 -7200
# Fri May 31 12:55:51 2019 +0200 # Fri May 31 12:55:51 2019 +0200
# Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec # Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec
# Parent 856ef9c699423b1cd35e4df8745e78c409c8dbae # Parent 23d64c5753fda6f201477fe1f2f6cf1fb1657ccc
How to apply this patch: How to apply this patch:
1. Import and apply it 1. Import and apply it
2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul 2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
@ -14,7 +14,7 @@ How to apply this patch:
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
--- a/browser/components/preferences/main.js --- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js
@@ -338,16 +338,23 @@ var gMainPane = { @@ -353,16 +353,23 @@ var gMainPane = {
}, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]); }, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]);
}; };
@ -38,7 +38,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
); );
let performanceSettingsUrl = let performanceSettingsUrl =
Services.urlFormatter.formatURLPref("app.support.baseURL") + Services.urlFormatter.formatURLPref("app.support.baseURL") +
@@ -1313,16 +1320,27 @@ var gMainPane = { @@ -1365,16 +1372,27 @@ var gMainPane = {
this._backoffIndex = 0; this._backoffIndex = 0;
let shellSvc = getShellService(); let shellSvc = getShellService();
@ -69,7 +69,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
--- a/browser/components/shell/moz.build --- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build
@@ -32,16 +32,18 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "coco @@ -31,16 +31,18 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "coco
] ]
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
XPIDL_SOURCES += [ XPIDL_SOURCES += [
@ -92,7 +92,7 @@ diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/components/shell/nsKDEShellService.cpp +++ b/browser/components/shell/nsKDEShellService.cpp
@@ -0,0 +1,103 @@ @@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- 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 +/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this + * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -196,6 +196,12 @@ new file mode 100644
+ return NS_ERROR_NOT_IMPLEMENTED; + return NS_ERROR_NOT_IMPLEMENTED;
+} +}
+ +
+NS_IMETHODIMP
+nsKDEShellService::IsDefaultForScheme(nsTSubstring<char> const& aScheme, bool* aIsDefaultBrowser)
+{
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
+
diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null

3
l10n-93.0.tar.xz
View File

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

3
l10n-94.0.1.tar.xz Normal file
View File

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

25
mozilla-bmo1602730.patch
View File

@ -1,25 +0,0 @@
# HG changeset patch
# User msirringhaus@suse.de
# Date 1582805890 -3600
# Thu Feb 27 13:18:10 2020 +0100
# Node ID 457cbe5705f2a3759d3da36a05c0ed66ec61ea12
# Parent 7440f4b6bab85068ca2f84e9c48e0706d04330e8
imported patch mozilla-bmo1602730-FF73.patch
diff -r 7440f4b6bab8 gfx/layers/composite/CompositableHost.cpp
--- a/gfx/layers/composite/CompositableHost.cpp Thu Feb 27 13:17:56 2020 +0100
+++ b/gfx/layers/composite/CompositableHost.cpp Wed Jun 17 15:33:32 2020 +0200
@@ -92,9 +92,13 @@
}
MOZ_ASSERT(source);
+ // Setting an alpha-mask here breaks the URL-bar on big endian (s390x)
+ // if the typed URL is too long for the textbox (automatic scrolling needed)
+#if MOZ_LITTLE_ENDIAN()
RefPtr<EffectMask> effect =
new EffectMask(source, source->GetSize(), aTransform);
aEffects.mSecondaryEffects[EffectTypes::MASK] = effect;
+#endif
return true;
}

553
mozilla-bmo1725828.patch
View File

@ -1,553 +0,0 @@
# HG changeset patch
# Parent fbca0d2a522cd1ab78001476293d3d79bfabb4cf
<!DOCTYPE html>
<html lang='en'>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>Tree - rpms/firefox - src.fedoraproject.org</title>
<link rel="shortcut icon" type="image/vnd.microsoft.icon"
href="/theme/static/favicon.ico?version=5.13.2"/>
<link href="/theme/static/fedora-bootstrap-1.3.0/fedora-bootstrap.min.css?version=5.13.2"
type="text/css" rel="stylesheet" />
<link href="/theme/static/fonts/fonts.css?version=5.13.2"
rel="stylesheet" type="text/css" />
<link href="/theme/static/fonts/hack_fonts/css/hack-extended.min.css?version=5.13.2"
type="text/css" rel="stylesheet" />
<link href="/theme/static/theme.css?version=5.13.2"
type="text/css" rel="stylesheet" />
<link type="text/css" rel="stylesheet" nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ" href="/static/vendor/font-awesome/font-awesome.css?version=5.13.2"/>
<link type="text/css" rel="stylesheet" nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ" href="/static/pagure.css?version=5.13.2"/>
<link nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ" rel="stylesheet" href="/static/vendor/highlight.js/styles/github.css?version=5.13.2"/>
<link nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ" rel="stylesheet" href="/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.css?version=5.13.2"/>
<style nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ">
.hljs {
background: #fff;
}
</style>
</head>
<body id="home">
<!-- start masthead -->
<nav class="navbar navbar-light masthead p-0 navbar-expand">
<div class="container">
<a href="/" class="navbar-brand">
<img height=40px src="/theme/static/pagure-logo.png?version=5.13.2"
alt="pagure Logo" id="pagureLogo"/>
</a>
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="btn btn-primary" href="/login/?next=https://src.fedoraproject.org/rpms/firefox/blob/fc69159c16b8035abdc07e69134357970f6b516f/f/mozilla-1725828.patch">Log In</a>
</li>
</ul>
</div>
</nav>
<!-- close masthead-->
<div class="bodycontent">
<div class="bg-light border border-bottom pt-3">
<div class="container">
<div class="row mb-3">
<div class="col-6">
<div class="row">
<div class="col-auto pr-0">
<h3>
<i class="fa fa-archive text-muted"></i></h3>
</div>
<div class="col-auto pl-2">
<h3 class="mb-0">
<a href="/projects/rpms/%2A">rpms</a>&nbsp;/&nbsp;<a href="/rpms/firefox"><strong>firefox</strong></a>
</h3>
</div>
</div>
</div>
<div class="col-6 text-right">
<div class="btn-group">
<div class="btn-group">
<a href="#"
class="btn btn-sm dropdown-toggle btn-outline-primary"
data-toggle="dropdown" id="watch-button">
<i class="fa fa-clone fa-fw"></i>
<span>Clone</span>
</a>
<div class="dropdown-menu dropdown-menu-right">
<div class="m-3" id="source-dropdown" class="pointer">
<div>
<h5><strong>Source Code</strong></h5>
<div class="form-group">
<div class="input-group input-group-sm">
<div class="input-group-prepend"><span class="input-group-text">GIT</span></div>
<input class="form-control bg-white select-on-focus" type="text" value="https://src.fedoraproject.org/rpms/firefox.git" readonly>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<ul class="nav nav-tabs nav-small border-bottom-0">
<li class="nav-item mr-2 text-dark">
<a class="nav-link active" href="/rpms/firefox">
<i class="fa fa-code fa-fw text-muted"></i>
<span class="d-none d-md-inline">Source</span>
</a>
</li>
<li class="nav-item mr-2 text-dark">
<a class="nav-link" href="https://bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&classification=Fedora&product=Fedora&product=Fedora EPEL&component=firefox">
<i class="fa fa-fw text-muted fa-exclamation-circle"></i>
<span class="d-none d-md-inline">Issues&nbsp;</span>
<span class="fa fa-external-link"></span>
</a>
</li>
<li class="nav-item mr-2 text-dark">
<a class="nav-link" href="/rpms/firefox/pull-requests">
<i class="fa fa-fw text-muted fa-arrow-circle-down"></i>
<span class="d-none d-md-inline">Pull Requests&nbsp;</span>
<span class="badge badge-secondary py-0 d-none d-md-inline">
0
</span>
</a>
</li>
<li class="nav-item mr-2 text-dark">
<a class="nav-link" href="/rpms/firefox/stats">
<i class="fa fa-line-chart fa-fw text-muted"></i>
<span class="d-none d-md-inline">Stats</span>
</a>
</li>
</ul>
</div>
</div>
<div class="container pt-5 repo-body-container">
<div class="row">
<div class="col-2">
<nav class="nav nav-tabs nav-sidetabs flex-column">
<a class=
"nav-link nowrap
"
href="/rpms/firefox">
<i class="fa fa-home text-muted fa-fw"></i>&nbsp;<span class="d-none d-md-inline">Overview</span>
</a>
<a class=
"nav-link nowrap
active"
href="/rpms/firefox/tree/fc69159c16b8035abdc07e69134357970f6b516f">
<i class="fa fa-file-code-o text-muted fa-fw"></i>&nbsp;Files
</a>
<a class=
"nav-link nowrap
"
href="/rpms/firefox/commits/fc69159c16b8035abdc07e69134357970f6b516f">
<i class="fa fa-list-alt text-muted fa-fw" data-glyph="spreadsheet"></i>&nbsp;Commits
</a>
<a class=
"nav-link nowrap
"
href="/rpms/firefox/branches?branchname=fc69159c16b8035abdc07e69134357970f6b516f">
<i class="fa fa-random text-muted fa-fw"></i>&nbsp;Branches
</a>
<a class=
"nav-link nowrap
"
href="/rpms/firefox/forks">
<i class="fa fa-code-fork text-muted fa-fw"></i>&nbsp;Forks
</a>
<a class=
"nav-link nowrap
"
href="/rpms/firefox/releases">
<i class="fa fa-tags text-muted fa-fw"></i>&nbsp;Releases
</a>
<div class="col-xs-2 line-height-1"></div>
<h6>Monitoring status:</h6>
<div class="btn-group">
<button title="Monitoring status" class="btn btn-sm btn-outline-primary disabled"
id="monitoring-button">
<i id="monitoring-icon" class="fa fa-fw fa-eye"></i>
<span id="monitoring-label" class="fa fa-circle-o-notch fa-spin fa-1x fa-fw"></span>
</button>
</div>
<div class="col-xs-2 line-height-1"></div>
<div id="orphan-section" class="pt-3">
<div class="col-xs-2 line-height-1"></div>
</div>
<div class="pt-3">
<div class="col-xs-2 line-height-1">
<h6>Bugzilla Assignee:</h6>
<dl>
<dt>Fedora: </dt>
<dd id="fedora_assignee_txt">
gecko-maint
</dd>
<dt>EPEL: </dt>
<dd id="epel_assignee_txt">
gecko-maint
</dd>
</dl>
</div>
</div>
<div class="modal fade" id="modal_assignee" tabindex="-1"
role="dialog" aria-labelledby="Bugzilla assignee" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Bugzilla Assignee</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
<span class="sr-only">Close</span>
</button>
</div>
<form id="change_assignees">
<div class="modal-body">
<label for="fedora_assignee">Fedora</label>
<input title="Default assignee for Fedora in bugzilla - Empty input resets to default"
class="form-control" name="fedora_assignee" id="fedora_assignee" value="gecko-maint"/>
<label for="epel_assignee">EPEL</label>
<input title="Default assignee for EPEL in bugzilla (if applicable) - Empty input resets to default"
class="form-control" name="epel_assignee" id="epel_assignee" value="gecko-maint" />
<p class="pt-2">
These two fields allow to specify a different default assignee for ticket opened against
this package in bugzilla. Note: The EPEL field is
always displayed for packages in the 'rpms' namespace regardless of whether it
is used in bugzilla or not. </p>
</div>
<div class="modal-footer">
<button class="btn btn-secondary" type="button" title="Update bugzilla overrides" id="reset_assignees">
Reset to defaults
</button>
<button class="btn btn-primary" type="submit" title="Update bugzilla overrides" id="update_assignees">
Update
</button>
</div>
</form>
</div>
</div>
</div>
<div class="modal fade" id="modal_orphan" tabindex="-1"
role="dialog" aria-labelledby="Orphan this package" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Orphan package</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
<span class="sr-only">Close</span>
</button>
</div>
<div class="modal-body">
<div class="form-group">
<label for="reason_menu">Reason</label>
<select id="reason_menu" class="form-control">
<option id="lack_of_time_option_button">Lack of time</option>
<option id="do_not_use_it_option_button">Do not use it anymore</option>
<option id="unmaintained_option_button">Unmaintained upstream</option>
<option id="fails_to_build_option_button">Fails to build from source</option>
<option id="not_fixed_option_button">Important bug not fixed</option>
<option id="other_option_button">Other</option>
</select>
</div>
<label for="orphan_reason_info">Additional info</label>
<input title="Additional info for orphaning reason"
class="form-control" name="orphan_reason_info" id="orphan_reason_info" value=""/>
</div>
<div class="modal-footer">
<button class="btn btn-primary" type="submit" title="Orphan this package" id="orphan_button">
Update
</button>
</div>
</div>
</div>
</div>
<script type="text/javascript" nonce="5VHCMUQ81dmw6zbPtdKqrXAJZ">
window.addEventListener('load', function() {
set_up_monitoring = function(status){
var _label = "Disabled"
if (status === "monitoring") {
_label = "Monitoring";
$("#monitoring-icon").attr("class", "fa fa-fw fa-eye")
} else if (status === "monitoring-with-scratch") {
_label = "Scratch builds"
$("#monitoring-icon").attr("class", "fa fa-fw fa-eye")
} else {
$("#monitoring-icon").attr("class", "fa fa-fw fa-eye-slash")
}
$("#monitoring-label").text(_label);
$("#monitoring-label").removeClass("fa fa-circle-o-notch fa-spin fa-1x fa-fw");
}
$.ajax({
url: "/_dg/anitya/rpms/firefox",
type: 'GET',
dataType: 'json',
success: function(res) {
console.log(res);
set_up_monitoring(res.monitoring)
}
});
$("#reset_assignees").on('click', function(){
$('#fedora_assignee').val('');
$('#epel_assignee').val('');
$("#change_assignees").submit();
return false;
});
$("#change_assignees").on('submit', function(){
$('html').css('cursor', 'progress');
$('#reset_assignees').attr('disabled', true);
$('#update_assignees').attr('disabled', true);
$('#update_assignees').text('Updating...');
$.ajax({
url: "/_dg/bzoverrides/rpms/firefox",
type: 'POST',
dataType: 'json',
data: {
'epel_assignee': $('#epel_assignee').val(),
'fedora_assignee': $('#fedora_assignee').val()
},
success: function(res) {
$("#fedora_assignee_txt").text(res.fedora_assignee);
$("#epel_assignee_txt").text(res.epel_assignee);
$('#modal_assignee').modal('hide');
$('#reset_assignees').attr('disabled', false);
$('#update_assignees').attr('disabled', false);
$('#update_assignees').text('Update');
$('html').css('cursor', 'default');
console.log("Successfully changed the bugzilla assignees");
return false;
},
error: function(res) {
var msg = '';
if(res.responseJSON.errors){
msg = ': ' + res.responseJSON.errors.join(', ');
}
alert("Unable to update the bugzilla assignee(s)" + msg);
$('html').css('cursor', 'default');
$('#reset_assignees').attr('disabled', false);
$('#update_assignees').attr('disabled', false);
$('#update_assignees').text('Update');
return false;
}
})
return false;
});
$.ajax({
url: "/_dg/actived/rpms/firefox",
type: 'GET',
dataType: 'json',
success: function(res) {
var _btn = $("#take_orphan_button");
if (!res.active){
_btn.off("click");
_btn.click(function(){
window.open(
"https://pagure.io/releng/new_issue?title="
+ "Unretire rpms/firefox"
+ "&amp;template=package_unretiremet");
});
_btn.prop( "title", "Package retired - Open a releng ticket to adopt it" );
_btn.html("Retired");
}
_btn.removeClass('disabled');
}
});
$("#orphan_button").click(function(){
$("#orphan_button").attr("disabled", true);
$.ajax({
url: "/_dg/orphan/rpms/firefox",
type: 'POST',
dataType: 'json',
data: {
'orphan_reason': $('#reason_menu').val(),
'orphan_reason_info': $('#orphan_reason_info').val()
},
success: function(res) {
$("#point_of_contact_div").html("Package is currently unmaintained");
$("#orphan_button").attr("disabled", false);
$('#modal_orphan').modal('hide');
$('#orphan-section').html('');
},
error: function(res) {
if (res.responseJSON.errors) {
alert('Unable to orphan the package: ' + res.responseJSON.errors);
} else {
alert('Unable to orphan the package: ' + res.responseJSON.error);
}
$("#orphan_button").attr("disabled", false);
}
});
});
});
</script>
</nav> </div>
<div class="col-10">
<div class="row mb-1">
<div class="col-sm-6">
<h3>
Files
</h3>
</div>
<div class="col-sm-6">
<div class="float-right">
<a href="#" class="btn btn-outline-light border-secondary text-dark btn-sm"
aria-haspopup="true" aria-expanded="false">
Commit: <span class="font-weight-bold">fc69159c16b8035abdc07e69134357970f6b516f</span>
</a>
</div>
</div>
</div>
<div class="card mb-3">
<div class="card-header">
<ol class="breadcrumb p-0 bg-transparent mb-0">
<li class="breadcrumb-item">
<a href="/rpms/firefox/tree/fc69159c16b8035abdc07e69134357970f6b516f">
<span class="fa fa-random">
</span>&nbsp; fc69159c16b8035abdc07e69134357970f6b516f
</a>
</li>
<li class="active breadcrumb-item">
<span class="fa fa-file" data-glyph="">
</span>&nbsp; mozilla-1725828.patch
</li>
</ol>
</div>
<div class="card-body p-0">
<div class="bg-light border text-right pr-2">
<form class="btn btn-sm" method="POST" name="fork_project"
action="/fork_edit/rpms/firefox/edit/fc69159c16b8035abdc07e69134357970f6b516f/f/mozilla-1725828.patch">
<button class="btn btn-sm btn-secondary fork_project_btn">
Fork and Edit
</button>
</form>
<a class="btn btn-secondary btn-sm" href="/rpms/firefox/blob/fc69159c16b8035abdc07e69134357970f6b516f/f/mozilla-1725828.patch" title="View as blob">Blob</a>
<a class="btn btn-secondary btn-sm" href="/rpms/firefox/blame/mozilla-1725828.patch?identifier=fc69159c16b8035abdc07e69134357970f6b516f" title="View git blame">Blame</a>
<a class="btn btn-secondary btn-sm" href="/rpms/firefox/history/mozilla-1725828.patch?identifier=fc69159c16b8035abdc07e69134357970f6b516f" title="View git log for this file">History</a>
<a class="btn btn-secondary btn-sm" href="/rpms/firefox/raw/fc69159c16b8035abdc07e69134357970f6b516f/f/mozilla-1725828.patch" title="View as raw">Raw</a>
</div>
<pre class="syntaxhighlightblock"><code class="lang-diff">diff -up firefox-92.0/dom/media/gmp/GMPChild.cpp.1725828 firefox-92.0/dom/media/gmp/GMPChild.cpp
diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
--- a/dom/media/gmp/GMPChild.cpp
+++ b/dom/media/gmp/GMPChild.cpp
@@ -227,18 +227,24 @@ mozilla::ipc::IPCResult GMPChild::RecvPr
.EqualsASCII(lib.Data(), lib.Length())) {
LoadLibraryW(char16ptr_t(whiteListedLib));
break;
}
}
}
#elif defined(XP_LINUX)
constexpr static const char* whitelist[] = {
+ // NSS libraries used by clearkey.
"libfreeblpriv3.so",
"libsoftokn3.so",
+ // glibc libraries merged into libc.so.6; see bug 1725828 and
+ // the corresponding code in GMPParent.cpp.
+ "libdl.so.2",
+ "libpthread.so.0",
+ "librt.so.1",
};
nsTArray<nsCString> libs;
SplitAt(", ", aLibs, libs);
for (const nsCString& lib : libs) {
for (const char* whiteListedLib : whitelist) {
if (lib.EqualsASCII(whiteListedLib)) {
auto libHandle = dlopen(whiteListedLib, RTLD_NOW | RTLD_GLOBAL);
@@ -251,17 +257,17 @@ mozilla::ipc::IPCResult GMPChild::RecvPr
if (error) {
// We should always have an error, but gracefully handle just in
// case.
nsAutoCString nsError{error};
CrashReporter::AppendAppNotesToCrashReport(nsError);
}
// End bug 1698718 logging.
- MOZ_CRASH("Couldn't load lib needed by NSS");
+ MOZ_CRASH("Couldn't load lib needed by media plugin");
}
}
}
}
#endif
return IPC_OK();
}
diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
--- a/dom/media/gmp/GMPParent.cpp
+++ b/dom/media/gmp/GMPParent.cpp
@@ -871,16 +871,30 @@ RefPtr<GenericPromise> GMPParent::ParseC
mLibs = "dxva2.dll"_ns;
#endif
} else {
GMP_PARENT_LOG_DEBUG("%s: Unrecognized key system: %s, failing.",
__FUNCTION__, mDisplayName.get());
return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
}
+#ifdef XP_LINUX
+ // These glibc libraries were merged into libc.so.6 as of glibc
+ // 2.34; they now exist only as stub libraries for compatibility and
+ // newly linked code won&#39;t depend on them, so we need to ensure
+ // they&#39;re loaded for plugins that may have been linked against a
+ // different version of glibc. (See also bug 1725828.)
+ if (!mDisplayName.EqualsASCII("clearkey")) {
+ if (!mLibs.IsEmpty()) {
+ mLibs.AppendLiteral(", ");
+ }
+ mLibs.AppendLiteral("libdl.so.2, libpthread.so.0, librt.so.1");
+ }
+#endif
+
nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs);
nsTArray<nsCString> codecs;
SplitAt(",", codecsString, codecs);
// Parse the codec strings in the manifest and map them to strings used
// internally by Gecko for capability recognition.
//
// Google's code to parse manifests can be used as a reference for strings

50
mozilla-bmo1729124.patch
View File

@ -1,50 +0,0 @@
# HG changeset patch
# User Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
# Date 1631000649 0
# Node ID eac40293649628d32911c909219d514bebb8ce63
# Parent 6582d77235867224aaf8621bad8ee167dfb31460
Bug 1729124 - [MIPS64][ARM64] Fix gcc build issue. r=lth
The SpecificRegs struct needs a constructor.
Differential Revision: https://phabricator.services.mozilla.com/D124535
diff --git a/js/src/wasm/WasmBCRegDefs.h b/js/src/wasm/WasmBCRegDefs.h
--- a/js/src/wasm/WasmBCRegDefs.h
+++ b/js/src/wasm/WasmBCRegDefs.h
@@ -374,25 +374,31 @@ struct SpecificRegs {
};
#elif defined(JS_CODEGEN_ARM)
struct SpecificRegs {
RegI64 abiReturnRegI64;
SpecificRegs() : abiReturnRegI64(ReturnReg64) {}
};
#elif defined(JS_CODEGEN_ARM64)
-struct SpecificRegs {};
+struct SpecificRegs {
+ // Required by gcc.
+ SpecificRegs() {}
+};
#elif defined(JS_CODEGEN_MIPS32)
struct SpecificRegs {
RegI64 abiReturnRegI64;
SpecificRegs() : abiReturnRegI64(ReturnReg64) {}
};
#elif defined(JS_CODEGEN_MIPS64)
-struct SpecificRegs {};
+struct SpecificRegs {
+ // Required by gcc.
+ SpecificRegs() {}
+};
#else
struct SpecificRegs {
# ifndef JS_64BIT
RegI64 abiReturnRegI64;
# endif
SpecificRegs() { MOZ_CRASH("BaseCompiler porting interface: SpecificRegs"); }
};

39
mozilla-kde.patch
View File

@ -3,7 +3,7 @@
# Date 1559294891 -7200 # Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200 # Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
# Parent 0dd1b6436342922d434e7c818875b2a02a73b5ed # Parent 9eb4df0e07175ce38fc6699b2b8544b9eda7f0ad
Description: Add KDE integration to Firefox (toolkit parts) Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com> Author: Lubos Lunak <lunak@suse.com>
@ -370,7 +370,7 @@ diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/toolkit/xre/nsKDEUtils.cpp +++ b/toolkit/xre/nsKDEUtils.cpp
@@ -0,0 +1,344 @@ @@ -0,0 +1,321 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public +/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this + * License, v. 2.0. If a copy of the MPL was not distributed with this
@ -411,34 +411,11 @@ new file mode 100644
+ +
+static bool getKdeSession() +static bool getKdeSession()
+{ +{
+ Display* dpy = XOpenDisplay( NULL ); + if (PR_GetEnv("KDE_FULL_SESSION"))
+ if( dpy == NULL ) + {
+ return true;
+ }
+ return false; + return false;
+ Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", true );
+ bool kde = false;
+ if( kde_full_session != None )
+ {
+ int cnt;
+ if( Atom* props = XListProperties( dpy, DefaultRootWindow( dpy ), &cnt ))
+ {
+ for( int i = 0;
+ i < cnt;
+ ++i )
+ {
+ if( props[ i ] == kde_full_session )
+ {
+ kde = true;
+#ifdef DEBUG_KDE
+ fprintf( stderr, "KDE SESSION %d\n", kde );
+#endif
+ break;
+ }
+ }
+ XFree( props );
+ }
+ }
+ XCloseDisplay( dpy );
+ return kde;
+} +}
+ +
+static bool getKdeSupport() +static bool getKdeSupport()
@ -1283,7 +1260,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
--- a/widget/gtk/moz.build --- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build +++ b/widget/gtk/moz.build
@@ -137,16 +137,17 @@ FINAL_LIBRARY = "xul" @@ -136,16 +136,17 @@ FINAL_LIBRARY = "xul"
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
"/layout/base", "/layout/base",
@ -1845,7 +1822,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
# include "prmem.h" # include "prmem.h"
# include "plbase64.h" # include "plbase64.h"
@@ -2023,62 +2024,77 @@ nsLocalFile::SetPersistentDescriptor(con @@ -2025,62 +2026,77 @@ nsLocalFile::SetPersistentDescriptor(con
NS_IMETHODIMP NS_IMETHODIMP
nsLocalFile::Reveal() { nsLocalFile::Reveal() {

12
mozilla-silence-no-return-type.patch
View File

@ -1,10 +1,10 @@
# HG changeset patch # HG changeset patch
# Parent 45a1eadbae67aa05c6fa271d3dec5ac1cb0cfae8 # Parent 9b29b6b7548b93a599167774e747f6e0661cfbe1
diff --git a/Cargo.lock b/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock
--- a/Cargo.lock --- a/Cargo.lock
+++ b/Cargo.lock +++ b/Cargo.lock
@@ -2039,18 +2039,16 @@ name = "glsl-to-cxx" @@ -2078,18 +2078,16 @@ name = "glsl-to-cxx"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"glsl", "glsl",
@ -20,9 +20,9 @@ diff --git a/Cargo.lock b/Cargo.lock
] ]
[[package]] [[package]]
name = "goblin" name = "gluesmith"
version = "0.1.3" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@ -33,7 +33,7 @@ diff --git a/Cargo.toml b/Cargo.toml
chardetng = { git = "https://github.com/hsivonen/chardetng", rev="302c995f91f44cf26e77dc4758ad56c3ff0153ad" } chardetng = { git = "https://github.com/hsivonen/chardetng", rev="302c995f91f44cf26e77dc4758ad56c3ff0153ad" }
chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" } chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }
libudev-sys = { path = "dom/webauthn/libudev-sys" } libudev-sys = { path = "dom/webauthn/libudev-sys" }
packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="6a16f954950401b92b4e220fbf2dfaf6f00e1fb2" } packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="8b4bd7d8229660a749dbe419a57ea01df9de5453" }
minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "029ac0d54b237f27dc7d8d4e51bc0fb076e5e852" } minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "029ac0d54b237f27dc7d8d4e51bc0fb076e5e852" }
+glslopt = { path = "third_party/rust/glslopt/" } +glslopt = { path = "third_party/rust/glslopt/" }
# The following overrides point to dummy projects, as a temporary measure until this is resolved: # The following overrides point to dummy projects, as a temporary measure until this is resolved:

8
tar_stamps
View File

@ -1,10 +1,10 @@
PRODUCT="firefox" PRODUCT="firefox"
CHANNEL="release" CHANNEL="release"
VERSION="93.0" VERSION="94.0.1"
VERSION_SUFFIX="" VERSION_SUFFIX=""
PREV_VERSION="92.0.1" PREV_VERSION="94.0"
PREV_VERSION_SUFFIX="" PREV_VERSION_SUFFIX=""
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
RELEASE_TAG="08b69dc588fbdd88334ebcb6fa303eec95176cd6" RELEASE_TAG="d1b7f0b74a8771c2311c1bfbd6aefa2e18adb020"
RELEASE_TIMESTAMP="20210927210923" RELEASE_TIMESTAMP="20211103134640"