diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2024-05-01 04:07:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-01 04:07:59 +0200 |
commit | 11f06f0d582f9082cf3db156b85e5d2064d977a9 (patch) | |
tree | 2b42c58a72efbda994dfaaa76ca018f87db98466 /pkgs | |
parent | 0a5e5189155763a2fae9d8ab9061eac1fdfd1b57 (diff) | |
parent | 3593d46b31c0002775fc9369523b39b6ae820930 (diff) |
Merge pull request #308087 from LeSuisse/libvirt-CVE-2024-2494-CVE-2024-1441
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index f82c5d18fb9d6..81dacdb493c91 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,6 +9,7 @@ , dnsmasq , docutils , fetchFromGitLab +, fetchpatch , gettext , glib , gnutls @@ -126,6 +127,16 @@ stdenv.mkDerivation rec { patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + (fetchpatch { + name = "CVE-2024-2494.patch"; + url = "https://gitlab.com/libvirt/libvirt/-/commit/8a3f8d957507c1f8223fdcf25a3ff885b15557f2.patch"; + hash = "sha256-kxSIZ4bPOhN6PpJepoSF+EDTgdmazRWh3a3KSVfm1GU="; + }) + (fetchpatch { + name = "CVE-2024-1441.patch"; + url = "https://gitlab.com/libvirt/libvirt/-/commit/c664015fe3a7bf59db26686e9ed69af011c6ebb8.patch"; + hash = "sha256-Qi/gk7+NPz9s9OpWOnF8XW6A75C9BbVxBTE4KVwalo4="; + }) ] ++ lib.optionals enableZfs [ (substituteAll { src = ./0002-substitute-zfs-and-zpool-commands.patch; |