diff --git a/libvirt/.SRCINFO b/libvirt/.SRCINFO index 11b133818d..0e2e989ba3 100644 --- a/libvirt/.SRCINFO +++ b/libvirt/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = libvirt pkgdesc = API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc) - pkgver = 10.10.0 + pkgver = 11.0.0 pkgrel = 2 epoch = 1 url = https://libvirt.org/ @@ -118,16 +118,16 @@ pkgbase = libvirt backup = etc/logrotate.d/libvirtd.lxc backup = etc/logrotate.d/libvirtd.qemu backup = etc/sasl2/libvirt.conf - source = https://libvirt.org/sources/libvirt-10.10.0.tar.xz - source = https://libvirt.org/sources/libvirt-10.10.0.tar.xz.asc - source = libvirt-fix-tpm.patch::https://gitlab.com/libvirt/libvirt/-/commit/81da7a2c.patch + source = https://libvirt.org/sources/libvirt-11.0.0.tar.xz + source = https://libvirt.org/sources/libvirt-11.0.0.tar.xz.asc + source = https://gitlab.com/libvirt/libvirt/-/merge_requests/448.patch validpgpkeys = 453B65310595562855471199CA68BE8010084C9C - sha256sums = e1bd7bd31b7c0d0ae073dec050bb5b0232b3e4adebdc58ea82fe8b366c765796 + sha256sums = 01a176ff4042ad58cf83c09fe0925d6bc8eed0ecce1e0ee19b8ef4c1ffa3806e sha256sums = SKIP - sha256sums = 8a33a1b321f3f8eb27788c6efc7326c96780d046a1d0057c79cc4ed969785cfd + sha256sums = b71b3ae1c9ad9c0d2c77ca769c3220429e93cc8ca78dbbb01af17149908b20a5 pkgname = libvirt - provides = libvirt=10.10.0 + provides = libvirt=11.0.0 provides = libvirt.so provides = libvirt-admin.so provides = libvirt-lxc.so @@ -135,7 +135,7 @@ pkgname = libvirt pkgname = libvirt-storage-gluster pkgdesc = Libvirt Gluster storage backend - depends = libvirt=10.10.0 + depends = libvirt=11.0.0 depends = gcc-libs depends = glib2 depends = glibc @@ -145,7 +145,7 @@ pkgname = libvirt-storage-gluster pkgname = libvirt-storage-iscsi-direct pkgdesc = Libvirt iSCSI-direct storage backend - depends = libvirt=10.10.0 + depends = libvirt=11.0.0 depends = gcc-libs depends = glib2 depends = glibc diff --git a/libvirt/PKGBUILD b/libvirt/PKGBUILD index 398802bb98..9e58864e5b 100644 --- a/libvirt/PKGBUILD +++ b/libvirt/PKGBUILD @@ -7,7 +7,7 @@ pkgname=(libvirt libvirt-storage-gluster libvirt-storage-iscsi-direct) epoch=1 -pkgver=10.10.0 +pkgver=11.0.0 pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) @@ -132,11 +132,11 @@ backup=( ) source=( "https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc} - libvirt-fix-tpm.patch::https://gitlab.com/libvirt/libvirt/-/commit/81da7a2c.patch + "https://gitlab.com/libvirt/libvirt/-/merge_requests/448.patch" ) -sha256sums=('e1bd7bd31b7c0d0ae073dec050bb5b0232b3e4adebdc58ea82fe8b366c765796' +sha256sums=('01a176ff4042ad58cf83c09fe0925d6bc8eed0ecce1e0ee19b8ef4c1ffa3806e' 'SKIP' - '8a33a1b321f3f8eb27788c6efc7326c96780d046a1d0057c79cc4ed969785cfd') + 'b71b3ae1c9ad9c0d2c77ca769c3220429e93cc8ca78dbbb01af17149908b20a5') validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark prepare() { @@ -151,8 +151,7 @@ prepare() { src/qemu/qemu.conf.in \ src/qemu/test_libvirtd_qemu.aug.in - # Backport fix for https://gitlab.archlinux.org/archlinux/packaging/packages/libvirt/-/issues/5 - patch -Np1 -i ../libvirt-fix-tpm.patch + patch -Np1 < ../448.patch } build() { @@ -198,7 +197,7 @@ package_libvirt() { mkdir -p "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d echo 'g libvirt - -' > "$pkgdir/usr/lib/sysusers.d/libvirt-qemu.conf" - echo 'u libvirt-qemu /var/lib/libvirt "Libvirt QEMU user"' >> "$pkgdir/usr/lib/sysusers.d/libvirt.conf" + echo 'u! libvirt-qemu /var/lib/libvirt "Libvirt QEMU user"' >> "$pkgdir/usr/lib/sysusers.d/libvirt.conf" echo 'm libvirt-qemu kvm' >> "$pkgdir/usr/lib/sysusers.d/libvirt.conf" echo 'z /var/lib/libvirt/qemu 0751' > "$pkgdir/usr/lib/tmpfiles.d/libvirt.conf"