diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-02 00:13:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 00:13:40 +0000 |
| commit | c0160e2efd58593598d7dc12145fd0b3dd563fd5 (patch) | |
| tree | 675a7316980f026b6b822ccdb0e8852032f40544 /pkgs/development | |
| parent | 62dcfe464725cb728cc09ee254a4307681019144 (diff) | |
| parent | 4ffaf69f5f50da972eec1a288b38e3a7a08bb0a5 (diff) | |
Merge release-23.11 into staging-next-23.11
Diffstat (limited to 'pkgs/development')
| -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 4c3740e4ba7c2..8c287870e6a88 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; |