Unverified Commit 11f06f0d authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #308087 from LeSuisse/libvirt-CVE-2024-2494-CVE-2024-1441

parents 0a5e5189 3593d46b

pkgs/development/libraries/libvirt/default.nix

+11 −0
Original line number Diff line number Diff line
@@ -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;