upgpkg: Update libvirt-xen 7.6.0-1

upstream release

2 files changed, 80 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 967d6a3e4051..a9ed3540791f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libvirt-xen
 	pkgdesc = API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)
-	pkgver = 7.1.0
+	pkgver = 7.6.0
 	pkgrel = 1
 	url = https://libvirt.org/
 	install = libvirt.install
@@ -42,11 +42,15 @@ pkgbase = libvirt-xen
 	optdepends = qemu: QEMU/KVM support
 	optdepends = lvm2: Logical Volume Manager support
 	optdepends = open-iscsi: iSCSI support via iscsiadm
-	provides = libvirt
+	provides = libvirt=7.6.0
+	provides = libvirt.so
+	provides = libvirt-admin.so
+	provides = libvirt-lxc.so
+	provides = libvirt-qemu.so
 	conflicts = libvirt
-	options = emptydirs
 	backup = etc/conf.d/libvirtd
 	backup = etc/conf.d/libvirt-guests
+	backup = etc/conf.d/virtchd
 	backup = etc/conf.d/virtinterfaced
 	backup = etc/conf.d/virtlockd
 	backup = etc/conf.d/virtlogd
@@ -59,30 +63,33 @@ pkgbase = libvirt-xen
 	backup = etc/conf.d/virtsecretd
 	backup = etc/conf.d/virtstoraged
 	backup = etc/conf.d/virtvboxd
+	backup = etc/conf.d/virtxend
 	backup = etc/libvirt/libvirt-admin.conf
 	backup = etc/libvirt/libvirt.conf
 	backup = etc/libvirt/libvirtd.conf
+	backup = etc/libvirt/libxl.conf
+	backup = etc/libvirt/libxl-lockd.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-dhcpv6.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/allow-ipv4.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-ip-spoofing.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-mac-broadcast.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
@@ -90,6 +97,7 @@ pkgbase = libvirt-xen
 	backup = etc/libvirt/qemu.conf
 	backup = etc/libvirt/qemu-lockd.conf
 	backup = etc/libvirt/qemu/networks/default.xml
+	backup = etc/libvirt/virtchd.conf
 	backup = etc/libvirt/virtinterfaced.conf
 	backup = etc/libvirt/virtlockd.conf
 	backup = etc/libvirt/virtlogd.conf
@@ -103,22 +111,18 @@ pkgbase = libvirt-xen
 	backup = etc/libvirt/virtsecretd.conf
 	backup = etc/libvirt/virtstoraged.conf
 	backup = etc/libvirt/virtvboxd.conf
+	backup = etc/libvirt/virtxend.conf
 	backup = etc/logrotate.d/libvirtd
 	backup = etc/logrotate.d/libvirtd.lxc
+	backup = etc/logrotate.d/libvirtd.libxl
 	backup = etc/logrotate.d/libvirtd.qemu
 	backup = etc/sasl2/libvirt.conf
-	source = https://libvirt.org/sources/libvirt-7.1.0.tar.xz
-	source = https://libvirt.org/sources/libvirt-7.1.0.tar.xz.asc
+	source = https://libvirt.org/sources/libvirt-7.6.0.tar.xz
+	source = https://libvirt.org/sources/libvirt-7.6.0.tar.xz.asc
 	source = find_programs.ini
 	validpgpkeys = 453B65310595562855471199CA68BE8010084C9C
-	sha512sums = 475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6
-	sha512sums = SKIP
-	sha512sums = 41d593880a7d53e3253b491164c3055cd13ea2295457db07547ced9e11effef6f1e2c63fa6bb859b143ab3f5ce205f5b7a76170a3d007211ea16c921a4e753e2
+	sha256sums = 8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141
+	sha256sums = SKIP
+	sha256sums = 735ac805fbf06021418f82297845babf481d5681bd939a6994fbdf36fe1661e4
 
 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 47200f0ea5e9..7effdf5f965b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,38 @@
-# Maintainer: Christian Rebischke <chris.rebischke@archlinux.org>
+# Maintainer:  Mubashshir <ahmubashshir@gmail.com>
+# Contributor: Christian Rebischke <chris.rebischke@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
-_pkgname=libvirt
 pkgname=libvirt-xen
-pkgver=7.1.0
+pkgver=7.6.0
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('x86_64')
 url="https://libvirt.org/"
 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'
-)
+install="libvirt.install"
+depends=('fuse2' 'gnutls' 'libpciaccess' 'libssh' 'libxml2' 'numactl' 'parted' 'polkit' 'yajl' 'xen')
+makedepends=('bash-completion' 'ceph-libs' 'dnsmasq' 'glusterfs' 'iproute2' 'libiscsi' 'libxslt'
+			 'lvm2' 'meson' 'open-iscsi' 'python-docutils' 'qemu-headless' 'rpcsvc-proto' )
+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')
+provides=("libvirt=$pkgver" 'libvirt.so' 'libvirt-admin.so' 'libvirt-lxc.so' 'libvirt-qemu.so')
 backup=(
 	'etc/conf.d/libvirtd'
 	'etc/conf.d/libvirt-guests'
+	'etc/conf.d/virtchd'
 	'etc/conf.d/virtinterfaced'
 	'etc/conf.d/virtlockd'
 	'etc/conf.d/virtlogd'
@@ -69,30 +45,33 @@ backup=(
 	'etc/conf.d/virtsecretd'
 	'etc/conf.d/virtstoraged'
 	'etc/conf.d/virtvboxd'
+	'etc/conf.d/virtxend'
 	'etc/libvirt/libvirt-admin.conf'
 	'etc/libvirt/libvirt.conf'
 	'etc/libvirt/libvirtd.conf'
+	'etc/libvirt/libxl.conf'
+	'etc/libvirt/libxl-lockd.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-dhcpv6.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/allow-ipv4.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-ip-spoofing.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-mac-broadcast.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'
@@ -100,6 +79,7 @@ backup=(
 	'etc/libvirt/qemu.conf'
 	'etc/libvirt/qemu-lockd.conf'
 	'etc/libvirt/qemu/networks/default.xml'
+	'etc/libvirt/virtchd.conf'
 	'etc/libvirt/virtinterfaced.conf'
 	'etc/libvirt/virtlockd.conf'
 	'etc/libvirt/virtlogd.conf'
@@ -113,22 +93,22 @@ backup=(
 	'etc/libvirt/virtsecretd.conf'
 	'etc/libvirt/virtstoraged.conf'
 	'etc/libvirt/virtvboxd.conf'
+	'etc/libvirt/virtxend.conf'
 	'etc/logrotate.d/libvirtd'
 	'etc/logrotate.d/libvirtd.lxc'
+	'etc/logrotate.d/libvirtd.libxl'
 	'etc/logrotate.d/libvirtd.qemu'
 	'etc/sasl2/libvirt.conf'
 )
-install="libvirt.install"
-
-options=('emptydirs')
-source=("https://libvirt.org/sources/${_pkgname}-$pkgver.tar.xz"{,.asc}
-	"find_programs.ini")
-sha512sums=('475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6'
+source=("https://libvirt.org/sources/${pkgname%*-xen}-$pkgver.tar.xz"{,.asc}
+		"find_programs.ini")
+sha256sums=('8f967106d00aabb3cd692724bdd4a9c09e71cb2245053b98193690ee01766141'
             'SKIP'
-            '41d593880a7d53e3253b491164c3055cd13ea2295457db07547ced9e11effef6f1e2c63fa6bb859b143ab3f5ce205f5b7a76170a3d007211ea16c921a4e753e2')
+            '735ac805fbf06021418f82297845babf481d5681bd939a6994fbdf36fe1661e4')
 validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com>
+
 prepare() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${pkgname%*-xen}-${pkgver}"
 
 	sed -i 's|/sysconfig/|/conf.d/|g' \
 		src/remote/libvirtd.service.in \
@@ -138,33 +118,30 @@ prepare() {
 	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 "${_pkgname}-$pkgver"
-	export LDFLAGS=-lX11
+	cd "${pkgname%*-xen}-$pkgver"
+
 	arch-meson build \
 		--libexecdir=lib/libvirt \
 		--native-file "$srcdir"/find_programs.ini \
 		-Drunstatedir=/run \
 		-Dqemu_user=nobody \
 		-Dqemu_group=kvm \
-		-Dnetcf=enabled \
+		-Dnetcf=disabled \
 		-Dopenwsman=disabled \
 		-Dapparmor=disabled \
+		-Dapparmor_profiles=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_libxl=enabled \
 		-Ddriver_vz=disabled \
-		-Ddriver_esx=disabled \
+		-Dsanlock=disabled \
 		-Dsecdriver_apparmor=disabled \
 		-Dsecdriver_selinux=disabled \
 		-Dstorage_sheepdog=disabled \
@@ -176,27 +153,36 @@ build() {
 
 	ninja -C build
 }
+
+check() {
+	cd "${pkgname%*-xen}-$pkgver"
+
+	ninja -C build test
+}
+
 package() {
-	provides=("libvirt=$pkgver" 'libvirt.so' 'libvirt-admin.so' 'libvirt-lxc.so' 'libvirt-qemu.so')
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+	cd "${pkgname%*-xen}-${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"
+		"$pkgdir/var/cache/libvirt/qemu"
 	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"