Date: Monday, June 23, 2014 @ 13:08:53 Author: spupykin Revision: 113445
archrelease: copy trunk to community-i686, community-x86_64 Added: libvirt/repos/community-i686/PKGBUILD (from rev 113444, libvirt/trunk/PKGBUILD) libvirt/repos/community-i686/libvirt.install (from rev 113444, libvirt/trunk/libvirt.install) libvirt/repos/community-i686/libvirt.tmpfiles.d (from rev 113444, libvirt/trunk/libvirt.tmpfiles.d) libvirt/repos/community-i686/libvirtd-guests.conf.d (from rev 113444, libvirt/trunk/libvirtd-guests.conf.d) libvirt/repos/community-i686/libvirtd.conf.d (from rev 113444, libvirt/trunk/libvirtd.conf.d) libvirt/repos/community-x86_64/PKGBUILD (from rev 113444, libvirt/trunk/PKGBUILD) libvirt/repos/community-x86_64/libvirt.install (from rev 113444, libvirt/trunk/libvirt.install) libvirt/repos/community-x86_64/libvirt.tmpfiles.d (from rev 113444, libvirt/trunk/libvirt.tmpfiles.d) libvirt/repos/community-x86_64/libvirtd-guests.conf.d (from rev 113444, libvirt/trunk/libvirtd-guests.conf.d) libvirt/repos/community-x86_64/libvirtd.conf.d (from rev 113444, libvirt/trunk/libvirtd.conf.d) Deleted: libvirt/repos/community-i686/PKGBUILD libvirt/repos/community-i686/libvirt.install libvirt/repos/community-i686/libvirt.tmpfiles.d libvirt/repos/community-i686/libvirtd-guests.conf.d libvirt/repos/community-i686/libvirtd.conf.d libvirt/repos/community-x86_64/PKGBUILD libvirt/repos/community-x86_64/libvirt.install libvirt/repos/community-x86_64/libvirt.tmpfiles.d libvirt/repos/community-x86_64/libvirtd-guests.conf.d libvirt/repos/community-x86_64/libvirtd.conf.d -----------------------------------------+ /PKGBUILD | 234 ++++++++++++++++++++++++++++++ /libvirt.install | 30 +++ /libvirt.tmpfiles.d | 8 + /libvirtd-guests.conf.d | 22 ++ /libvirtd.conf.d | 6 community-i686/PKGBUILD | 114 -------------- community-i686/libvirt.install | 15 - community-i686/libvirt.tmpfiles.d | 4 community-i686/libvirtd-guests.conf.d | 11 - community-i686/libvirtd.conf.d | 3 community-x86_64/PKGBUILD | 114 -------------- community-x86_64/libvirt.install | 15 - community-x86_64/libvirt.tmpfiles.d | 4 community-x86_64/libvirtd-guests.conf.d | 11 - community-x86_64/libvirtd.conf.d | 3 15 files changed, 300 insertions(+), 294 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-06-23 11:08:33 UTC (rev 113444) +++ community-i686/PKGBUILD 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,114 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Jonathan Wiersma <archaur at jonw dot org> - -pkgname=libvirt -pkgver=1.2.5 -pkgrel=1 -pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" -arch=('i686' 'x86_64') -url="http://libvirt.org/" -license=('LGPL') -depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' - 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' - 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'libnl' 'libx11' 'numactl') - # 'audit' -makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc' 'libiscsi' 'open-iscsi') -optdepends=('bridge-utils: for briged networking (default)' - 'dnsmasq: for NAT/DHCP for guests' - 'openbsd-netcat: for remote management over ssh' - 'qemu' - 'radvd' - 'dmidecode' - 'ebtables: for networking' - 'pm-utils: host power management') -options=('emptydirs') -backup=('etc/conf.d/libvirt-guests' - 'etc/conf.d/libvirtd' - 'etc/libvirt/libvirt.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/autostart/default.xml' - '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" -source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" - libvirtd.conf.d - libvirtd-guests.conf.d - libvirt.tmpfiles.d) -md5sums=('787960669a40181fd381a87a318c0660' - '3ed0e24f5b5e25bf553f5427d64915e6' - '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - sed -i 's|/sysconfig/|/conf.d/|g' \ - daemon/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 - sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - export PYTHON=`which python2` - export LDFLAGS=-lX11 - 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-qemu-user=nobody --with-qemu-group=nobody \ - --without-netcf --with-interface --with-lxc --with-storage-iscsi - # --with-audit - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd - install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirt-guests - install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf - - rm -rf \ - "$pkgdir"/var/run \ - "$pkgdir"/etc/sysconfig \ - "$pkgdir"/etc/rc.d -} Copied: libvirt/repos/community-i686/PKGBUILD (from rev 113444, libvirt/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,117 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Jonathan Wiersma <archaur at jonw dot org> + +pkgname=libvirt +pkgver=1.2.5 +pkgrel=2 +pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" +arch=('i686' 'x86_64') +url="http://libvirt.org/" +license=('LGPL') +depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' + 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' + 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' + 'iproute2' 'libnl' 'libx11' 'numactl') + # 'audit' +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc' 'libiscsi' 'open-iscsi') +optdepends=('bridge-utils: for briged networking (default)' + 'dnsmasq: for NAT/DHCP for guests' + 'openbsd-netcat: for remote management over ssh' + 'qemu' + 'radvd' + 'dmidecode' + 'ebtables: for networking' + 'pm-utils: host power management') +options=('emptydirs') +backup=('etc/conf.d/libvirt-guests' + 'etc/conf.d/libvirtd' + 'etc/libvirt/libvirt.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/autostart/default.xml' + '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" +source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" + libvirtd.conf.d + libvirtd-guests.conf.d + libvirt.tmpfiles.d) +md5sums=('787960669a40181fd381a87a318c0660' + '3ed0e24f5b5e25bf553f5427d64915e6' + '0a96ed876ffb1fcb9dff5a9b3a609c1e' + '020971887442ebbf1b6949e031c8dd3f') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + for file in $(find . -name '*.py' -print); do + sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + sed -i 's|/sysconfig/|/conf.d/|g' \ + daemon/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 + sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf + sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \ + src/qemu/qemu{.conf,_conf.c} \ + src/qemu/test_libvirtd_qemu.aug.in +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + export PYTHON=`which python2` + export LDFLAGS=-lX11 + 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-qemu-user=nobody --with-qemu-group=nobody \ + --without-netcf --with-interface --with-lxc --with-storage-iscsi + # --with-audit + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd + install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirt-guests + install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf + + rm -rf \ + "$pkgdir"/var/run \ + "$pkgdir"/etc/sysconfig \ + "$pkgdir"/etc/rc.d +} Deleted: community-i686/libvirt.install =================================================================== --- community-i686/libvirt.install 2014-06-23 11:08:33 UTC (rev 113444) +++ community-i686/libvirt.install 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,15 +0,0 @@ -_libvirt_setup() { - systemd-tmpfiles --create libvirt.conf -} - -post_install() { - _libvirt_setup || return 1 - echo ">>> See https://wiki.archlinux.org/index.php/Libvirt for more info" -} - -post_upgrade() { - _libvirt_setup || return 1 - echo ">>> You may need to run 'rm -rf ~/.libvirt'" - echo ">>> libvirt runs qemu from nobody:nobody by default" - echo ">>> change it in /etc/libvirt/qemu.conf" -} Copied: libvirt/repos/community-i686/libvirt.install (from rev 113444, libvirt/trunk/libvirt.install) =================================================================== --- community-i686/libvirt.install (rev 0) +++ community-i686/libvirt.install 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,15 @@ +_libvirt_setup() { + systemd-tmpfiles --create libvirt.conf +} + +post_install() { + _libvirt_setup || return 1 + echo ">>> See https://wiki.archlinux.org/index.php/Libvirt for more info" +} + +post_upgrade() { + _libvirt_setup || return 1 + echo ">>> You may need to run 'rm -rf ~/.libvirt'" + echo ">>> libvirt runs qemu from nobody:nobody by default" + echo ">>> change it in /etc/libvirt/qemu.conf" +} Deleted: community-i686/libvirt.tmpfiles.d =================================================================== --- community-i686/libvirt.tmpfiles.d 2014-06-23 11:08:33 UTC (rev 113444) +++ community-i686/libvirt.tmpfiles.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,4 +0,0 @@ -d /run/libvirt/qemu 0755 root root - -d /run/libvirt/lxc 0755 root root - -d /run/libvirt/uml 0755 root root - -d /run/libvirt/network 0755 root root - Copied: libvirt/repos/community-i686/libvirt.tmpfiles.d (from rev 113444, libvirt/trunk/libvirt.tmpfiles.d) =================================================================== --- community-i686/libvirt.tmpfiles.d (rev 0) +++ community-i686/libvirt.tmpfiles.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,4 @@ +d /run/libvirt/qemu 0755 root root - +d /run/libvirt/lxc 0755 root root - +d /run/libvirt/uml 0755 root root - +d /run/libvirt/network 0755 root root - Deleted: community-i686/libvirtd-guests.conf.d =================================================================== --- community-i686/libvirtd-guests.conf.d 2014-06-23 11:08:33 UTC (rev 113444) +++ community-i686/libvirtd-guests.conf.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,11 +0,0 @@ -LIBVIRTD_STOP_ACTION=suspend - -#LIBVIRTD_URI="-c qemu+ssh://user@host/system" -LIBVIRTD_URI="" - -#LIBVIRTD_BYPASS_CACHE="--bypass-cache" -LIBVIRTD_BYPASS_CACHE="" - -LIBVIRTD_START_DELAY=0 - -LIBVIRTD_SHUTDOWN_TIMEOUT=60 Copied: libvirt/repos/community-i686/libvirtd-guests.conf.d (from rev 113444, libvirt/trunk/libvirtd-guests.conf.d) =================================================================== --- community-i686/libvirtd-guests.conf.d (rev 0) +++ community-i686/libvirtd-guests.conf.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,11 @@ +LIBVIRTD_STOP_ACTION=suspend + +#LIBVIRTD_URI="-c qemu+ssh://user@host/system" +LIBVIRTD_URI="" + +#LIBVIRTD_BYPASS_CACHE="--bypass-cache" +LIBVIRTD_BYPASS_CACHE="" + +LIBVIRTD_START_DELAY=0 + +LIBVIRTD_SHUTDOWN_TIMEOUT=60 Deleted: community-i686/libvirtd.conf.d =================================================================== --- community-i686/libvirtd.conf.d 2014-06-23 11:08:33 UTC (rev 113444) +++ community-i686/libvirtd.conf.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,3 +0,0 @@ -LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" -LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" -KRB5_KTNAME="/etc/libvirt/krb5.tab" Copied: libvirt/repos/community-i686/libvirtd.conf.d (from rev 113444, libvirt/trunk/libvirtd.conf.d) =================================================================== --- community-i686/libvirtd.conf.d (rev 0) +++ community-i686/libvirtd.conf.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,3 @@ +LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" +LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" +KRB5_KTNAME="/etc/libvirt/krb5.tab" Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-06-23 11:08:33 UTC (rev 113444) +++ community-x86_64/PKGBUILD 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,114 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Jonathan Wiersma <archaur at jonw dot org> - -pkgname=libvirt -pkgver=1.2.5 -pkgrel=1 -pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" -arch=('i686' 'x86_64') -url="http://libvirt.org/" -license=('LGPL') -depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' - 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' - 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'libnl' 'libx11' 'numactl') - # 'audit' -makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc' 'libiscsi' 'open-iscsi') -optdepends=('bridge-utils: for briged networking (default)' - 'dnsmasq: for NAT/DHCP for guests' - 'openbsd-netcat: for remote management over ssh' - 'qemu' - 'radvd' - 'dmidecode' - 'ebtables: for networking' - 'pm-utils: host power management') -options=('emptydirs') -backup=('etc/conf.d/libvirt-guests' - 'etc/conf.d/libvirtd' - 'etc/libvirt/libvirt.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/autostart/default.xml' - '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" -source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" - libvirtd.conf.d - libvirtd-guests.conf.d - libvirt.tmpfiles.d) -md5sums=('787960669a40181fd381a87a318c0660' - '3ed0e24f5b5e25bf553f5427d64915e6' - '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - sed -i 's|/sysconfig/|/conf.d/|g' \ - daemon/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 - sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - export PYTHON=`which python2` - export LDFLAGS=-lX11 - 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-qemu-user=nobody --with-qemu-group=nobody \ - --without-netcf --with-interface --with-lxc --with-storage-iscsi - # --with-audit - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd - install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirt-guests - install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf - - rm -rf \ - "$pkgdir"/var/run \ - "$pkgdir"/etc/sysconfig \ - "$pkgdir"/etc/rc.d -} Copied: libvirt/repos/community-x86_64/PKGBUILD (from rev 113444, libvirt/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,117 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Jonathan Wiersma <archaur at jonw dot org> + +pkgname=libvirt +pkgver=1.2.5 +pkgrel=2 +pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" +arch=('i686' 'x86_64') +url="http://libvirt.org/" +license=('LGPL') +depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' + 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' + 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' + 'iproute2' 'libnl' 'libx11' 'numactl') + # 'audit' +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'lxc' 'libiscsi' 'open-iscsi') +optdepends=('bridge-utils: for briged networking (default)' + 'dnsmasq: for NAT/DHCP for guests' + 'openbsd-netcat: for remote management over ssh' + 'qemu' + 'radvd' + 'dmidecode' + 'ebtables: for networking' + 'pm-utils: host power management') +options=('emptydirs') +backup=('etc/conf.d/libvirt-guests' + 'etc/conf.d/libvirtd' + 'etc/libvirt/libvirt.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/autostart/default.xml' + '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" +source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" + libvirtd.conf.d + libvirtd-guests.conf.d + libvirt.tmpfiles.d) +md5sums=('787960669a40181fd381a87a318c0660' + '3ed0e24f5b5e25bf553f5427d64915e6' + '0a96ed876ffb1fcb9dff5a9b3a609c1e' + '020971887442ebbf1b6949e031c8dd3f') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + for file in $(find . -name '*.py' -print); do + sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + sed -i 's|/sysconfig/|/conf.d/|g' \ + daemon/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 + sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf + sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \ + src/qemu/qemu{.conf,_conf.c} \ + src/qemu/test_libvirtd_qemu.aug.in +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + export PYTHON=`which python2` + export LDFLAGS=-lX11 + 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-qemu-user=nobody --with-qemu-group=nobody \ + --without-netcf --with-interface --with-lxc --with-storage-iscsi + # --with-audit + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd + install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirt-guests + install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf + + rm -rf \ + "$pkgdir"/var/run \ + "$pkgdir"/etc/sysconfig \ + "$pkgdir"/etc/rc.d +} Deleted: community-x86_64/libvirt.install =================================================================== --- community-x86_64/libvirt.install 2014-06-23 11:08:33 UTC (rev 113444) +++ community-x86_64/libvirt.install 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,15 +0,0 @@ -_libvirt_setup() { - systemd-tmpfiles --create libvirt.conf -} - -post_install() { - _libvirt_setup || return 1 - echo ">>> See https://wiki.archlinux.org/index.php/Libvirt for more info" -} - -post_upgrade() { - _libvirt_setup || return 1 - echo ">>> You may need to run 'rm -rf ~/.libvirt'" - echo ">>> libvirt runs qemu from nobody:nobody by default" - echo ">>> change it in /etc/libvirt/qemu.conf" -} Copied: libvirt/repos/community-x86_64/libvirt.install (from rev 113444, libvirt/trunk/libvirt.install) =================================================================== --- community-x86_64/libvirt.install (rev 0) +++ community-x86_64/libvirt.install 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,15 @@ +_libvirt_setup() { + systemd-tmpfiles --create libvirt.conf +} + +post_install() { + _libvirt_setup || return 1 + echo ">>> See https://wiki.archlinux.org/index.php/Libvirt for more info" +} + +post_upgrade() { + _libvirt_setup || return 1 + echo ">>> You may need to run 'rm -rf ~/.libvirt'" + echo ">>> libvirt runs qemu from nobody:nobody by default" + echo ">>> change it in /etc/libvirt/qemu.conf" +} Deleted: community-x86_64/libvirt.tmpfiles.d =================================================================== --- community-x86_64/libvirt.tmpfiles.d 2014-06-23 11:08:33 UTC (rev 113444) +++ community-x86_64/libvirt.tmpfiles.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,4 +0,0 @@ -d /run/libvirt/qemu 0755 root root - -d /run/libvirt/lxc 0755 root root - -d /run/libvirt/uml 0755 root root - -d /run/libvirt/network 0755 root root - Copied: libvirt/repos/community-x86_64/libvirt.tmpfiles.d (from rev 113444, libvirt/trunk/libvirt.tmpfiles.d) =================================================================== --- community-x86_64/libvirt.tmpfiles.d (rev 0) +++ community-x86_64/libvirt.tmpfiles.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,4 @@ +d /run/libvirt/qemu 0755 root root - +d /run/libvirt/lxc 0755 root root - +d /run/libvirt/uml 0755 root root - +d /run/libvirt/network 0755 root root - Deleted: community-x86_64/libvirtd-guests.conf.d =================================================================== --- community-x86_64/libvirtd-guests.conf.d 2014-06-23 11:08:33 UTC (rev 113444) +++ community-x86_64/libvirtd-guests.conf.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,11 +0,0 @@ -LIBVIRTD_STOP_ACTION=suspend - -#LIBVIRTD_URI="-c qemu+ssh://user@host/system" -LIBVIRTD_URI="" - -#LIBVIRTD_BYPASS_CACHE="--bypass-cache" -LIBVIRTD_BYPASS_CACHE="" - -LIBVIRTD_START_DELAY=0 - -LIBVIRTD_SHUTDOWN_TIMEOUT=60 Copied: libvirt/repos/community-x86_64/libvirtd-guests.conf.d (from rev 113444, libvirt/trunk/libvirtd-guests.conf.d) =================================================================== --- community-x86_64/libvirtd-guests.conf.d (rev 0) +++ community-x86_64/libvirtd-guests.conf.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,11 @@ +LIBVIRTD_STOP_ACTION=suspend + +#LIBVIRTD_URI="-c qemu+ssh://user@host/system" +LIBVIRTD_URI="" + +#LIBVIRTD_BYPASS_CACHE="--bypass-cache" +LIBVIRTD_BYPASS_CACHE="" + +LIBVIRTD_START_DELAY=0 + +LIBVIRTD_SHUTDOWN_TIMEOUT=60 Deleted: community-x86_64/libvirtd.conf.d =================================================================== --- community-x86_64/libvirtd.conf.d 2014-06-23 11:08:33 UTC (rev 113444) +++ community-x86_64/libvirtd.conf.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -1,3 +0,0 @@ -LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" -LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" -KRB5_KTNAME="/etc/libvirt/krb5.tab" Copied: libvirt/repos/community-x86_64/libvirtd.conf.d (from rev 113444, libvirt/trunk/libvirtd.conf.d) =================================================================== --- community-x86_64/libvirtd.conf.d (rev 0) +++ community-x86_64/libvirtd.conf.d 2014-06-23 11:08:53 UTC (rev 113445) @@ -0,0 +1,3 @@ +LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" +LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" +KRB5_KTNAME="/etc/libvirt/krb5.tab"