From ede90bb8e12e26702efec3cc0e6f67745b6df67d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Dec 2022 21:15:43 +0100 Subject: trafficserver: 9.1.3 -> 9.1.4 Fixes CVE-2022-32749 and CVE-2022-40743. https://raw.githubusercontent.com/apache/trafficserver/9.1.x/CHANGELOG-9.1.4 --- pkgs/servers/http/trafficserver/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'pkgs/servers/http') diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 6beb81b9a229a..48bb698fc3fd4 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.1.3"; + version = "9.1.4"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "sha256-Ihhsbn4PvIjWskmbWKajThIwtuiEyldBpmtuQ8RdyHA="; + sha256 = "sha256-+iq+z+1JE6JE6OLcUwRRAe2/EISqb6Ax6pNm8GcB7bc="; }; patches = [ @@ -107,10 +107,6 @@ stdenv.mkDerivation rec { tools/check-unused-dependencies substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' - - # TODO: remove after the following change has been released - # https://github.com/apache/trafficserver/pull/8683 - cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure \ --replace '/usr/include/linux' '${linuxHeaders}/include/linux' @@ -125,9 +121,6 @@ stdenv.mkDerivation rec { "--enable-experimental-plugins" (lib.enableFeature enableWCCP "wccp") - # the configure script can't auto-locate the following from buildInputs - "--with-lzma=${xz.dev}" - "--with-zlib=${zlib.dev}" (lib.withFeatureAs withHiredis "hiredis" hiredis) ]; -- cgit 1.4.1