diff options
author | Robert Scott <code@humanleg.org.uk> | 2022-09-11 13:06:06 +0100 |
---|---|---|
committer | Robert Scott <code@humanleg.org.uk> | 2022-09-11 13:06:06 +0100 |
commit | 618883d37c27392975607d08aa295126c5dd8575 (patch) | |
tree | 728bb192b8bb34666d22d3ad59c7e49ccbaa851d /pkgs/servers/http | |
parent | b513a55c2277179e1ed3757cc70d267ea8c1336b (diff) |
trafficserver: 9.1.2 -> 9.1.3
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/trafficserver/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch | 43 |
2 files changed, 2 insertions, 47 deletions
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 083d165d5ba07..6beb81b9a229a 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.2"; + version = "9.1.3"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "sha256-eRpyTdwwO5EzrVpt9fF6VEYGZjHb905nQJd065wY5RU="; + sha256 = "sha256-Ihhsbn4PvIjWskmbWKajThIwtuiEyldBpmtuQ8RdyHA="; }; patches = [ @@ -64,8 +64,6 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff"; sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; }) - - ./fix-catch2-version-incompatibility.patch ]; # NOTE: The upstream README indicates that flex is needed for some features, diff --git a/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch b/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch deleted file mode 100644 index 248f9d4ef31ad..0000000000000 --- a/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/tscore/unit_tests/test_History.cc b/src/tscore/unit_tests/test_History.cc -index 3e699139da0..7505f10aa4c 100644 ---- a/src/tscore/unit_tests/test_History.cc -+++ b/src/tscore/unit_tests/test_History.cc -@@ -59,10 +59,10 @@ TEST_CASE("History", "[libts][History]") - REQUIRE(history[2].reentrancy == static_cast<short>(NO_REENTRANT)); - - history[0].location.str(buf, sizeof(buf)); -- REQUIRE(string_view{buf} == "test_History.cc:48 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(string_view{buf} == "test_History.cc:48 (C_A_T_C_H_T_E_S_T_0)"); - - history[1].location.str(buf, sizeof(buf)); -- REQUIRE(string_view{buf} == "test_History.cc:49 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(string_view{buf} == "test_History.cc:49 (C_A_T_C_H_T_E_S_T_0)"); - - ts::LocalBufferWriter<128> w; - SM<HISTORY_DEFAULT_SIZE> *sm = new SM<HISTORY_DEFAULT_SIZE>; -@@ -71,10 +71,10 @@ TEST_CASE("History", "[libts][History]") - SM_REMEMBER(sm, 3, NO_REENTRANT); - - w.print("{}", sm->history[0].location); -- REQUIRE(w.view() == "test_History.cc:69 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:69 (C_A_T_C_H_T_E_S_T_0)"); - - w.reset().print("{}", sm->history[1].location); -- REQUIRE(w.view() == "test_History.cc:70 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:70 (C_A_T_C_H_T_E_S_T_0)"); - - REQUIRE(sm->history[0].event == 1); - REQUIRE(sm->history[0].reentrancy == 1); -@@ -106,10 +106,10 @@ TEST_CASE("History", "[libts][History]") - REQUIRE(sm2->history.overflowed() == true); - - w.reset().print("{}", sm2->history[0].location); -- REQUIRE(w.view() == "test_History.cc:103 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:103 (C_A_T_C_H_T_E_S_T_0)"); - - w.reset().print("{}", sm2->history[1].location); -- REQUIRE(w.view() == "test_History.cc:98 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:98 (C_A_T_C_H_T_E_S_T_0)"); - - sm2->history.clear(); - REQUIRE(sm2->history.size() == 0); |