diff --git a/srcpkgs/libvirt/patches/socket-url-arguments.patch b/srcpkgs/libvirt/patches/socket-url-arguments.patch deleted file mode 100644 index a734bfd29f3..00000000000 --- a/srcpkgs/libvirt/patches/socket-url-arguments.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git src/remote/remote_daemon.c src/remote/remote_daemon.c -index 546328b24d..5d64397062 100644 ---- src/remote/remote_daemon.c -+++ src/remote/remote_daemon.c -@@ -226,14 +226,14 @@ daemonUnixSocketPaths(struct daemonConfig *config, - - if (config->unix_sock_dir) { - if (virAsprintf(sockfile, "%s/%s-sock", -- SOCK_PREFIX, config->unix_sock_dir) < 0) -+ config->unix_sock_dir, SOCK_PREFIX) < 0) - goto cleanup; - - if (privileged) { - if (virAsprintf(rosockfile, "%s/%s-sock-ro", -- SOCK_PREFIX, config->unix_sock_dir) < 0 || -+ config->unix_sock_dir, SOCK_PREFIX) < 0 || - virAsprintf(admsockfile, "%s/%s-admin-sock", -- SOCK_PREFIX, config->unix_sock_dir) < 0) -+ config->unix_sock_dir, SOCK_PREFIX) < 0) - goto cleanup; - } - } else { diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 0e7f8df0e1c..c9b271fe4d1 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,7 +1,7 @@ # Template file for 'libvirt' pkgname=libvirt -version=5.7.0 -revision=2 +version=5.8.0 +revision=1 build_style=gnu-configure configure_args="--without-hal --with-storage-lvm --with-qemu --with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf @@ -13,19 +13,19 @@ license="LGPL-2.1-or-later" homepage="https://libvirt.org" changelog="https://libvirt.org/news.html" distfiles="https://libvirt.org/sources/${pkgname}-${version}.tar.xz" -checksum=7e91f23574c73f0da8812917922d45af1044dbe31d2526aa34e2ff29bfef62e0 +checksum=e23328289b18bdedc1e966f6c26402b2983149c660ed8bd52cda6feab0c20c55 # FIX https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701649 system_accounts="libvirt" libvirt_groups="disk,kvm" hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel - iptables libxslt docbook-xsl dnsmasq python" + iptables libxslt docbook-xsl dnsmasq python3" makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel device-mapper-devel dbus-devel eudev-libudev-devel libblkid-devel libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel jansson-devel - python-devel libssh2-devel fuse-devel libtirpc-devel + python3-devel libssh2-devel fuse-devel libtirpc-devel libapparmor-devel" depends="iptables dnsmasq" @@ -74,6 +74,6 @@ libvirt-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/gtk-doc + vmove usr/share/doc } }