From 1e6a414cad304c410fc983f6a2d47945cc06fdba Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 14:00:01 +0200 Subject: [PATCH 1/4] php: drop left-over 7.3 check --- pkgs/development/interpreters/php/generic.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index f181db108a4..dbe01acb6df 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -195,8 +195,6 @@ let # PCRE ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] ++ [ "PCRE_LIBDIR=${pcre2}" ] From d0c10fc34c575c83bc6716a42afe6044fc3730ea Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 14:01:13 +0200 Subject: [PATCH 2/4] php80: 8.0.7 -> 8.0.8 fixes CVE-2021-21705 and CVE-2021-21704 also various other bugs, see https://www.php.net/ChangeLog-8.php#8.0.8 for a complete changelog --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 294f100dedd..82d78d95314 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.7"; - sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj"; + version = "8.0.8"; + sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l"; }); in From cf9fe3942e90eb6f97cfb69daa391b83f9868883 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 14:03:19 +0200 Subject: [PATCH 3/4] php74: 7.4.20 -> 7.4.21 fixes CVE-2021-21705 and CVE-2021-21704 --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 7640e6bc646..1e72f7b48b4 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.20"; - sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha"; + version = "7.4.21"; + sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n"; }); in From 4c424870e62a5095896b48a12e9903835f6a5e53 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 14:07:35 +0200 Subject: [PATCH 4/4] phpPackages.dom: drop patch does not apply to to 7.4.21 and 8.0.8 anymore --- pkgs/top-level/php-packages.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 16d3c71d524..3ceaf784af3 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -257,20 +257,6 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "dom"; buildInputs = [ libxml2 ]; - patches = [ - # https://github.com/php/php-src/pull/7030 - (fetchpatch { - url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch"; - sha256 = "11qsdiwj1zmpfc2pgh6nr0sn7qa1nyjg4jwf69cgwnd57qfjcy4k"; - excludes = [ "ext/dom/tests/bug43364.phpt" "ext/dom/tests/bug80268.phpt" ]; - }) - ]; - # For some reason `patch` fails to remove these files correctly. - # Since `postPatch` is already used in `mkExtension`, we have to make it here. - preCheck = '' - rm tests/bug43364.phpt - rm tests/bug80268.phpt - ''; configureFlags = [ "--enable-dom" ] # Required to build on darwin. ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];