From a827ecc94e3a936d871d6fd797b357dcd5192ce6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 18 Nov 2021 15:32:19 +0100 Subject: [PATCH 1/3] php74: 7.4.25 -> 7.4.26 Fixes CVE-2021-21707 (cherry picked from commit 183cc6ea800548e6b62bd1f972caee25813b3904) --- 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 4f4d30a2f24f..014ab75a080e 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -5,8 +5,8 @@ let base = callPackage generic (_args // { - version = "7.4.25"; - sha256 = "sha256-J5klcMrz4uUyOrezeFPETBUpsdMeqU2Xdu+pHVp4ExM="; + version = "7.4.26"; + sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn"; }); in base.withExtensions ({ all, ... }: with all; ([ From cc57af5b0a8c9114d04061491793b351d51a8707 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 19 Nov 2021 12:42:37 +0100 Subject: [PATCH 2/3] php80: 8.0.12 -> 8.0.13 Fixes CVE-2021-21707 (cherry picked from commit 6dfffc7d4918560eb3015a6e90e8e1b7959f16bf) --- 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 993b356fcb27..440f0f68fe7b 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.12"; - sha256 = "sha256-tIhtsd8yLcj7Eo2LNK5+lPb8aC7LKf9PWlkdTen+rb8="; + version = "8.0.13"; + sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2"; }); in base.withExtensions ({ all, ... }: with all; ([ From 3d8054f5264e2bdf85766f53b10277136fb9eeff Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 28 Nov 2021 16:01:54 +0100 Subject: [PATCH 3/3] php80Extensions.xmlreader: fix build manual backport of cede244af9bbda364b2f27892984d78923d5a6ed --- pkgs/top-level/php-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0ecd4e9b56b4..3f147bb8d643 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -535,6 +535,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ libxml2 ]; internalDeps = [ php.extensions.dom ]; NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ]; + doCheck = false; configureFlags = [ "--enable-xmlreader" ] # Required to build on darwin. ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }