Date: Sunday, October 11, 2020 @ 21:46:48
Author: freswa
Revision: 723560
upgpkg: libvirt 6.8.0-1
fixes FS#67921
implements FS#66489
Modified:
libvirt/trunk/PKGBUILD
----------+
PKGBUILD | 105 ++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 66 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-11 21:29:59 UTC (rev 723559)
+++ PKGBUILD 2020-10-11 21:46:48 UTC (rev 723560)
@@ -4,8 +4,8 @@
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=(libvirt libvirt-storage-gluster libvirt-storage-iscsi-direct
libvirt-storage-rbd)
-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/";
@@ -13,7 +13,7 @@
install=libvirt.install
depends=('libpciaccess' 'yajl' 'fuse2' 'gnutls' 'parted' 'libssh' 'libxml2'
'numactl' 'polkit')
makedepends=('libxslt' 'python-docutils' 'lvm2' 'open-iscsi' 'libiscsi'
'ceph-libs' 'glusterfs'
- 'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2'
'qemu-headless')
+ 'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2'
'qemu-headless' 'meson')
checkdepends=('ebtables')
optdepends=('libvirt-storage-gluster: Gluster storage backend'
'libvirt-storage-iscsi-direct: iSCSI-direct storage backend'
@@ -85,53 +85,79 @@
'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
<veill...@redhat.com>
+source=("https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc})
+b2sums=('c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2'
+ 'SKIP')
+validpgpkeys=('C74415BA7C9C7F78F02E1DC34606B8A5DE95BC1F' # Daniel Veillard
<veill...@redhat.com>
+ '453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark
<jdene...@redhat.com.
prepare() {
- mkdir build
cd "$pkgname-$pkgver"
- patch -Np1 -i "${srcdir}/CVE-2020-14339.patch"
-
sed -i 's|/sysconfig/|/conf.d/|g' \
- src/remote/libvirtd.service.in \
- tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \
+ src/interface/virtinterfaced.service.in \
+ src/libxl/virtxend.service.in \
src/locking/virtlockd.service.in \
- src/logging/virtlogd.service.in
+ src/logging/virtlogd.service.in \
+ src/lxc/virtlxcd.service.in \
+ src/network/virtnetworkd.service.in \
+ src/node_device/virtnodedevd.service.in \
+ src/nwfilter/virtnwfilterd.service.in \
+ src/qemu/virtqemud.service.in \
+ src/remote/{virtproxyd.service.in,libvirtd.service.in} \
+ src/secret/virtsecretd.service.in \
+ src/storage/virtstoraged.service.in \
+ src/vbox/virtvboxd.service.in \
+ src/vz/virtvzd.service.in \
+ tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.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
+ src/qemu/{qemu.conf,test_libvirtd_qemu.aug.in}
- sed -i 's/notify/simple/' src/remote/libvirtd.service.in
+ # ZFS HACK
+ sed -i "s/'zfs'/'zic'/;s/'zpool'/'zic'/" meson.build
}
build() {
- cd build
- ZFS=/usr/bin/zfs ZPOOL=/usr/bin/zpool \
- "../$pkgname-$pkgver/configure" \
- --prefix=/usr \
- "--libexec=/usr/lib/$pkgname" \
- --sbindir=/usr/bin \
- --with-runstatedir=/run \
- --with-qemu-group=kvm
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ CFLAGS+=" -Wall" \
+ arch-meson $pkgname-$pkgver build \
+ -D apparmor=disabled \
+ -D hal=disabled \
+ -D netcf=disabled \
+ -D openwsman=disabled \
+ -D selinux=disabled \
+ -D wireshark_dissector=disabled \
+ -D driver_bhyve=disabled \
+ -D driver_hyperv=disabled \
+ -D driver_libxl=disabled \
+ -D driver_vz=disabled \
+ -D secdriver_apparmor=disabled \
+ -D secdriver_selinux=disabled \
+ -D storage_sheepdog=disabled \
+ -D storage_vstorage=disabled \
+ -D storage_zfs=enabled \
+ -D dtrace=disabled \
+ -D numad=disabled \
+ -D git_werror=disabled \
+ -D qemu_group=kvm \
+ -D runstatedir=/run
+
+ # ZFS HACK
+ sed -i '/ZIC/d' build/meson-config.h
+ echo '#define ZFS "/usr/bin/zfs"' >> 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
@@ -155,9 +181,10 @@
rm -f "$pkgdir/etc/libvirt/qemu/networks/autostart/default.xml"
# move split modules
- mv
"$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_{rbd,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() {
@@ -166,8 +193,8 @@
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() {
@@ -176,7 +203,7 @@
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"
}
package_libvirt-storage-rbd() {
@@ -185,5 +212,5 @@
optdepends=()
backup=()
- install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend"
"$pkgdir/../libvirt_storage_backend_rbd.so"
+ install -Dv -t "$pkgdir/usr/lib/libvirt/storage-backend"
"$srcdir/split/libvirt_storage_backend_rbd.so"
}
