New commits:
commit 03de221cb34fa017a4406c03a759985c555d55ae
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>
SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 8d55ad8..5f34eb6 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2021-11-04 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 94.0.1
+ * patches/*: updated
+
2021-11-02 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 94.0, SECURITY_PATCH++
* DEPENDS: nss >= 3.71
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 4db4100..31a4670 100644
--- a/http/firefox/patches/0001-Don-t-use-build-id.patch
+++ b/http/firefox/patches/0001-Don-t-use-build-id.patch
@@ -1,7 +1,7 @@
-From bda4c82b1f2e0015071edcc0dc3c0a10cfce0b86 Mon Sep 17 00:00:00 2001
+From a65ad7b4b488c9e5582048d76af70860b2a271ec Mon Sep 17 00:00:00 2001
From: "Jory A. Pratt" <anarchy AT gentoo.org>
Date: Mon, 6 Apr 2020 19:14:26 +0200
-Subject: [PATCH 01/33] Don't use build id
+Subject: [PATCH 01/32] Don't use build id
We must drop build id as it causes conflicts when merging
thunderbird/firefox/seamonkey on same system when using
@@ -14,7 +14,7 @@ Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
2 files changed, 14 deletions(-)
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index e96ea982ed..8bfcc8aff3 100644
+index dcc78d3b16..c2633069e2 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -350,13 +350,6 @@ if test "$GNU_CC"; then
@@ -32,7 +32,7 @@ index e96ea982ed..8bfcc8aff3 100644
fi
diff --git a/old-configure.in b/old-configure.in
-index 8f8ae6eb07..78c358a3b1 100644
+index 9c8cdb462a..1707e98471 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -337,13 +337,6 @@ if test "$GNU_CC"; then
@@ -50,5 +50,5 @@ index 8f8ae6eb07..78c358a3b1 100644
HAVE_LINKER_SUPPORT_IGNORE_UNRESOLVED=
_SAVE_LDFLAGS=$LDFLAGS
--
-2.33.0
+2.33.1
@@ -134,10 +134,10 @@ index 4bb25233e7..a2dd99ceb4 100644
if CONFIG["MOZ_SYSTEM_HARFBUZZ"]:
CXXFLAGS += CONFIG["MOZ_HARFBUZZ_CFLAGS"]
diff --git a/old-configure.in b/old-configure.in
-index 78c358a3b1..2a9b8ad1d7 100644
+index 1707e98471..95098e4638 100644
--- a/old-configure.in
+++ b/old-configure.in
-@@ -2205,6 +2205,27 @@ if test "$USE_FC_FREETYPE"; then
+@@ -2204,6 +2204,27 @@ if test "$USE_FC_FREETYPE"; then
fi
fi
@@ -166,10 +166,10 @@ index 78c358a3b1..2a9b8ad1d7 100644
dnl Check if we need the 32-bit Linux SSE2 error dialog
dnl ========================================================
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
-index 4b7194e9e2..077f3f2556 100644
+index dd6901ba9a..be73ac4bee 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -242,6 +242,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
+@@ -260,6 +260,9 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
"-lgvr",
]
@@ -180,7 +180,7 @@ index 4b7194e9e2..077f3f2556 100644
OS_LIBS += CONFIG["MOZ_HARFBUZZ_LIBS"]
Bug: https://bugs.gentoo.org/785613
Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
@@ -43,10 +43,10 @@ index 872484c311..28994a693d 100644
if CONFIG['OS_TARGET'] == 'Darwin':
diff --git a/old-configure.in b/old-configure.in
-index 2a9b8ad1d7..f32f321842 100644
+index 95098e4638..f3b92b3695 100644
--- a/old-configure.in
+++ b/old-configure.in
-@@ -2326,6 +2326,23 @@ fi
+@@ -2325,6 +2325,23 @@ fi
AC_SUBST(NECKO_WIFI)
AC_SUBST(NECKO_WIFI_DBUS)
@@ -71,5 +71,5 @@ index 2a9b8ad1d7..f32f321842 100644
dnl =
dnl = Maintainer debug option (no --enable equivalent)
--
-2.33.0
+2.33.1
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 6ec12db..1140916 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,7 +1,7 @@
-From 1a143898aa9d158d69ac8e1217c37cf5aa7a698e Mon Sep 17 00:00:00 2001
+From 915273302b3e749678fce68f3ec4be34a806c5d5 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi AT 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
+Subject: [PATCH 08/32] bmo#878089: Don't fail when TERM is not set
musl defines p{read,write}64 to their non-suffixed equivalents to avoid
duplication in its syscall wrappers. This breaks macro expansion here,
@@ -38,5 +38,5 @@ index 1abe0ba5b0..d6087a1674 100644
* wrapper functions that convert them), we provide our own kernel data
* structures for use by the system calls.
--
-2.33.0
+2.33.1
b/http/firefox/patches/0014-musl-Only-use-system-heap-reporter-with-glibc.patch
index 95d272f..39f5c67 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,7 +1,7 @@
-From 8b3547892461992d6594ca3779e67c03e48d540e Mon Sep 17 00:00:00 2001
+From f3eb4ca6beeb6afe0b16593cbde67c32b3654686 Mon Sep 17 00:00:00 2001
From: "Jory A. Pratt" <anarchy AT gentoo.org>
Date: Mon, 6 Apr 2020 20:09:26 +0200
-Subject: [PATCH 14/33] musl: Only use system heap reporter with glibc
+Subject: [PATCH 14/32] musl: Only use system heap reporter with glibc
Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
---
@@ -29,5 +29,5 @@ index 6aa934812f..ccb8d5255a 100644
struct SegmentKind {
DWORD mState;
--
-2.33.0
+2.33.1
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 8d3d6aa..19ac361 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,7 +1,7 @@
-From 36e7da9f598293bed4bd8cfc42886184861e8aba Mon Sep 17 00:00:00 2001
+From 3cab58ac693ba976ba9c5afdee9c345e4af3a5f2 Mon Sep 17 00:00:00 2001
From: "Jory A. Pratt" <anarchy AT gentoo.org>
Date: Mon, 6 Apr 2020 20:10:03 +0200
-Subject: [PATCH 15/33] musl: Set pthread name for non glibc systems
+Subject: [PATCH 15/32] musl: Set pthread name for non glibc systems
Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
---
@@ -25,5 +25,5 @@ index 35532e375b..983da45326 100644
MOZ_RELEASE_ASSERT(!rv);
}
--
-2.33.0
+2.33.1
Bug: https://bugzilla.mozilla.org/822978
Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
@@ -24,5 +24,5 @@ index 192f9574fe..2020d65ffc 100755
# New in clang 11. We can't really do anything about this warning.
check_and_add_gcc_warning("-Wno-psabi")
--
-2.33.0
+2.33.1
b/http/firefox/patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch
deleted file mode 100644
index 50e1d50..0000000
---
a/http/firefox/patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From caec13d016cae398acdb633a81d9009194ed7d01 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT 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 AT 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/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
-index f7e745d2c0..dc17f3a3be 100644
---- a/dom/media/gmp/GMPParent.cpp
-+++ b/dom/media/gmp/GMPParent.cpp
-@@ -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
-
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (03de221cb34fa017a4406c03a759985c555d55ae),
Pavel Vinogradov, 11/04/2021