From 0e4e8430afc39efeea7b029a3689155d9c3ca47e Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sun, 12 Aug 2018 23:34:46 -0500 Subject: [PATCH] libraries/libvirt: Updated for version 4.5.0. Signed-off-by: Robby Workman --- libraries/libvirt/README | 3 +++ libraries/libvirt/libvirt.SlackBuild | 10 +++++++--- libraries/libvirt/libvirt.info | 6 +++--- libraries/libvirt/use-virtgroup-in-polkit-rules.diff | 6 +++--- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/libraries/libvirt/README b/libraries/libvirt/README index bce0dd1f1c..865d1a545d 100644 --- a/libraries/libvirt/README +++ b/libraries/libvirt/README @@ -48,3 +48,6 @@ netcat-openbsd is an optional dependency (needed if you want to connect from a remote host using virt-manager). Other optional dependencies include avahi, xen, audit, glusterfs, and numactl. + +As of the 4.5.0 version, you may have to remove any previously +installed versions of libvirt before this will build. diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index c6f5259b16..c1941baaed 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -5,7 +5,7 @@ # Maintained by Robby Workman PRGNAM=libvirt -VERSION=${VERSION:-4.0.0} +VERSION=${VERSION:-4.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,10 +51,10 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # we have sysctld files in /etc/sysctl.d -sed -i "s|(prefix)/lib/sysctl|(sysconfdir)/sysctl|" daemon/Makefile.in +sed -i "s|(prefix)/lib/sysctl|(sysconfdir)/sysctl|" src/Makefile.in patch -p1 < $CWD/use-virtgroup-in-polkit-rules.diff -sed -i -e "s,@VIRTGROUP@,$VIRTGROUP,g" daemon/libvirt.rules +sed -i -e "s,@VIRTGROUP@,$VIRTGROUP,g" src/remote/libvirtd.rules CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -101,6 +101,10 @@ sed -i \ -e "s|^\#group\ =\ \"root\"|group = \"$VIRTGROUP\"|" \ $PKG/etc/libvirt/qemu.conf +# disable seccomp support or else VMs won't start with new libvirt/qemu combo +sed -i "s|^\#seccomp_sandbox = 1|seccomp_sandbox = 0|" \ + $PKG/etc/libvirt/qemu.conf + find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index ce3d7db1cd..f8186d1ad3 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,8 +1,8 @@ PRGNAM="libvirt" -VERSION="4.0.0" +VERSION="4.5.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="ftp://libvirt.org/libvirt/libvirt-4.0.0.tar.xz" -MD5SUM="ff0dbdd8ec4ac1277588dfe3b245d0e9" +DOWNLOAD="https://libvirt.org/sources/libvirt-4.5.0.tar.xz" +MD5SUM="692b2d00907438ed08a68813d3177cd3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yajl urlgrabber" diff --git a/libraries/libvirt/use-virtgroup-in-polkit-rules.diff b/libraries/libvirt/use-virtgroup-in-polkit-rules.diff index f4610f9a93..10c6265daf 100644 --- a/libraries/libvirt/use-virtgroup-in-polkit-rules.diff +++ b/libraries/libvirt/use-virtgroup-in-polkit-rules.diff @@ -1,6 +1,6 @@ -diff -Nur libvirt-3.4.0.orig/daemon/libvirt.rules libvirt-3.4.0/daemon/libvirt.rules ---- libvirt-3.4.0.orig/daemon/libvirt.rules 2015-05-23 07:56:12.046331092 -0500 -+++ libvirt-3.4.0/daemon/libvirt.rules 2017-06-09 23:35:50.490172300 -0500 +diff -Nur libvirt-4.6.0.orig/src/remote/libvirtd.rules libvirt-4.6.0/src/remote/libvirtd.rules +--- libvirt-4.6.0.orig/src/remote/libvirtd.rules 2018-02-26 03:02:18.496310271 -0600 ++++ libvirt-4.6.0/src/remote/libvirtd.rules 2018-08-12 21:55:35.293691409 -0500 @@ -1,9 +1,9 @@ -// Allow any user in the 'libvirt' group to connect to system libvirtd +// Allow any user in the '@VIRTGROUP@' group to connect to system libvirtd