diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 21b47cc19..e22729e0f 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -8,8 +8,8 @@ # - removed qemu makedepend pkgname=(libvirt libvirt-storage-gluster libvirt-storage-iscsi-direct) -pkgver=6.5.0 -pkgrel=2 +pkgver=6.8.0 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('x86_64') url="https://libvirt.org/" @@ -17,7 +17,7 @@ license=('LGPL' 'GPL3') #libvirt_parthelper links to libparted which is GPL3 onl install=libvirt.install depends=('libpciaccess' 'yajl' 'fuse2' 'gnutls' 'parted' 'libssh' 'libxml2' 'numactl' 'polkit') makedepends=('libxslt' 'python-docutils' 'lvm2' 'open-iscsi' 'libiscsi' 'glusterfs' - 'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2') + 'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2' 'meson') checkdepends=('ebtables') optdepends=('libvirt-storage-gluster: Gluster storage backend' 'libvirt-storage-iscsi-direct: iSCSI-direct storage backend' @@ -87,53 +87,79 @@ backup=( 'etc/logrotate.d/libvirtd.qemu' 'etc/sasl2/libvirt.conf' ) -source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc} - "CVE-2020-14339.patch") -sha256sums=('4915d9eab299ed79288d7598b717c587156708c05f701fe55a72293f32eb3182' - 'SKIP' - 'af90e325ae5f6f3f946695a8900ef2ea8cd579da61c608d69c4c550a8bc1b9db') -validpgpkeys=('C74415BA7C9C7F78F02E1DC34606B8A5DE95BC1F') # Daniel Veillard +source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc}) +b2sums=('c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2' + 'SKIP') +validpgpkeys=('C74415BA7C9C7F78F02E1DC34606B8A5DE95BC1F' # Daniel Veillard + '453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark > build/meson-config.h + echo '#define ZPOOL "/usr/bin/zpool"' >> build/meson-config.h + + meson compile -C build } check() { - cd build - make check + meson test -C build --print-errorlogs } package_libvirt() { provides=('libvirt.so' 'libvirt-admin.so' 'libvirt-lxc.so' 'libvirt-qemu.so') - cd build - make DESTDIR="$pkgdir" install + install=libvirt.install + DESTDIR="$pkgdir" meson install -C build mv "$pkgdir"/etc/{sysconfig,conf.d} mkdir "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d @@ -157,9 +183,10 @@ package_libvirt() { rm -f "$pkgdir/etc/libvirt/qemu/networks/autostart/default.xml" # move split modules - mv "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_gluster.so "$pkgdir/../" - mv "$pkgdir/usr/lib/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so" "$pkgdir/../" - mv "$pkgdir/usr/lib/libvirt/storage-file/libvirt_storage_file_gluster.so" "$pkgdir/../" + mkdir "$srcdir"/split + mv "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_{rbd,gluster}.so "$srcdir"/split + mv "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so "$srcdir"/split + mv "$pkgdir"/usr/lib/libvirt/storage-file/libvirt_storage_file_gluster.so "$srcdir"/split } package_libvirt-storage-gluster() { @@ -168,8 +195,8 @@ package_libvirt-storage-gluster() { optdepends=() backup=() - install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$pkgdir/../libvirt_storage_backend_gluster.so" - install -Dv -t "$pkgdir/usr/lib/libvirt/storage-file" "$pkgdir/../libvirt_storage_file_gluster.so" + install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$srcdir/split/libvirt_storage_backend_gluster.so" + install -Dv -t "$pkgdir/usr/lib/libvirt/storage-file" "$srcdir/split/libvirt_storage_file_gluster.so" } package_libvirt-storage-iscsi-direct() { @@ -178,5 +205,5 @@ package_libvirt-storage-iscsi-direct() { optdepends=() backup=() - install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$pkgdir/../libvirt_storage_backend_iscsi-direct.so" + install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend" "$srcdir/split/libvirt_storage_backend_iscsi-direct.so" }