summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gerbet <thomas@gerbet.me>2025-03-29 16:23:43 +0100
committerThomas Gerbet <thomas@gerbet.me>2025-03-29 16:23:43 +0100
commit5422963e462a52f3ab1043e050c0009de3b95b49 (patch)
tree6a8ba21fc64b57867d6b0c0d7be73c7650a13358
parent[Backport release-24.11] pyfa: 2.62.1 -> 2.62.2 (#394071) (diff)
downloadnixpkgs-5422963e462a52f3ab1043e050c0009de3b95b49.tar.gz
varnish75: apply patch for CVE-2025-30346
https://varnish-cache.org/security/VSV00015.html
-rw-r--r--pkgs/servers/varnish/default.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index d1d67d74b153..17bc57781e69 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
+ fetchpatch,
pcre,
pcre2,
jemalloc,
@@ -23,6 +24,7 @@ let
{
version,
hash,
+ patches ? [ ],
extraNativeBuildInputs ? [ ],
}:
stdenv.mkDerivation rec {
@@ -34,6 +36,8 @@ let
inherit hash;
};
+ inherit patches;
+
nativeBuildInputs = with python3.pkgs; [
pkg-config
docutils
@@ -98,5 +102,12 @@ in
varnish75 = common {
version = "7.5.0";
hash = "sha256-/KYbmDE54arGHEVG0SoaOrmAfbsdgxRXHjFIyT/3K10=";
+ patches = [
+ (fetchpatch {
+ name = "CVE-2025-30346.patch";
+ url = "https://github.com/varnishcache/varnish-cache/commit/a9640a13276048815cc51a12cda2603f4d4444e4.patch";
+ hash = "sha256-hzm09GMB7WLGp6zyqgMkxm9tJwUT9bRnEAPrX47v3e8=";
+ })
+ ];
};
}