summary refs log tree commit diff
path: root/pkgs/servers/http
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2021-07-04 13:52:49 +0200
committerThomas Gerbet <thomas@gerbet.me>2021-07-05 15:16:06 +0200
commitd41e86c67ff65b898be3952bf66f803a121cd083 (patch)
treeaee5f204ed7a6e48282e99c764c9b0416231ba4b /pkgs/servers/http
parent0168c6ff9f6f4a67261bdf7ba5aea48ec8e4389a (diff)
downloadnixpkgs-d41e86c67ff65b898be3952bf66f803a121cd083.tar
nixpkgs-d41e86c67ff65b898be3952bf66f803a121cd083.tar.gz
nixpkgs-d41e86c67ff65b898be3952bf66f803a121cd083.tar.bz2
nixpkgs-d41e86c67ff65b898be3952bf66f803a121cd083.tar.lz
nixpkgs-d41e86c67ff65b898be3952bf66f803a121cd083.tar.xz
nixpkgs-d41e86c67ff65b898be3952bf66f803a121cd083.tar.zst
nixpkgs-d41e86c67ff65b898be3952bf66f803a121cd083.zip
trafficserver: 9.0.1 -> 9.0.2
Fixes CVE-2021-32566 and CVE-2021-32567.
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r--pkgs/servers/http/trafficserver/default.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix
index 4a7f9854d18..e7ce72e086e 100644
--- a/pkgs/servers/http/trafficserver/default.nix
+++ b/pkgs/servers/http/trafficserver/default.nix
@@ -49,11 +49,11 @@
 
 stdenv.mkDerivation rec {
   pname = "trafficserver";
-  version = "9.0.1";
+  version = "9.0.2";
 
   src = fetchurl {
     url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
-    sha256 = "1q164pvfmbqh3gzy3bqy96lwd0fdbhz78r06pd92p7rmkqwx005z";
+    sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz";
   };
 
   patches = [
@@ -63,13 +63,6 @@ stdenv.mkDerivation rec {
       url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff";
       sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150";
     })
-
-    # Fixes a bug in tspush which pushes incorrect contents to cache
-    # https://github.com/apache/trafficserver/pull/7696
-    (fetchpatch {
-      url = "https://github.com/apache/trafficserver/commit/b08215272872f452787915cd3a8e0b0ea0b88385.diff";
-      sha256 = "0axk8x1xvd8wvpgcxgyqqg7kgxyxwfgwmisq3xnk1da0cqv9cx9f";
-    })
   ];
 
   # NOTE: The upstream README indicates that flex is needed for some features,