From f7eba3716c09b53359c4d206f46e10ee9b2c78d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Feb 2023 19:30:20 +0100 Subject: [PATCH 1/2] spidermonkey_102: 102.1.0 -> 102.8.0 https://www.mozilla.org/en-US/security/advisories/mfsa2023-06/#CVE-2023-25735 Fixes: CVE-2023-25735 --- pkgs/development/interpreters/spidermonkey/102.nix | 4 ++-- .../interpreters/spidermonkey/common.nix | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/102.nix b/pkgs/development/interpreters/spidermonkey/102.nix index ef89d1ca0a27..ff6808b13b0a 100644 --- a/pkgs/development/interpreters/spidermonkey/102.nix +++ b/pkgs/development/interpreters/spidermonkey/102.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "102.1.0"; - hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw=="; + version = "102.8.0"; + hash = "sha512-k+qHmXtmCIuUxulDtumemnHRkIRE0JbA9ltodtLFhOVf9hICZvOFH5hrZkvR8S+jEgawNHnCt1Hnw8oJesFCdQ=="; } diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index 32a0ae2e7467..a4310b8f206f 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -62,19 +62,6 @@ stdenv.mkDerivation (finalAttrs: rec { # use pkg-config at all systems ./always-check-for-pkg-config.patch ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch - - # Patches required by GJS - # https://discourse.gnome.org/t/gnome-43-to-depend-on-spidermonkey-102/10658 - # Install ProfilingCategoryList.h - (fetchpatch { - url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/33147b91e42b79f4c6dd3ec11cce96746018407a"; - sha256 = "sha256-xJFJZMYJ6P11HQDZbr48GFgybpAeVcu3oLIFEyyMjBI="; - }) - # Fix embeder build - (fetchpatch { - url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/1fa20fb474f5d149cc32d98df169dee5e6e6861b"; - sha256 = "sha256-eCisKjNxy9SLr9KoEE2UB26BflUknnR7PIvnpezsZeA="; - }) ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [ # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 ./fix-float-i686.patch From 2b4f446ee82c2962fe5a86c26675c6205f40754e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Feb 2023 19:31:55 +0100 Subject: [PATCH 2/2] spidermonkey_91: 91.12.0 -> 91.13.0 Bringing the 91 release series to its final version. Did not check for changes, but this gives me closure. --- pkgs/development/interpreters/spidermonkey/91.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index ca771fa75fd6..0ffa5fc287d5 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "91.12.0"; - hash = "sha512-Mj+3UkiLRYcrQPCw7h2MHf+haHTb/yr94ZpUKGyCTvSBdyM+Ap+ur6WUYYTnHDHGvFun7BelceIa9k/F9zNAQg=="; + version = "91.13.0"; + hash = "sha512-OLTMUt4h521gYea6F14cv9iIoWBwqpUfWkQoPy251+lPJQRiHw2nj+rG5xSRptDnA49j3QrhEtytcA6wLpqlFg=="; }