From 5ef477010a2b30f81e5cee0b618236af1cfaea53 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 22 Jul 2023 12:12:16 +0200
Subject: trafficserver: 9.1.4 -> 9.2.1

Fixes CVE-2022-47184, CVE-2023-30631 and CVE-2023-33933.

Changelogs:
https://raw.githubusercontent.com/apache/trafficserver/9.2.x/CHANGELOG-9.2.1
https://raw.githubusercontent.com/apache/trafficserver/9.2.x/CHANGELOG-9.2.0
---
 pkgs/servers/http/trafficserver/default.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'pkgs/servers/http')

diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix
index 48bb698fc3fd4..011d612f9c582 100644
--- a/pkgs/servers/http/trafficserver/default.nix
+++ b/pkgs/servers/http/trafficserver/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchzip
-, fetchpatch
 , makeWrapper
 , nixosTests
 , pkg-config
@@ -50,22 +49,13 @@
 
 stdenv.mkDerivation rec {
   pname = "trafficserver";
-  version = "9.1.4";
+  version = "9.2.1";
 
   src = fetchzip {
     url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
-    sha256 = "sha256-+iq+z+1JE6JE6OLcUwRRAe2/EISqb6Ax6pNm8GcB7bc=";
+    hash = "sha256-Uq6CmbEJfN8ajpVmIutkDy2b8fZcT4wtprcWbMkaNkQ=";
   };
 
-  patches = [
-    # Adds support for NixOS
-    # https://github.com/apache/trafficserver/pull/7697
-    (fetchpatch {
-      url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff";
-      sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150";
-    })
-  ];
-
   # NOTE: The upstream README indicates that flex is needed for some features,
   # but it actually seems to be unnecessary as of this commit[1]. The detection
   # logic for bison and flex is still present in the build script[2], but no
-- 
cgit 1.4.1