forked from mirrors/nixpkgs
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
This commit is contained in:
parent
91b47e1619
commit
ede90bb8e1
|
@ -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"
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -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)
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in a new issue