diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2022-12-27 21:15:43 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-12-28 17:59:58 +0000 |
| commit | 7bd3d09fe5f103779cddd2d5e7dfc6de052112b2 (patch) | |
| tree | 0a3d38459af04c9ba8e286cffb377b0c043ff743 | |
| parent | nixos/borgbackup: fix ~/.cache, ~/.config ownership (diff) | |
| download | nixpkgs-7bd3d09fe5f103779cddd2d5e7dfc6de052112b2.tar.gz | |
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
(cherry picked from commit ede90bb8e12e26702efec3cc0e6f67745b6df67d)
| -rw-r--r-- | nixos/tests/trafficserver.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/http/trafficserver/default.nix | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/nixos/tests/trafficserver.nix b/nixos/tests/trafficserver.nix index 983ded4f172e..e4557c6c50e5 100644 --- a/nixos/tests/trafficserver.nix +++ b/nixos/tests/trafficserver.nix @@ -172,6 +172,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { assert re.fullmatch(expected, out) is not None, "no matching logs" out = json.loads(ats.succeed(f"traffic_logstats -jf {access_log_path}")) + assert isinstance(out, dict) assert out["total"]["error.total"]["req"] == "0", "unexpected log stat" ''; }) diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 6beb81b9a229..48bb698fc3fd 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) ]; |