From c27d401dbb7d74556ba0669acdd77f57aade1d64 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 25 Mar 2018 00:41:50 +0000 Subject: [PATCH] community/libvirt to 4.1.0-1 --- community/libvirt/PKGBUILD | 115 ++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 53 deletions(-) diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 3ec731e90..b0e6769bd 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -9,68 +9,23 @@ # - removed qemu makedepend pkgname=libvirt -pkgver=4.0.0 +pkgver=4.1.0 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('x86_64') url="http://libvirt.org/" license=('LGPL') -depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' - 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus' 'libxau' 'libxdmcp' 'libpcap' 'libcap-ng' - 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'libnl' 'libx11' 'gettext' 'libssh2' - 'netcf' 'fuse2') makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc' - 'libiscsi' 'open-iscsi' 'perl-xml-xpath' 'libxslt') -optdepends=('ebtables: required for default NAT networking' - 'dnsmasq: required for default NAT/DHCP for guests' - 'bridge-utils: for bridged networking' - 'openbsd-netcat: for remote management over ssh' - 'qemu' - 'radvd' - 'dmidecode') + 'libiscsi' 'open-iscsi' 'perl-xml-xpath' 'libxslt' + 'glusterfs' 'netcf' 'yajl') options=('emptydirs') -backup=('etc/conf.d/libvirt-guests' - 'etc/conf.d/libvirtd' - 'etc/libvirt/libvirt.conf' - 'etc/libvirt/virtlogd.conf' - 'etc/libvirt/libvirtd.conf' - 'etc/libvirt/lxc.conf' - 'etc/libvirt/nwfilter/allow-arp.xml' - 'etc/libvirt/nwfilter/allow-dhcp-server.xml' - 'etc/libvirt/nwfilter/allow-dhcp.xml' - 'etc/libvirt/nwfilter/allow-incoming-ipv4.xml' - 'etc/libvirt/nwfilter/allow-ipv4.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-mac-broadcast.xml' - 'etc/libvirt/nwfilter/no-mac-spoofing.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' - 'etc/libvirt/nwfilter/qemu-announce-self.xml' - 'etc/libvirt/qemu-lockd.conf' - 'etc/libvirt/qemu.conf' - 'etc/libvirt/qemu/networks/default.xml' - 'etc/libvirt/virt-login-shell.conf' - 'etc/libvirt/virtlockd.conf' - 'etc/logrotate.d/libvirtd' - 'etc/logrotate.d/libvirtd.lxc' - 'etc/logrotate.d/libvirtd.qemu' - 'etc/logrotate.d/libvirtd.uml' - 'etc/sasl2/libvirt.conf') -install="libvirt.install" validpgpkeys=('C74415BA7C9C7F78F02E1DC34606B8A5DE95BC1F') source=("https://libvirt.org/sources/${pkgname}-${pkgver}.tar.xz"{,.asc} 'libvirtd.conf.d' 'libvirtd-guests.conf.d' 'libvirt.sysusers.d') # "ae102b5d7bccd29bc6015a3e0acefeaa90d097ac.patch::https://libvirt.org/git/?p=libvirt.git;a=patch;h=ae102b5d7bccd29bc6015a3e0acefeaa90d097ac") -sha512sums=('c99ea305f427859eb070b5f0c43de48645a5c53a2aa8efc60f54f278ec3fa0b504307861309e1852f8d7bff4436afe00c859aac27691366a0c36c91341cea7a1' +sha512sums=('62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894' 'SKIP' 'fc0e16e045a2c84d168d42c97d9e14ca32ba0d86025135967f4367cf3fa663882eefb6923ebf04676ae763f4f459e5156d7221b36b47c835f9e531c6b6e0cd9d' 'ef221bae994ad0a15ab5186b7469132896156d82bfdc3ef3456447d5cf1af347401ef33e8665d5b2f76451f5457aee7ea01064d7b9223d6691c90c4456763258' @@ -85,7 +40,7 @@ prepare() { done sed -i 's|/sysconfig/|/conf.d/|g' \ - daemon/libvirtd.service.in \ + src/remote/libvirtd.service.in \ tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \ src/locking/virtlockd.service.in sed -i 's|@sbindir@|/usr/bin|g' src/locking/virtlockd.service.in @@ -94,7 +49,7 @@ prepare() { src/qemu/test_libvirtd_qemu.aug.in sed -i 's|libsystemd-daemon|libsystemd|g' configure - sed -i 's/notify/simple/' daemon/libvirtd.service.in + sed -i 's/notify/simple/' src/remote/libvirtd.service.in # patch -p1 -i "${srcdir}"/ae102b5d7bccd29bc6015a3e0acefeaa90d097ac.patch } @@ -107,14 +62,59 @@ build() { export RADVD=/usr/bin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"${pkgname}" --sbindir=/usr/bin \ --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ - --with-init-script=systemd \ + --with-init-script=systemd --with-storage-gluster \ --with-qemu-user=nobody --with-qemu-group=kvm \ --with-netcf --with-interface --with-lxc --with-storage-iscsi # --with-audit make } -package() { +package_libvirt() { + depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' + 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus' 'libxau' 'libxdmcp' 'libpcap' 'libcap-ng' + 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' + 'iproute2' 'libnl' 'libx11' 'gettext' 'libssh2' + 'netcf' 'fuse2') + optdepends=('ebtables: required for default NAT networking' + 'dnsmasq: required for default NAT/DHCP for guests' + 'bridge-utils: for bridged networking' + 'netcat: for remote management over ssh' + 'radvd' + 'dmidecode') + backup=('etc/conf.d/libvirt-guests' + 'etc/conf.d/libvirtd' + 'etc/libvirt/libvirt.conf' + 'etc/libvirt/virtlogd.conf' + 'etc/libvirt/libvirtd.conf' + 'etc/libvirt/lxc.conf' + 'etc/libvirt/nwfilter/allow-arp.xml' + 'etc/libvirt/nwfilter/allow-dhcp-server.xml' + 'etc/libvirt/nwfilter/allow-dhcp.xml' + 'etc/libvirt/nwfilter/allow-incoming-ipv4.xml' + 'etc/libvirt/nwfilter/allow-ipv4.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-mac-broadcast.xml' + 'etc/libvirt/nwfilter/no-mac-spoofing.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' + 'etc/libvirt/nwfilter/qemu-announce-self.xml' + 'etc/libvirt/qemu-lockd.conf' + 'etc/libvirt/qemu.conf' + 'etc/libvirt/qemu/networks/default.xml' + 'etc/libvirt/virt-login-shell.conf' + 'etc/libvirt/virtlockd.conf' + 'etc/logrotate.d/libvirtd' + 'etc/logrotate.d/libvirtd.lxc' + 'etc/logrotate.d/libvirtd.qemu' + 'etc/logrotate.d/libvirtd.uml' + 'etc/sasl2/libvirt.conf') + install="libvirt.install" cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -133,4 +133,13 @@ package() { "${pkgdir}"/etc/sysconfig rm -f "${pkgdir}"/etc/libvirt/qemu/networks/autostart/default.xml + #move glusterfs module + mv "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_gluster.so "$pkgdir"/../ +} + +package_libvirt-glusterfs() { + depends=("libvirt=$pkgver" 'glusterfs') + + mkdir -p "$pkgdir"/usr/lib/libvirt/storage-backend/ + cp "$pkgdir"/../libvirt_storage_backend_gluster.so "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_gluster.so }