http/firefox: version 94.0, SECURITY_PATCH++

5 files changed, 9 insertions, 53 deletions

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index fb4956ffdd..43e05b53b6 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.70"                                          &&
+local NSS_BRANCH="3.71"                                          &&
 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 5943b603ac..529268100d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,7 +1,6 @@
            SPELL=firefox
-         VERSION=93.0
-      PATCHLEVEL=1
-  SECURITY_PATCH=154
+         VERSION=94.0
+  SECURITY_PATCH=155
           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 c7cd4e8897..8d55ad82ee 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2021-11-02 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 94.0, SECURITY_PATCH++
+	* DEPENDS: nss >= 3.71
+	* patches/0033-bmo-1725828-Preload-dependencies-for-the-Widevine-CD.patch: updated
+	* patches/0034-gmpparent.patch: dropped
+
 2021-10-07 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: PATCHLEVEL++
 	* BUILD: exported MAC_USE_SYSTEM_PYTHON, apparently, INSTALL needs it too
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
index 10af9a92f9..50e1d50ccc 100644
--- 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
@@ -10,47 +10,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  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__);
    }
diff --git a/http/firefox/patches/0034-gmpparent.patch b/http/firefox/patches/0034-gmpparent.patch
deleted file mode 100644
index e002485a5b..0000000000
--- a/http/firefox/patches/0034-gmpparent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-@@ -842,6 +842,8 @@ 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")) {