libvirt 7.1.0, patch by ahmubashshir

7 files changed, 264 insertions, 210 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3fed72e4865..967d6a3e4051 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,110 +1,124 @@
 pkgbase = libvirt-xen
 	pkgdesc = API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)
-	pkgver = 5.3.0
+	pkgver = 7.1.0
 	pkgrel = 1
 	url = https://libvirt.org/
 	install = libvirt.install
 	arch = x86_64
 	license = LGPL
-	makedepends = lvm2
-	makedepends = linux-api-headers
+	license = GPL3
+	makedepends = bash-completion
+	makedepends = ceph-libs
 	makedepends = dnsmasq
-	makedepends = lxc
+	makedepends = glusterfs
+	makedepends = iproute2
 	makedepends = libiscsi
-	makedepends = open-iscsi
-	makedepends = perl-xml-xpath
 	makedepends = libxslt
-	makedepends = qemu
-	makedepends = parted
-	makedepends = python
-	depends = e2fsprogs
+	makedepends = lvm2
+	makedepends = meson
+	makedepends = open-iscsi
+	makedepends = python-docutils
+	makedepends = qemu-headless
+	makedepends = rpcsvc-proto
+	depends = fuse2
 	depends = gnutls
-	depends = iptables
+	depends = libpciaccess
+	depends = libssh
 	depends = libxml2
+	depends = numactl
 	depends = parted
 	depends = polkit
-	depends = avahi
 	depends = yajl
-	depends = libpciaccess
-	depends = udev
-	depends = dbus
-	depends = libxau
-	depends = libxdmcp
-	depends = libpcap
-	depends = libcap-ng
-	depends = curl
-	depends = libsasl
-	depends = libgcrypt
-	depends = libgpg-error
-	depends = openssl
-	depends = libxcb
-	depends = gcc-libs
-	depends = iproute2
-	depends = libnl
-	depends = libx11
-	depends = numactl
-	depends = gettext
-	depends = libssh2
-	depends = netcf
-	depends = fuse2
-	depends = glusterfs
-	depends = ceph-libs
-	depends = libiscsi
 	depends = xen
-	optdepends = ebtables: required for default NAT networking
+	optdepends = libvirt-storage-gluster: Gluster storage backend
+	optdepends = libvirt-storage-iscsi-direct: iSCSI-direct storage backend
+	optdepends = libvirt-storage-rbd: RBD storage backend
+	optdepends = gettext: required for libvirt-guests.service
+	optdepends = openbsd-netcat: for remote management over ssh
+	optdepends = dmidecode: DMI system info support
 	optdepends = dnsmasq: required for default NAT/DHCP for guests
-	optdepends = bridge-utils: for bridged networking
-	optdepends = netcat: for remote management over ssh
-	optdepends = qemu
-	optdepends = radvd
-	optdepends = dmidecode
-	optdepends = parted
-	optdepends = ceph: for ceph support
-	optdepends = qemu-block-gluster: for qemu glusterfs support
+	optdepends = radvd: IPv6 RAD support
+	optdepends = ebtables: required for default NAT networking
+	optdepends = qemu: QEMU/KVM support
+	optdepends = lvm2: Logical Volume Manager support
+	optdepends = open-iscsi: iSCSI support via iscsiadm
 	provides = libvirt
 	conflicts = libvirt
 	options = emptydirs
-	backup = etc/conf.d/libvirt-guests
 	backup = etc/conf.d/libvirtd
+	backup = etc/conf.d/libvirt-guests
+	backup = etc/conf.d/virtinterfaced
+	backup = etc/conf.d/virtlockd
+	backup = etc/conf.d/virtlogd
+	backup = etc/conf.d/virtlxcd
+	backup = etc/conf.d/virtnetworkd
+	backup = etc/conf.d/virtnodedevd
+	backup = etc/conf.d/virtnwfilterd
+	backup = etc/conf.d/virtproxyd
+	backup = etc/conf.d/virtqemud
+	backup = etc/conf.d/virtsecretd
+	backup = etc/conf.d/virtstoraged
+	backup = etc/conf.d/virtvboxd
+	backup = etc/libvirt/libvirt-admin.conf
 	backup = etc/libvirt/libvirt.conf
-	backup = etc/libvirt/virtlogd.conf
 	backup = etc/libvirt/libvirtd.conf
 	backup = etc/libvirt/lxc.conf
 	backup = etc/libvirt/nwfilter/allow-arp.xml
 	backup = etc/libvirt/nwfilter/allow-dhcp-server.xml
+	backup = etc/libvirt/nwfilter/allow-dhcpv6-server.xml
+	backup = etc/libvirt/nwfilter/allow-dhcpv6.xml
 	backup = etc/libvirt/nwfilter/allow-dhcp.xml
 	backup = etc/libvirt/nwfilter/allow-incoming-ipv4.xml
+	backup = etc/libvirt/nwfilter/allow-incoming-ipv6.xml
 	backup = etc/libvirt/nwfilter/allow-ipv4.xml
+	backup = etc/libvirt/nwfilter/allow-ipv6.xml
+	backup = etc/libvirt/nwfilter/clean-traffic-gateway.xml
 	backup = etc/libvirt/nwfilter/clean-traffic.xml
 	backup = etc/libvirt/nwfilter/no-arp-ip-spoofing.xml
 	backup = etc/libvirt/nwfilter/no-arp-mac-spoofing.xml
 	backup = etc/libvirt/nwfilter/no-arp-spoofing.xml
 	backup = etc/libvirt/nwfilter/no-ip-multicast.xml
 	backup = etc/libvirt/nwfilter/no-ip-spoofing.xml
+	backup = etc/libvirt/nwfilter/no-ipv6-multicast.xml
+	backup = etc/libvirt/nwfilter/no-ipv6-spoofing.xml
 	backup = etc/libvirt/nwfilter/no-mac-broadcast.xml
 	backup = etc/libvirt/nwfilter/no-mac-spoofing.xml
 	backup = etc/libvirt/nwfilter/no-other-l2-traffic.xml
 	backup = etc/libvirt/nwfilter/no-other-rarp-traffic.xml
 	backup = etc/libvirt/nwfilter/qemu-announce-self-rarp.xml
 	backup = etc/libvirt/nwfilter/qemu-announce-self.xml
-	backup = etc/libvirt/qemu-lockd.conf
 	backup = etc/libvirt/qemu.conf
+	backup = etc/libvirt/qemu-lockd.conf
 	backup = etc/libvirt/qemu/networks/default.xml
-	backup = etc/libvirt/virt-login-shell.conf
+	backup = etc/libvirt/virtinterfaced.conf
 	backup = etc/libvirt/virtlockd.conf
+	backup = etc/libvirt/virtlogd.conf
+	backup = etc/libvirt/virt-login-shell.conf
+	backup = etc/libvirt/virtlxcd.conf
+	backup = etc/libvirt/virtnetworkd.conf
+	backup = etc/libvirt/virtnodedevd.conf
+	backup = etc/libvirt/virtnwfilterd.conf
+	backup = etc/libvirt/virtproxyd.conf
+	backup = etc/libvirt/virtqemud.conf
+	backup = etc/libvirt/virtsecretd.conf
+	backup = etc/libvirt/virtstoraged.conf
+	backup = etc/libvirt/virtvboxd.conf
 	backup = etc/logrotate.d/libvirtd
 	backup = etc/logrotate.d/libvirtd.lxc
 	backup = etc/logrotate.d/libvirtd.qemu
-	backup = etc/logrotate.d/libvirtd.uml
 	backup = etc/sasl2/libvirt.conf
-	source = https://libvirt.org/sources/libvirt-5.3.0.tar.xz
-	source = libvirtd.conf.d
-	source = libvirtd-guests.conf.d
-	source = libvirt.sysusers.d
-	sha512sums = de3888d448463ff1d981e8dcf1aaed39c8215c368d133ed03b8cc5d7e05a77d385287d388d9db109df21df9bf348a14e7c654ca509d41addaadaa199d16b162e
-	sha512sums = fc0e16e045a2c84d168d42c97d9e14ca32ba0d86025135967f4367cf3fa663882eefb6923ebf04676ae763f4f459e5156d7221b36b47c835f9e531c6b6e0cd9d
-	sha512sums = ef221bae994ad0a15ab5186b7469132896156d82bfdc3ef3456447d5cf1af347401ef33e8665d5b2f76451f5457aee7ea01064d7b9223d6691c90c4456763258
-	sha512sums = 519a9f245bed077137a1b01dec07a178885ac2527b47a1bd883bbb908bf9b4fa0c039525600e09f7db636f8849870fe2ce8ffe5b75532ff9d3fa1a91115875f8
+	source = https://libvirt.org/sources/libvirt-7.1.0.tar.xz
+	source = https://libvirt.org/sources/libvirt-7.1.0.tar.xz.asc
+	source = find_programs.ini
+	validpgpkeys = 453B65310595562855471199CA68BE8010084C9C
+	sha512sums = 475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6
+	sha512sums = SKIP
+	sha512sums = 41d593880a7d53e3253b491164c3055cd13ea2295457db07547ced9e11effef6f1e2c63fa6bb859b143ab3f5ce205f5b7a76170a3d007211ea16c921a4e753e2
 
 pkgname = libvirt-xen
+	provides = libvirt=7.1.0
+	provides = libvirt.so
+	provides = libvirt-admin.so
+	provides = libvirt-lxc.so
+	provides = libvirt-qemu.so
 
diff --git a/PKGBUILD b/PKGBUILD
index 7fbc712a4830..47200f0ea5e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,152 +4,201 @@
 
 _pkgname=libvirt
 pkgname=libvirt-xen
-pkgver=5.3.0
+pkgver=7.1.0
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('x86_64')
 url="https://libvirt.org/"
-license=('LGPL')
-makedepends=('lvm2' 'linux-api-headers' 'dnsmasq' 'lxc' 'libiscsi' 'open-iscsi'
-             'perl-xml-xpath' 'libxslt' 'qemu' 'parted' 'python')
-depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'avahi'
-         'yajl' 'libpciaccess' 'udev' 'dbus' 'libxau' 'libxdmcp' 'libpcap'
-         'libcap-ng' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl'
-         'libxcb' 'gcc-libs' 'iproute2' 'libnl' 'libx11' 'numactl' 'gettext'
-         'libssh2' 'netcf' 'fuse2' 'glusterfs' 'ceph-libs' 'libiscsi' 'xen')
-optdepends=('ebtables: required for default NAT networking'
-            'dnsmasq: required for default NAT/DHCP for guests'
-            'bridge-utils: for bridged networking'
-            'netcat: for remote management over ssh'
-            'qemu'
-            'radvd'
-            'dmidecode'
-            'parted'
-            'ceph: for ceph support'
-            'qemu-block-gluster: for qemu glusterfs support')
+license=('LGPL' 'GPL3') #libvirt_parthelper links to libparted which is GPL3 only
+makedepends=(
+	'bash-completion'
+	'ceph-libs'
+	'dnsmasq'
+	'glusterfs'
+	'iproute2'
+	'libiscsi'
+	'libxslt'
+	'lvm2'
+	'meson'
+	'open-iscsi'
+	'python-docutils'
+	'qemu-headless'
+	'rpcsvc-proto'
+)
+depends=(
+	'fuse2'
+	'gnutls'
+	'libpciaccess'
+	'libssh'
+	'libxml2'
+	'numactl'
+	'parted'
+	'polkit'
+	'yajl'
+	'xen'
+)
+optdepends=(
+	'libvirt-storage-gluster: Gluster storage backend'
+	'libvirt-storage-iscsi-direct: iSCSI-direct storage backend'
+	'libvirt-storage-rbd: RBD storage backend'
+	'gettext: required for libvirt-guests.service'
+	'openbsd-netcat: for remote management over ssh'
+	'dmidecode: DMI system info support'
+	'dnsmasq: required for default NAT/DHCP for guests'
+	'radvd: IPv6 RAD support'
+	'ebtables: required for default NAT networking'
+	'qemu: QEMU/KVM support'
+	'lvm2: Logical Volume Manager support'
+	'open-iscsi: iSCSI support via iscsiadm'
+)
+
 conflicts=('libvirt')
 provides=('libvirt')
-backup=('etc/conf.d/libvirt-guests'
-  'etc/conf.d/libvirtd'
-  'etc/libvirt/libvirt.conf'
-  'etc/libvirt/virtlogd.conf'
-  'etc/libvirt/libvirtd.conf'
-  'etc/libvirt/lxc.conf'
-  'etc/libvirt/nwfilter/allow-arp.xml'
-  'etc/libvirt/nwfilter/allow-dhcp-server.xml'
-  'etc/libvirt/nwfilter/allow-dhcp.xml'
-  'etc/libvirt/nwfilter/allow-incoming-ipv4.xml'
-  'etc/libvirt/nwfilter/allow-ipv4.xml'
-  'etc/libvirt/nwfilter/clean-traffic.xml'
-  'etc/libvirt/nwfilter/no-arp-ip-spoofing.xml'
-  'etc/libvirt/nwfilter/no-arp-mac-spoofing.xml'
-  'etc/libvirt/nwfilter/no-arp-spoofing.xml'
-  'etc/libvirt/nwfilter/no-ip-multicast.xml'
-  'etc/libvirt/nwfilter/no-ip-spoofing.xml'
-  'etc/libvirt/nwfilter/no-mac-broadcast.xml'
-  'etc/libvirt/nwfilter/no-mac-spoofing.xml'
-  'etc/libvirt/nwfilter/no-other-l2-traffic.xml'
-  'etc/libvirt/nwfilter/no-other-rarp-traffic.xml'
-  'etc/libvirt/nwfilter/qemu-announce-self-rarp.xml'
-  'etc/libvirt/nwfilter/qemu-announce-self.xml'
-  'etc/libvirt/qemu-lockd.conf'
-  'etc/libvirt/qemu.conf'
-  'etc/libvirt/qemu/networks/default.xml'
-  'etc/libvirt/virt-login-shell.conf'
-  'etc/libvirt/virtlockd.conf'
-  'etc/logrotate.d/libvirtd'
-  'etc/logrotate.d/libvirtd.lxc'
-  'etc/logrotate.d/libvirtd.qemu'
-  'etc/logrotate.d/libvirtd.uml'
-  'etc/sasl2/libvirt.conf')
+backup=(
+	'etc/conf.d/libvirtd'
+	'etc/conf.d/libvirt-guests'
+	'etc/conf.d/virtinterfaced'
+	'etc/conf.d/virtlockd'
+	'etc/conf.d/virtlogd'
+	'etc/conf.d/virtlxcd'
+	'etc/conf.d/virtnetworkd'
+	'etc/conf.d/virtnodedevd'
+	'etc/conf.d/virtnwfilterd'
+	'etc/conf.d/virtproxyd'
+	'etc/conf.d/virtqemud'
+	'etc/conf.d/virtsecretd'
+	'etc/conf.d/virtstoraged'
+	'etc/conf.d/virtvboxd'
+	'etc/libvirt/libvirt-admin.conf'
+	'etc/libvirt/libvirt.conf'
+	'etc/libvirt/libvirtd.conf'
+	'etc/libvirt/lxc.conf'
+	'etc/libvirt/nwfilter/allow-arp.xml'
+	'etc/libvirt/nwfilter/allow-dhcp-server.xml'
+	'etc/libvirt/nwfilter/allow-dhcpv6-server.xml'
+	'etc/libvirt/nwfilter/allow-dhcpv6.xml'
+	'etc/libvirt/nwfilter/allow-dhcp.xml'
+	'etc/libvirt/nwfilter/allow-incoming-ipv4.xml'
+	'etc/libvirt/nwfilter/allow-incoming-ipv6.xml'
+	'etc/libvirt/nwfilter/allow-ipv4.xml'
+	'etc/libvirt/nwfilter/allow-ipv6.xml'
+	'etc/libvirt/nwfilter/clean-traffic-gateway.xml'
+	'etc/libvirt/nwfilter/clean-traffic.xml'
+	'etc/libvirt/nwfilter/no-arp-ip-spoofing.xml'
+	'etc/libvirt/nwfilter/no-arp-mac-spoofing.xml'
+	'etc/libvirt/nwfilter/no-arp-spoofing.xml'
+	'etc/libvirt/nwfilter/no-ip-multicast.xml'
+	'etc/libvirt/nwfilter/no-ip-spoofing.xml'
+	'etc/libvirt/nwfilter/no-ipv6-multicast.xml'
+	'etc/libvirt/nwfilter/no-ipv6-spoofing.xml'
+	'etc/libvirt/nwfilter/no-mac-broadcast.xml'
+	'etc/libvirt/nwfilter/no-mac-spoofing.xml'
+	'etc/libvirt/nwfilter/no-other-l2-traffic.xml'
+	'etc/libvirt/nwfilter/no-other-rarp-traffic.xml'
+	'etc/libvirt/nwfilter/qemu-announce-self-rarp.xml'
+	'etc/libvirt/nwfilter/qemu-announce-self.xml'
+	'etc/libvirt/qemu.conf'
+	'etc/libvirt/qemu-lockd.conf'
+	'etc/libvirt/qemu/networks/default.xml'
+	'etc/libvirt/virtinterfaced.conf'
+	'etc/libvirt/virtlockd.conf'
+	'etc/libvirt/virtlogd.conf'
+	'etc/libvirt/virt-login-shell.conf'
+	'etc/libvirt/virtlxcd.conf'
+	'etc/libvirt/virtnetworkd.conf'
+	'etc/libvirt/virtnodedevd.conf'
+	'etc/libvirt/virtnwfilterd.conf'
+	'etc/libvirt/virtproxyd.conf'
+	'etc/libvirt/virtqemud.conf'
+	'etc/libvirt/virtsecretd.conf'
+	'etc/libvirt/virtstoraged.conf'
+	'etc/libvirt/virtvboxd.conf'
+	'etc/logrotate.d/libvirtd'
+	'etc/logrotate.d/libvirtd.lxc'
+	'etc/logrotate.d/libvirtd.qemu'
+	'etc/sasl2/libvirt.conf'
+)
 install="libvirt.install"
 
 options=('emptydirs')
-source=("https://libvirt.org/sources/${_pkgname}-${pkgver}.tar.xz"
-        'libvirtd.conf.d'
-        'libvirtd-guests.conf.d'
-        'libvirt.sysusers.d')
-sha512sums=('de3888d448463ff1d981e8dcf1aaed39c8215c368d133ed03b8cc5d7e05a77d385287d388d9db109df21df9bf348a14e7c654ca509d41addaadaa199d16b162e'
-            'fc0e16e045a2c84d168d42c97d9e14ca32ba0d86025135967f4367cf3fa663882eefb6923ebf04676ae763f4f459e5156d7221b36b47c835f9e531c6b6e0cd9d'
-            'ef221bae994ad0a15ab5186b7469132896156d82bfdc3ef3456447d5cf1af347401ef33e8665d5b2f76451f5457aee7ea01064d7b9223d6691c90c4456763258'
-            '519a9f245bed077137a1b01dec07a178885ac2527b47a1bd883bbb908bf9b4fa0c039525600e09f7db636f8849870fe2ce8ffe5b75532ff9d3fa1a91115875f8')
-
+source=("https://libvirt.org/sources/${_pkgname}-$pkgver.tar.xz"{,.asc}
+	"find_programs.ini")
+sha512sums=('475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6'
+            'SKIP'
+            '41d593880a7d53e3253b491164c3055cd13ea2295457db07547ced9e11effef6f1e2c63fa6bb859b143ab3f5ce205f5b7a76170a3d007211ea16c921a4e753e2')
+validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com>
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  #local src
-  #for src in "${source[@]}"; do
-  #  src="${src%%::*}"
-  #  src="${src##*/}"
-  #  [[ $src = *.patch ]] || continue
-  #  msg2 "Applying patch $src..."
-  #  patch -Np1 < "../$src"
-  #done
-
-  autoreconf -vi
-
-  sed -i 's|/sysconfig/|/conf.d/|g' \
-    src/remote/libvirtd.service.in \
-    tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \
-    src/locking/virtlockd.service.in
-  sed -i 's|@sbindir@|/usr/bin|g' src/locking/virtlockd.service.in
-  sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \
-    src/qemu/qemu{.conf,_conf.c} \
-    src/qemu/test_libvirtd_qemu.aug.in
-
-  sed -i 's|libsystemd-daemon|libsystemd|g' configure
-  sed -i 's/notify/simple/' src/remote/libvirtd.service.in
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+
+	sed -i 's|/sysconfig/|/conf.d/|g' \
+		src/remote/libvirtd.service.in \
+		tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \
+		src/locking/virtlockd.service.in \
+		src/logging/virtlogd.service.in
+	sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \
+		src/qemu/qemu.conf \
+		src/qemu/test_libvirtd_qemu.aug.in
+	sed -i 's/notify/simple/' src/remote/libvirtd.service.in
+	sed -Ei '/^\s+runutf8,$/,/^\s+\]/{/^\s+runutf8,$/d;s/^(\s+\])/\1 + runutf8/}' tests/meson.build
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  export PYTHON=$(command -v python)
-  export LDFLAGS=-lX11
-  export RADVD=/usr/bin/radvd
-  [ -f Makefile ] || ZFS=/usr/bin/zfs ZPOOL=/usr/bin/zpool ./configure \
-    --prefix=/usr \
-    --libexec=/usr/lib/"${_pkgname}" \
-    --sbindir=/usr/bin \
-    --disable-static \
-    --with-init-script=systemd \
-    --with-qemu \
-    --with-qemu-user=nobody \
-    --with-qemu-group=kvm \
-    --without-hal \
-    --with-interface \
-    --with-lxc \
-    --with-netcf \
-    --with-udev \
-    --with-storage-disk \
-    --with-storage-gluster \
-    --with-storage-iscsi \
-    --with-storage-lvm \
-    --with-storage-zfs \
-    --with-xen \
-    --without-wireshark-dissector
-    # --with-audit
-    make
+	cd "${_pkgname}-$pkgver"
+	export LDFLAGS=-lX11
+	arch-meson build \
+		--libexecdir=lib/libvirt \
+		--native-file "$srcdir"/find_programs.ini \
+		-Drunstatedir=/run \
+		-Dqemu_user=nobody \
+		-Dqemu_group=kvm \
+		-Dnetcf=enabled \
+		-Dopenwsman=disabled \
+		-Dapparmor=disabled \
+		-Dselinux=disabled \
+		-Dwireshark_dissector=disabled \
+		-Ddriver_bhyve=disabled \
+		-Ddriver_hyperv=disabled \
+		-Ddriver_openvz=disabled \
+		-Ddriver_vbox=disabled \
+		-Ddriver_vmware=disabled \
+		-Ddriver_vz=disabled \
+		-Ddriver_openvz=disabled \
+		-Ddriver_vz=disabled \
+		-Ddriver_esx=disabled \
+		-Dsecdriver_apparmor=disabled \
+		-Dsecdriver_selinux=disabled \
+		-Dstorage_sheepdog=disabled \
+		-Dstorage_vstorage=disabled \
+		-Ddtrace=disabled \
+		-Dnumad=disabled \
+		-Dstorage_zfs=enabled \
+		-Dstorage_rbd=enabled
+
+	ninja -C build
 }
-
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 "${srcdir}"/libvirtd.conf.d "${pkgdir}"/etc/conf.d/libvirtd
-  install -D -m644 "${srcdir}"/libvirtd-guests.conf.d "${pkgdir}"/etc/conf.d/libvirt-guests
-  install -D -m644 "${srcdir}"/libvirt.sysusers.d "${pkgdir}"/usr/lib/sysusers.d/libvirt.conf
-
-  chown 0:102 "${pkgdir}"/usr/share/polkit-1/rules.d
-  chmod 0750 "${pkgdir}"/usr/share/polkit-1/rules.d
-
-  rm -rf \
-    "${pkgdir}"/var/run \
-    "${pkgdir}"/var/lib/libvirt/qemu \
-    "${pkgdir}"/var/cache/libvirt/qemu \
-    "${pkgdir}"/etc/sysconfig
-
-  rm -f "${pkgdir}"/etc/libvirt/qemu/networks/autostart/default.xml
+	provides=("libvirt=$pkgver" 'libvirt.so' 'libvirt-admin.so' 'libvirt-lxc.so' 'libvirt-qemu.so')
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	DESTDIR="$pkgdir" ninja -C build install
+	mv "$pkgdir"/etc/{sysconfig,conf.d}
+	mkdir "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
+	echo "g libvirt - -" > "$pkgdir/usr/lib/sysusers.d/libvirt.conf"
+	echo "z /var/lib/libvirt/qemu 0751" > "$pkgdir/usr/lib/tmpfiles.d/libvirt.conf"
+	chown 0:102 "$pkgdir/usr/share/polkit-1/rules.d"
+	chmod 0750 "$pkgdir/usr/share/polkit-1/rules.d"
+	chmod 600 "$pkgdir"/etc/libvirt/nwfilter/*.xml \
+		"$pkgdir/etc/libvirt/qemu/networks/default.xml"
+	# Strip auto-generated UUID, so it will be generated per-install. (reproducible builds)
+	sed -i 's|<uuid>.*</uuid>|<uuid></uuid>|' "$pkgdir"/etc/libvirt/qemu/networks/default.xml
+	rm -rf \
+		"$pkgdir/run" \
+		"$pkgdir/var/lib/libvirt/qemu" \
+		"$pkgdir/var/cache/libvirt/qemu" \
+		"$pkgdir/etc/logrotate.d/libvirtd.libxl"
+	rm -f "$pkgdir/etc/libvirt/qemu/networks/autostart/default.xml"
+	# move split modules
+	rm "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_{rbd,gluster}.so
+	rm "$pkgdir/usr/lib/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so"
+	rm "$pkgdir/usr/lib/libvirt/storage-file/libvirt_storage_file_gluster.so"
 }
 
diff --git a/find_programs.ini b/find_programs.ini
new file mode 100644
index 000000000000..c752f4db26c1
--- /dev/null
+++ b/find_programs.ini
@@ -0,0 +1,5 @@
+[binaries]
+# these don't exist in the official repos, but if users get them some other
+# way then this is the expected path for them
+zfs = '/usr/bin/zfs'
+zpool = '/usr/bin/zpool'
diff --git a/libvirt.install b/libvirt.install
index 365f7f4f1d33..747bd548b123 100644
--- a/libvirt.install
+++ b/libvirt.install
@@ -1,9 +1,7 @@
 post_install() {
-  echo ">>> libvirt runs qemu from nobody:kvm by default"
-  echo ">>> change the USER if desired in /etc/libvirt/qemu.conf"
-  echo ">>> See https://wiki.archlinux.org/index.php/Libvirt for more info"
-}
-
-post_upgrade() {
-  echo ">>> You may need to run 'rm -rf ~/.libvirt'"
+  if [[ -f /etc/libvirt/qemu/networks/default.xml ]]
+  then
+    UUID=$(/usr/bin/uuidgen)
+    sed -i "s|<uuid></uuid>|<uuid>$UUID</uuid>|" /etc/libvirt/qemu/networks/default.xml
+  fi
 }
diff --git a/libvirt.sysusers.d b/libvirt.sysusers.d
deleted file mode 100644
index 6ffff043195b..000000000000
--- a/libvirt.sysusers.d
+++ /dev/null
@@ -1,2 +0,0 @@
-g libvirt - -
-g tss - -
diff --git a/libvirtd-guests.conf.d b/libvirtd-guests.conf.d
deleted file mode 100644
index 10e80a606915..000000000000
--- a/libvirtd-guests.conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-BYPASS_CACHE=0
-CONNECT_RETRIES=10
-ON_BOOT=start
-ON_SHUTDOWN=suspend
-PARALLEL_SHUTDOWN=0
-RETRIES_SLEEP=1
-SHUTDOWN_TIMEOUT=300
-START_DELAY=0
-URIS=default
diff --git a/libvirtd.conf.d b/libvirtd.conf.d
deleted file mode 100644
index e2e87c8dab93..000000000000
--- a/libvirtd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-LIBVIRTD_ARGS=""