http/firefox: version 93.0, SECURITY_PATCH++

36 files changed, 148 insertions, 96 deletions

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index b800dc0e3a..fb4956ffdd 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -35,7 +35,7 @@ depends  libwebp       "--with-system-webp"                      &&
 
 depends  nspr               "--with-system-nspr"                 &&
 
-local NSS_BRANCH="3.69"                                          &&
+local NSS_BRANCH="3.70"                                          &&
 if spell_ok nss                                                  &&
    is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
   depends  -sub "${NSS_BRANCH}" nss  "--with-system-nss"
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index a91bbcc557..68bdc16bfa 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
-         VERSION=92.0.1
-  SECURITY_PATCH=153
+         VERSION=93.0
+  SECURITY_PATCH=154
           SOURCE="${SPELL}-${VERSION}.source.tar.xz"
    SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}"
          SOURCE2="${SOURCE}.asc"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 6637bec881..c44739f1ec 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2021-10-05 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 93.0, SECURITY_PATCH++
+	* DEPENDS: nss >= 3.70
+	* patches/*: updated
+
 2021-09-23 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 92.0.1
 	* DEPENDS: no need in gtk+2 anymore
diff --git a/http/firefox/patches/0001-Don-t-use-build-id.patch b/http/firefox/patches/0001-Don-t-use-build-id.patch
index 5c1052a540..4db4100cc4 100644
--- a/http/firefox/patches/0001-Don-t-use-build-id.patch
+++ b/http/firefox/patches/0001-Don-t-use-build-id.patch
@@ -1,4 +1,4 @@
-From 521330193e7778c1eee1d106b812c2a78ffc3c94 Mon Sep 17 00:00:00 2001
+From bda4c82b1f2e0015071edcc0dc3c0a10cfce0b86 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 19:14:26 +0200
 Subject: [PATCH 01/33] Don't use build id
diff --git a/http/firefox/patches/0002-Fortify-sources-properly.patch b/http/firefox/patches/0002-Fortify-sources-properly.patch
index 60c58e972d..b46edb28a9 100644
--- a/http/firefox/patches/0002-Fortify-sources-properly.patch
+++ b/http/firefox/patches/0002-Fortify-sources-properly.patch
@@ -1,4 +1,4 @@
-From 288e147c84109195b179e45a9c4632d3c4ca1748 Mon Sep 17 00:00:00 2001
+From 1ce983808bbbfca3b8d1854d22b185674f24e861 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 19:16:36 +0200
 Subject: [PATCH 02/33] Fortify sources properly
diff --git a/http/firefox/patches/0003-Check-additional-plugins-dir.patch b/http/firefox/patches/0003-Check-additional-plugins-dir.patch
index 5c7917edf7..a594b528f1 100644
--- a/http/firefox/patches/0003-Check-additional-plugins-dir.patch
+++ b/http/firefox/patches/0003-Check-additional-plugins-dir.patch
@@ -1,4 +1,4 @@
-From 1cbfa1c2ea73ed8ec59a930970a9f4db66dd0629 Mon Sep 17 00:00:00 2001
+From 38e3e077b98644434ca6fc5ff346238822a704ee Mon Sep 17 00:00:00 2001
 From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
 Date: Mon, 6 Apr 2020 19:17:43 +0200
 Subject: [PATCH 03/33] Check additional plugins dir
diff --git a/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch b/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
index 94ff39778d..e4e522f9cb 100644
--- a/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
+++ b/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
@@ -1,4 +1,4 @@
-From c181d0a485fc740baffda0dec8a17305406a11a2 Mon Sep 17 00:00:00 2001
+From 8974ebbb7dc3edac809aeb24c8109dd19055659e Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:32:39 +0200
 Subject: [PATCH 04/33] bmo#847568: Support system harfbuzz
@@ -39,10 +39,10 @@ index 9018d3e580..a2977231ee 100644
      system_headers += [
          'jack/jack.h',
 diff --git a/dom/base/moz.build b/dom/base/moz.build
-index fa75996f78..56652f41de 100644
+index f56e666a01..a93198fed9 100644
 --- a/dom/base/moz.build
 +++ b/dom/base/moz.build
-@@ -559,6 +559,9 @@ FINAL_LIBRARY = "xul"
+@@ -561,6 +561,9 @@ FINAL_LIBRARY = "xul"
  if CONFIG["MOZ_X11"]:
      CXXFLAGS += CONFIG["TK_CFLAGS"]
  
@@ -103,10 +103,10 @@ index 4ff948f567..6e920ff27f 100755
      LOCAL_INCLUDES += [
          "/gfx/cairo/cairo/src",
 diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
-index 04692dbf30..e1cbefb604 100644
+index 3f483d180e..4bb25233e7 100644
 --- a/gfx/thebes/moz.build
 +++ b/gfx/thebes/moz.build
-@@ -290,6 +290,9 @@ LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
+@@ -287,6 +287,9 @@ LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
  
  DEFINES["GRAPHITE2_STATIC"] = True
  
@@ -117,7 +117,7 @@ index 04692dbf30..e1cbefb604 100644
      # Suppress warnings from Skia header files.
      SOURCES["gfxPlatform.cpp"].flags += ["-Wno-implicit-fallthrough"]
 diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
-index 897bfad92a..5a83cdb2c1 100644
+index 301eb9a854..7cece5e06c 100644
 --- a/intl/unicharutil/util/moz.build
 +++ b/intl/unicharutil/util/moz.build
 @@ -25,6 +25,9 @@ UNIFIED_SOURCES += [
@@ -127,11 +127,11 @@ index 897bfad92a..5a83cdb2c1 100644
 +if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
 +    CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
 +
+ include("/ipc/chromium/chromium-config.mozbuild")
+ 
  GeneratedFile(
-     "BaseChars.h",
-     script="base_chars.py",
 diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
-index 1498dd2ceb..026798bf71 100644
+index 8de4f64777..18ddb4e0b2 100644
 --- a/netwerk/dns/moz.build
 +++ b/netwerk/dns/moz.build
 @@ -106,6 +106,9 @@ LOCAL_INCLUDES += [
@@ -159,7 +159,7 @@ index 5e2d8cb4cd..4b7194e9e2 100644
      OS_LIBS += CONFIG["MOZ_JPEG_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 8bad820dce..39944c4aa1 100644
+index 56dd7bd195..542636bc22 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -460,6 +460,15 @@ add_old_configure_assignment(
diff --git a/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch b/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
index 96759b3b19..a3c6e9897b 100644
--- a/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
+++ b/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
@@ -1,4 +1,4 @@
-From 657a415b434ed2f747068ce3763b66b029ca3897 Mon Sep 17 00:00:00 2001
+From f1b68439b2b6cb4bdc10bcec99dea27c50600ec7 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:34:44 +0200
 Subject: [PATCH 05/33] bmo#847568: Support system graphite2
@@ -118,10 +118,10 @@ index 8222b72333..16a2b401db 100644
      "thebes",
      "ipc",
 diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
-index e1cbefb604..4e5d693394 100644
+index 4bb25233e7..a2dd99ceb4 100644
 --- a/gfx/thebes/moz.build
 +++ b/gfx/thebes/moz.build
-@@ -288,7 +288,10 @@ if CONFIG["MOZ_WAYLAND"]:
+@@ -285,7 +285,10 @@ if CONFIG["MOZ_WAYLAND"]:
  
  LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
  
@@ -180,7 +180,7 @@ index 4b7194e9e2..077f3f2556 100644
      OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
  
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 39944c4aa1..ed1244266c 100644
+index 542636bc22..965335e47d 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -460,6 +460,19 @@ add_old_configure_assignment(
diff --git a/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch b/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
index 10627c547b..6673a3f9df 100644
--- a/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
+++ b/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
@@ -1,4 +1,4 @@
-From b96a9254f40da2322f4f0cb14fd0a3cfa7a79234 Mon Sep 17 00:00:00 2001
+From 110ce41a5cc536e9b28b8111a8b5d651ae798956 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:36:02 +0200
 Subject: [PATCH 06/33] bmo#1559213: Support system av1
@@ -15,10 +15,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  4 files changed, 34 insertions(+), 4 deletions(-)
 
 diff --git a/config/external/moz.build b/config/external/moz.build
-index 0ca007a425..5baf34432c 100644
+index 6a2ed9e4a2..697bb9d0bf 100644
 --- a/config/external/moz.build
 +++ b/config/external/moz.build
-@@ -51,8 +51,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
+@@ -46,8 +46,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
      external_dirs += ["media/libvpx"]
  
  if CONFIG["MOZ_AV1"]:
@@ -66,7 +66,7 @@ index 16ca8a9cbc..b349dcbe6d 100644
  if CONFIG["MOZ_OMX"]:
      EXPORTS += [
 diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index ed1244266c..b5fd725a46 100644
+index 965335e47d..b901b7cf75 100644
 --- a/toolkit/moz.configure
 +++ b/toolkit/moz.configure
 @@ -544,14 +544,29 @@ def av1(value):
diff --git a/http/firefox/patches/0007-Support-sndio-audio-framework.patch b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
index 2e12b73ae7..36dea83475 100644
--- a/http/firefox/patches/0007-Support-sndio-audio-framework.patch
+++ b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
@@ -1,4 +1,4 @@
-From 3d135800fc963fcf5267601daa673eb413ad4fb9 Mon Sep 17 00:00:00 2001
+From 715565594ac0572f86a84a900e07516a2971a707 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:54:42 +0200
 Subject: [PATCH 07/33] Support sndio audio framework
diff --git a/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch b/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
index f38136eb62..6ec12db438 100644
--- a/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
+++ b/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
@@ -1,4 +1,4 @@
-From 65df0601c51fbb7dc5b0ceb3ed01b046ca63a975 Mon Sep 17 00:00:00 2001
+From 1a143898aa9d158d69ac8e1217c37cf5aa7a698e Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:41:43 +0200
 Subject: [PATCH 08/33] bmo#878089: Don't fail when TERM is not set
diff --git a/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch b/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
index c5e0b82532..682b9062bc 100644
--- a/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
+++ b/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
@@ -1,4 +1,4 @@
-From 32c8e49636c9a0c8a06166cb684f123d24afda27 Mon Sep 17 00:00:00 2001
+From f14769c19e6a48cfe96333afcc10db5e7b2bfcde Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:44:28 +0200
 Subject: [PATCH 09/33] bmo#1516803: Fix building sandbox
@@ -11,7 +11,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
-index 29b53f12f7..31d2e24118 100644
+index 0a3a14c96d..81c89bd947 100644
 --- a/security/sandbox/linux/moz.build
 +++ b/security/sandbox/linux/moz.build
 @@ -116,7 +116,7 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
diff --git a/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch b/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
index 1b59f0adeb..08a18a1a24 100644
--- a/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
+++ b/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
@@ -1,4 +1,4 @@
-From c4db4f4324788d5dd48d16ca097f96a04224cf51 Mon Sep 17 00:00:00 2001
+From 269a1b5f3a2c4c729590329de09d4f9e0bf0ba4b Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 19:51:22 +0200
 Subject: [PATCH 10/33] Fix building spellchecker when using GCC and PGO
diff --git a/http/firefox/patches/0012-musl-Add-alternate-name-for-private-siginfo-struct-m.patch b/http/firefox/patches/0012-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
index a9c3e4550e..af2d9564f7 100644
--- a/http/firefox/patches/0012-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
+++ b/http/firefox/patches/0012-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
@@ -1,4 +1,4 @@
-From 1ce495731469e4297508623a37e3d6c4e30902c8 Mon Sep 17 00:00:00 2001
+From 7138322ad8f9514fce92af7b62c726c593cc4279 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 8 Jan 2017 19:16:38 -0600
 Subject: [PATCH 12/33] musl: Add alternate name for private siginfo struct
diff --git a/http/firefox/patches/0013-musl-Fix-syscall-wrappers.patch b/http/firefox/patches/0013-musl-Fix-syscall-wrappers.patch
index 9524f42e4c..4584e52675 100644
--- a/http/firefox/patches/0013-musl-Fix-syscall-wrappers.patch
+++ b/http/firefox/patches/0013-musl-Fix-syscall-wrappers.patch
@@ -1,4 +1,4 @@
-From 3d0db6adb37b73d5d70806acaf8f0137dc2c5aa4 Mon Sep 17 00:00:00 2001
+From 084d44eafba98636065c8159d2521e7763482fc5 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sun, 8 Jan 2017 19:19:23 -0600
 Subject: [PATCH 13/33] musl: Fix syscall wrappers
diff --git a/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch b/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch
index ce4553f376..95d272f51e 100644
--- a/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch
+++ b/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch
@@ -1,4 +1,4 @@
-From a30c153eb5bf88e65037e6e815e28e1706be0c79 Mon Sep 17 00:00:00 2001
+From 8b3547892461992d6594ca3779e67c03e48d540e Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 20:09:26 +0200
 Subject: [PATCH 14/33] musl: Only use system heap reporter with glibc
diff --git a/http/firefox/patches/0015-musl-Set-pthread-name-for-non-glibc-systems.patch b/http/firefox/patches/0015-musl-Set-pthread-name-for-non-glibc-systems.patch
index d30f14bb0d..8d3d6aa113 100644
--- a/http/firefox/patches/0015-musl-Set-pthread-name-for-non-glibc-systems.patch
+++ b/http/firefox/patches/0015-musl-Set-pthread-name-for-non-glibc-systems.patch
@@ -1,4 +1,4 @@
-From 1bc9adce2c22bfe44bd6f0fe5b4ea1811d295302 Mon Sep 17 00:00:00 2001
+From 36e7da9f598293bed4bd8cfc42886184861e8aba Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 20:10:03 +0200
 Subject: [PATCH 15/33] musl: Set pthread name for non glibc systems
diff --git a/http/firefox/patches/0016-musl-getcontext-is-only-avaliable-on-glibc-systems.patch b/http/firefox/patches/0016-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
index cb67929b84..10d669c952 100644
--- a/http/firefox/patches/0016-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
+++ b/http/firefox/patches/0016-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
@@ -1,4 +1,4 @@
-From dd6673f8a31205daa52866207bb80fbf35808e01 Mon Sep 17 00:00:00 2001
+From e53751589052c28c0b7a985a58267fcc04fbe52f Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 20:10:47 +0200
 Subject: [PATCH 16/33] musl: getcontext is only avaliable on glibc systems
@@ -9,16 +9,16 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp
-index a99cbfe617..b12b6de93a 100644
+index 9c7d727a49..36106ead7b 100644
 --- a/tools/profiler/core/platform-linux-android.cpp
 +++ b/tools/profiler/core/platform-linux-android.cpp
-@@ -617,8 +617,10 @@ static void PlatformInit(PSLockRef aLock) {}
- ucontext_t sSyncUContext;
+@@ -570,8 +570,10 @@ static void PlatformInit(PSLockRef aLock) {}
  
+ #if defined(HAVE_NATIVE_UNWIND)
  void Registers::SyncPopulate() {
 +#if defined(__GLIBC__)
-   if (!getcontext(&sSyncUContext)) {
-     PopulateRegsFromContext(*this, &sSyncUContext);
+   if (!getcontext(&mContextSyncStorage)) {
+     PopulateRegsFromContext(*this, &mContextSyncStorage);
    }
 +#endif
  }
diff --git a/http/firefox/patches/0017-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch b/http/firefox/patches/0017-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
index 65c65c5b7d..b75127efb8 100644
--- a/http/firefox/patches/0017-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
+++ b/http/firefox/patches/0017-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
@@ -1,4 +1,4 @@
-From a9473f80be1c87d38d98994f6533f33df30752b2 Mon Sep 17 00:00:00 2001
+From 4aa8cbeb5e8d02b109314861f1dd2b3e44f49b64 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy@gentoo.org>
 Date: Mon, 6 Apr 2020 20:12:09 +0200
 Subject: [PATCH 17/33] musl: sys/auvx.h avaliable on more then just glibc
diff --git a/http/firefox/patches/0018-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch b/http/firefox/patches/0018-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
index b77497e6a2..79a6ba8d36 100644
--- a/http/firefox/patches/0018-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
+++ b/http/firefox/patches/0018-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
@@ -1,4 +1,4 @@
-From c144112fb9b785ff96b58b38b575913ef9f33903 Mon Sep 17 00:00:00 2001
+From 9f0b152a5c4d5de3360c3d62e5082c57b9bd488f Mon Sep 17 00:00:00 2001
 From: Johannes <johannes.brechtmann@gmail.com>
 Date: Fri, 1 May 2020 17:20:29 +0200
 Subject: [PATCH 18/33] musl: make SYS_fork non-fatal, musl uses it for fork(2)
diff --git a/http/firefox/patches/0019-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch b/http/firefox/patches/0019-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
index 6d833ed3f8..5ec2ba943e 100644
--- a/http/firefox/patches/0019-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
+++ b/http/firefox/patches/0019-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
@@ -1,4 +1,4 @@
-From 001107805aef79db0b9fa4cc3c00f0c293687a23 Mon Sep 17 00:00:00 2001
+From 0a01f365aebf83cb2db9a1dbe38090d50f7ea616 Mon Sep 17 00:00:00 2001
 From: Rasmus Thomsen <oss@cogitri.dev>
 Date: Wed, 28 Oct 2020 17:50:24 +0100
 Subject: [PATCH 19/33] musl: include net/if.h before linux/if.h to avoid
diff --git a/http/firefox/patches/0020-Make-PGO-use-toolchain.patch b/http/firefox/patches/0020-Make-PGO-use-toolchain.patch
index 6255a10551..d817d437c3 100644
--- a/http/firefox/patches/0020-Make-PGO-use-toolchain.patch
+++ b/http/firefox/patches/0020-Make-PGO-use-toolchain.patch
@@ -1,4 +1,4 @@
-From 040d055b6755bc71d9b65a4dde19ba16d8f1b160 Mon Sep 17 00:00:00 2001
+From 125dfceb283e3c07f006cbfdd2b865fb7e337bbd Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:13:34 +0200
 Subject: [PATCH 20/33] Make PGO use toolchain
@@ -9,7 +9,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 9 insertions(+)
 
 diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix
-index 3927dd907b..cb4819b230 100644
+index 9ca9c97fce..9f86fe0940 100644
 --- a/build/unix/mozconfig.unix
 +++ b/build/unix/mozconfig.unix
 @@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
diff --git a/http/firefox/patches/0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch b/http/firefox/patches/0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
index fa2f67076f..b1229e0c59 100644
--- a/http/firefox/patches/0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
+++ b/http/firefox/patches/0021-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
@@ -1,4 +1,4 @@
-From 7478a4852fc50d8b80f9cfe7ff678ab569858b3e Mon Sep 17 00:00:00 2001
+From 83bc7e71e3aaabbe16ae784d01192a16c7f78db9 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:27:06 +0200
 Subject: [PATCH 21/33] bmo#1516081: Disable watchdog during PGO builds
@@ -11,10 +11,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
-index 1fe5a1ab73..30b8b27fc4 100644
+index ed27f7f8e7..81c9977b57 100644
 --- a/build/moz.configure/lto-pgo.configure
 +++ b/build/moz.configure/lto-pgo.configure
-@@ -85,7 +85,7 @@ set_config("PGO_PROFILE_PATH", pgo_profile_path)
+@@ -84,7 +84,7 @@ set_config("PGO_PROFILE_PATH", pgo_profile_path)
  def pgo_flags(compiler, profdata, target_is_windows):
      if compiler.type == "gcc":
          return namespace(
@@ -23,7 +23,7 @@ index 1fe5a1ab73..30b8b27fc4 100644
              gen_ldflags=["-fprofile-generate"],
              use_cflags=["-fprofile-use", "-fprofile-correction", "-Wcoverage-mismatch"],
              use_ldflags=["-fprofile-use"],
-@@ -99,7 +99,7 @@ def pgo_flags(compiler, profdata, target_is_windows):
+@@ -98,7 +98,7 @@ def pgo_flags(compiler, profdata, target_is_windows):
          else:
              gen_ldflags = ["-fprofile-generate"]
  
diff --git a/http/firefox/patches/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch b/http/firefox/patches/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
index c0d181c63a..c1e34a19a1 100644
--- a/http/firefox/patches/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
+++ b/http/firefox/patches/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
@@ -1,4 +1,4 @@
-From d5771d9ec095fabe91075161edb1c20a2131253d Mon Sep 17 00:00:00 2001
+From 23dddf9a0c0bfaa3703109b927cf0e66865778b5 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Wed, 15 Apr 2020 00:27:25 +0200
 Subject: [PATCH 22/33] bmo#1516803: force one LTO partition for sandbox when
@@ -10,7 +10,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
-index 31d2e24118..88d9a2dc6f 100644
+index 81c89bd947..a5b76067a7 100644
 --- a/security/sandbox/linux/moz.build
 +++ b/security/sandbox/linux/moz.build
 @@ -114,9 +114,10 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
diff --git a/http/firefox/patches/0023-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch b/http/firefox/patches/0023-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
index f9c65e7480..70d72af8c8 100644
--- a/http/firefox/patches/0023-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
+++ b/http/firefox/patches/0023-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
@@ -1,4 +1,4 @@
-From a0a25d7d685219a6a05c83bd409c00f7b32a65bf Mon Sep 17 00:00:00 2001
+From 96529fd6004f0f793dca4b35e1449b8aec3fc3f7 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 6 Apr 2020 20:47:13 +0200
 Subject: [PATCH 23/33] bmo#1196777: Set GDK_FOCUS_CHANGE_MASK
@@ -10,10 +10,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
-index f56822bd06..7f777302b8 100644
+index 378f4cd116..501c4ec903 100644
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -162,7 +162,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTURE_MASK | GDK_EXPOSURE_MASK |
+@@ -161,7 +161,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTURE_MASK | GDK_EXPOSURE_MASK |
                       GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
                       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
                       GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
diff --git a/http/firefox/patches/0024-Fix-building-with-PGO-when-using-GCC.patch b/http/firefox/patches/0024-Fix-building-with-PGO-when-using-GCC.patch
index 85a59a307b..4cac38ebde 100644
--- a/http/firefox/patches/0024-Fix-building-with-PGO-when-using-GCC.patch
+++ b/http/firefox/patches/0024-Fix-building-with-PGO-when-using-GCC.patch
@@ -1,4 +1,4 @@
-From 370782ffe7679d7ebd81b18e8a9fbf727b1d02f5 Mon Sep 17 00:00:00 2001
+From 957a610b95cb91885d0478b9d20e26ca81cc3587 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 2 Jul 2020 18:05:03 +0200
 Subject: [PATCH 24/33] Fix building with PGO when using GCC
@@ -10,11 +10,11 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  2 files changed, 25 insertions(+), 6 deletions(-)
 
 diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
-index 30b8b27fc4..95852d7c21 100644
+index 81c9977b57..e9c22ffb30 100644
 --- a/build/moz.configure/lto-pgo.configure
 +++ b/build/moz.configure/lto-pgo.configure
-@@ -84,11 +84,12 @@ set_config("PGO_PROFILE_PATH", pgo_profile_path)
- @imports(_from="__builtin__", _import="min")
+@@ -83,11 +83,12 @@ set_config("PGO_PROFILE_PATH", pgo_profile_path)
+ @imports("multiprocessing")
  def pgo_flags(compiler, profdata, target_is_windows):
      if compiler.type == "gcc":
 +        profile_use = "-fprofile-use"
diff --git a/http/firefox/patches/0025-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch b/http/firefox/patches/0025-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
index d1a8b22c3b..c2793df610 100644
--- a/http/firefox/patches/0025-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
+++ b/http/firefox/patches/0025-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
@@ -1,4 +1,4 @@
-From a4e51488bd2e1d7923f3ad703ada25ace7a410e6 Mon Sep 17 00:00:00 2001
+From 84edf8b2e1a038143b94d0f04b9435937e89bee8 Mon Sep 17 00:00:00 2001
 From: Mike Hommey <mh@glandium.org>
 Date: Mon, 26 Nov 2018 09:59:56 +0900
 Subject: [PATCH 25/33] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
diff --git a/http/firefox/patches/0026-build-Disable-Werror.patch b/http/firefox/patches/0026-build-Disable-Werror.patch
index e79887cc1f..21ef37b4d1 100644
--- a/http/firefox/patches/0026-build-Disable-Werror.patch
+++ b/http/firefox/patches/0026-build-Disable-Werror.patch
@@ -1,4 +1,4 @@
-From 7c5df289bd8c303f48ccbb945a1d4514e5ba51cb Mon Sep 17 00:00:00 2001
+From 6212b2e505fa1c1a827e739103806c7cc7613031 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Sat, 29 Aug 2020 22:06:15 +0200
 Subject: [PATCH 26/33] build: Disable -Werror
diff --git a/http/firefox/patches/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch b/http/firefox/patches/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
index ef68cd5c41..171f632438 100644
--- a/http/firefox/patches/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+++ b/http/firefox/patches/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
@@ -1,4 +1,4 @@
-From 8867ab47e2ccd99dd21bb6bc538389e7585a5627 Mon Sep 17 00:00:00 2001
+From d7692784c95394605e4febf56b34b6966a7f41ad Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Sat, 29 Aug 2020 22:30:59 +0200
 Subject: [PATCH 27/33] LTO: Only enable LTO for Rust when complete build uses
@@ -10,7 +10,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 80a55e3c14..bd78cf1725 100644
+index 3c724e0db8..9a70072f8c 100644
 --- a/config/makefiles/rust.mk
 +++ b/config/makefiles/rust.mk
 @@ -64,6 +64,7 @@ endif
diff --git a/http/firefox/patches/0028-Make-elfhack-use-toolchain.patch b/http/firefox/patches/0028-Make-elfhack-use-toolchain.patch
index 6c2b5b24ae..49ce454e91 100644
--- a/http/firefox/patches/0028-Make-elfhack-use-toolchain.patch
+++ b/http/firefox/patches/0028-Make-elfhack-use-toolchain.patch
@@ -1,4 +1,4 @@
-From 2170ee3acc3b81cd8b1b2fc6794a4dfcad8b2297 Mon Sep 17 00:00:00 2001
+From 7f82d69b06dfd2b3777a5d23f830153f15a5bc49 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Mon, 28 Sep 2020 20:52:24 +0200
 Subject: [PATCH 28/33] Make elfhack use toolchain
diff --git a/http/firefox/patches/0029-Disable-FFVPX-with-VA-API.patch b/http/firefox/patches/0029-Disable-FFVPX-with-VA-API.patch
index 95310ea6dc..085bb6999c 100644
--- a/http/firefox/patches/0029-Disable-FFVPX-with-VA-API.patch
+++ b/http/firefox/patches/0029-Disable-FFVPX-with-VA-API.patch
@@ -1,4 +1,4 @@
-From 393cfd1e73e36540d10e91f8f028000b64c5d98d Mon Sep 17 00:00:00 2001
+From 92857d4a4f9a69c21f8394ff53ae34491eef2ab0 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:22:48 +0200
 Subject: [PATCH 29/33] Disable FFVPX with VA-API
diff --git a/http/firefox/patches/0030-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch b/http/firefox/patches/0030-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
index 40081022ad..c5ce3e4a6e 100644
--- a/http/firefox/patches/0030-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
+++ b/http/firefox/patches/0030-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
@@ -1,4 +1,4 @@
-From 7134ac92ab0e5ec45470c45b617d233ecd487d21 Mon Sep 17 00:00:00 2001
+From b9e6602ccd69713fd1cf6a922955dacaab8cd303 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Thu, 29 Apr 2021 18:48:06 +0200
 Subject: [PATCH 30/33] Enable FLAC on platforms without ffvpx via ffmpeg
diff --git a/http/firefox/patches/0031-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch b/http/firefox/patches/0031-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
index 410aff4290..d039be8a51 100644
--- a/http/firefox/patches/0031-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
+++ b/http/firefox/patches/0031-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
@@ -1,4 +1,4 @@
-From 9aa7b8db9e54663cc4ee3ec996c2d03ada859cc3 Mon Sep 17 00:00:00 2001
+From 8f0a39adcf0966187e98e5318a97c0af532b19d1 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 11 Dec 2020 15:37:38 +0100
 Subject: [PATCH 31/33] bmo#1670333: OpenH264: Fix decoding if it starts on non
diff --git a/http/firefox/patches/0032-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch b/http/firefox/patches/0032-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
index 9a1d1cfcaf..b7ee5f76c5 100644
--- a/http/firefox/patches/0032-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
+++ b/http/firefox/patches/0032-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
@@ -1,4 +1,4 @@
-From 3ff3e007201ddaa5ded50bbc32620d3ac9ccb4dd Mon Sep 17 00:00:00 2001
+From ecb3c2eb66b4aced1003262100dd0c0aafee0bbd Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi@gentoo.org>
 Date: Fri, 11 Dec 2020 15:46:25 +0100
 Subject: [PATCH 32/33] bmo#1663844: OpenH264: Allow using OpenH264 GMP decoder
diff --git a/http/firefox/patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch b/http/firefox/patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch
new file mode 100644
index 0000000000..10af9a92f9
--- /dev/null
+++ b/http/firefox/patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch
@@ -0,0 +1,77 @@
+From caec13d016cae398acdb633a81d9009194ed7d01 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 23 Sep 2021 16:31:41 +0200
+Subject: [PATCH 33/33] bmo#1725828: Preload dependencies for the Widevine CDM
+ when sandboxing it on Linux
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ dom/media/gmp/GMPChild.cpp  |  8 +++++++-
+ dom/media/gmp/GMPParent.cpp | 16 ++++++++++++++--
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
+index 07d62f3ef0..c793ab5992 100644
+--- a/dom/media/gmp/GMPChild.cpp
++++ b/dom/media/gmp/GMPChild.cpp
+@@ -232,8 +232,14 @@ mozilla::ipc::IPCResult GMPChild::RecvPreloadLibs(const nsCString& aLibs) {
+   }
+ #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;
+@@ -256,7 +262,7 @@ mozilla::ipc::IPCResult GMPChild::RecvPreloadLibs(const nsCString& aLibs) {
+           }
+           // End bug 1698718 logging.
+ 
+-          MOZ_CRASH("Couldn't load lib needed by NSS");
++          MOZ_CRASH("Couldn't load lib needed by media plugin");
+         }
+       }
+     }
+diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
+index f7e745d2c0..dc17f3a3be 100644
+--- a/dom/media/gmp/GMPParent.cpp
++++ b/dom/media/gmp/GMPParent.cpp
+@@ -842,8 +842,6 @@ RefPtr<GenericPromise> GMPParent::ParseChromiumManifest(
+   }
+ #endif
+ 
+-  GMPCapability video;
+-
+   // We hard code a few of the settings because they can't be stored in the
+   // widevine manifest without making our API different to widevine's.
+   if (mDisplayName.EqualsASCII("clearkey")) {
+@@ -876,6 +874,20 @@ RefPtr<GenericPromise> GMPParent::ParseChromiumManifest(
+     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't depend on them, so we need to ensure
++  // they'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);
+-- 
+2.33.0
+
diff --git a/http/firefox/patches/0033-bmo-1728749-Pre-select-OS-dialog-when-using-Pipewire.patch b/http/firefox/patches/0033-bmo-1728749-Pre-select-OS-dialog-when-using-Pipewire.patch
deleted file mode 100644
index a41625ac1e..0000000000
--- a/http/firefox/patches/0033-bmo-1728749-Pre-select-OS-dialog-when-using-Pipewire.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 551677fe23c758d4a045f32ea398f576b3285b60 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Mon, 6 Sep 2021 16:44:00 +0200
-Subject: [PATCH 33/33] bmo#1728749: Pre-select OS dialog when using Pipewire
- for screen sharing
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- browser/actors/WebRTCParent.jsm | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/browser/actors/WebRTCParent.jsm b/browser/actors/WebRTCParent.jsm
-index c28af6db1a..87b97671d6 100644
---- a/browser/actors/WebRTCParent.jsm
-+++ b/browser/actors/WebRTCParent.jsm
-@@ -870,6 +870,11 @@ function prompt(aActor, aBrowser, aRequest) {
-               );
-               item.deviceId = device.id;
-               item.mediaSource = type;
-+
-+              // In this case the OS sharing dialog will be the only option and
-+              // can be safely pre-selected.
-+              menupopup.parentNode.selectedItem = item;
-+              menupopup.parentNode.disabled = true;
-               break;
-             }
-             if (type == "application") {
--- 
-2.33.0
-