diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-11-12 18:36:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 18:36:12 +0100 |
| commit | edaccfb61ab403071900a35f88922b24812ef0d3 (patch) | |
| tree | 00cb19fc55b6bc24568eca7dda24e57e4955745d | |
| parent | 1f6efaff16416fb34ecf398eb01548c9f978a416 (diff) | |
| parent | c1135fc57de106496d14bfa4be1329741a705fa6 (diff) | |
| download | nixpkgs-edaccfb61ab403071900a35f88922b24812ef0d3.tar nixpkgs-edaccfb61ab403071900a35f88922b24812ef0d3.tar.gz nixpkgs-edaccfb61ab403071900a35f88922b24812ef0d3.tar.bz2 nixpkgs-edaccfb61ab403071900a35f88922b24812ef0d3.tar.lz nixpkgs-edaccfb61ab403071900a35f88922b24812ef0d3.tar.xz nixpkgs-edaccfb61ab403071900a35f88922b24812ef0d3.tar.zst nixpkgs-edaccfb61ab403071900a35f88922b24812ef0d3.zip | |
Merge pull request #200696 from mayflower/redis-patch-cve-2022-3647
redis: patch for CVE-2022-3647
| -rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d10d8b8c073..804070d0f0f 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, lua, pkg-config, nixosTests -, tcl, which, ps +, tcl, which, ps, fetchpatch , withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd # dependency ordering is broken at the moment when building with openssl , tlsSupport ? !stdenv.hostPlatform.isStatic, openssl @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-ZwVMw3tYwSXfk714AAJh7A70Q2omtA84Jix4DlYxXMM="; }; + patches = [ + # https://nvd.nist.gov/vuln/detail/CVE-2022-3647 + (fetchpatch { + name = "CVE-2022-3647.patch"; + url = "https://github.com/redis/redis/commit/0bf90d944313919eb8e63d3588bf63a367f020a3.patch"; + sha256 = "sha256-R5Tj/bHFTRnvWXiOYvRulqePzU5zvKbGfpO87TLfLWk="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua ] |