@@ -4,7 +4,7 @@
44, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
55, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
66, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
7−, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
7+, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib
88, enableXen ? false, xen ? null
99, enableIscsi ? false, openiscsi
1010, enableCeph ? false, ceph
@@ -17,50 +17,26 @@ let
1717 buildFromTarball = stdenv.isDarwin;
1818in stdenv.mkDerivation rec {
1919 pname = "libvirt";
20− version = "5.4.0";
20+ version = "5.9.0";
2121
2222 src =
2323 if buildFromTarball then
2424 fetchurl {
2525 url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
26− sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
26+ sha256 = "0fc9jxw3v6x5hc10bkd7bbcayn24hbld5adj2gh5s648v7hx55il";
2727 }
2828 else
2929 fetchgit {
3030 url = git://libvirt.org/libvirt.git;
3131 rev = "v${version}";
32− sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc";
32+ sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk";
3333 fetchSubmodules = true;
3434 };
3535
36− patches = optionals (!stdenv.isDarwin) [
37− (fetchpatch {
38− name = "5.4.0-CVE-2019-10161.patch";
39− url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580";
40− sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs";
41− })
42− ] ++ [
43− (fetchpatch {
44− name = "5.4.0-CVE-2019-10166.patch";
45− url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a";
46− sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml";
47− })
48− (fetchpatch {
49− name = "5.4.0-CVE-2019-10167.patch";
50− url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26";
51− sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml";
52− })
53− (fetchpatch {
54− name = "5.4.0-CVE-2019-10168.patch";
55− url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291";
56− sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g";
57− })
58− ];
59−
6036 nativeBuildInputs = [ makeWrapper pkgconfig ];
6137 buildInputs = [
6238 libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
63− libxslt xhtml1 perlPackages.XMLXPath curl libpcap
39+ libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
6440 ] ++ optionals (!buildFromTarball) [
6541 libtool autoconf automake
6642 ] ++ optionals stdenv.isLinux [