Mostly aligned libvirt-git with libvirt package, except for some build parameters, such as Xen

1 files changed, 61 insertions, 27 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d8368c943499..5da90dc32424 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,39 @@
+# $Id$
 # Maintainer: Arthur Borsboom <arthurborsboom@gmail.com>
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt-git
-pkgver=VE.2015.5313.87.g7bf3c13
+pkgver=1.3.3.178.g727a3c5
 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' 'python'
-	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
+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' 'perl-xml-xpath')
-makedepends=('git' 'pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq' 'libxslt' 'xhtml-docs')
-optdepends=('bridge-utils: for briged networking (default)'
-	    'dnsmasq: for NAT/DHCP for guests'
+	 'iproute2' 'libnl' 'libx11' 'numactl' 'gettext' 'ceph' 'libssh2' 'netcf' 'perl-xml-xpath')
+makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq'
+	     'libiscsi'
+	     'perl-xml-xpath' 'libxslt'
+	     'git' 'xhtml-docs')
+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'
-	    'ebtables'
-	    'pm-utils: host power management'
-	    'audit')
+	    'pm-utils: host power management')
 conflicts=('libvirt')
 provides=('libvirt')
 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'
@@ -64,32 +68,64 @@ install="libvirt.install"
 source=('git+git://libvirt.org/libvirt.git'
 	libvirtd.conf.d
 	libvirtd-guests.conf.d
-	libvirt.tmpfiles.d)
-sha512sums=('SKIP'
-	    'eebc616fcdf3c92338f3967f99701ed2d156d4a3835c31aebe8299b2f5fe00717f09ee2da79b3d5810348033f0b82ff05c70a775a8309d886919e75fa862e302'
-	    '9012a2bd2b262a6f95d739f97b6ebc6938310616aca05d501efd9d3fc69d71500366dcfe9046a37f8ce30929bcd6eea9cf6770cf757998ecce4b475a25914801'
-	    '9e3e9f479b17528d70e812e6851cf4209ad73b577d478170bf7d80f075be4f2ee2e28adbe1e542002bbaea15e34830ff60e4ca2e34a5ac5a925440ca25864c31')
-
+	libvirt.tmpfiles.d
+	'systemd.patch::https://bugs.archlinux.org/task/48440?getfile=13914')
+md5sums=('SKIP'
+	 '5e31269067dbd12ca871234450bb66bb'
+	 '384fff96c6248d4f020f6fa66c32b357'
+	 '020971887442ebbf1b6949e031c8dd3f'
+	 '8b5cb657b3fa08c3cd888d48a2227a39')
+	 
 pkgver() {
-  cd "$SRCDEST/libvirt"
+  cd "$SRCDEST/${pkgname/-git/}"
   git describe --always | sed 's|-|.|g' | sed 's/^.//'
 }
 
+prepare() {
+  cd "$srcdir/${pkgname/-git/}"
+
+  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
+  # 78 is kvm group: https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database
+  sed -i 's|#group =.*|group="78"|' 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
+
+  sed -i 's/notify/simple/' daemon/libvirtd.service.in
+
+  patch -p1 -i $srcdir/systemd.patch
+}
+
 build() {
-  cd "$srcdir/libvirt"
+  cd "$srcdir/${pkgname/-git/}"
 
+  export PYTHON=`which python2`
   export LDFLAGS=-lX11
   export RADVD=/usr/bin/radvd
-  NOCONFIGURE=1 ./autogen.sh 
-  ./configure --prefix=/usr --libexec=/usr/lib/"${pkgname/-git/}" --sbindir=/usr/bin --with-init-script=systemd
+  NOCONFIGURE=1 ./autogen.sh
+  sed -i 's|libsystemd-daemon|libsystemd|g' configure
+  
+  [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"${pkgname/-git/}" --sbindir=/usr/bin \
+	--with-storage-lvm --with-udev --without-hal --disable-static \
+	--with-init-script=systemd \
+	--with-qemu-user=nobody --with-qemu-group=nobody \
+	--with-netcf --with-interface
+	# --with-audit
   make
-
-  sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service
-  sed -i 's|@sbindir@|/usr/bin|g' src/virtlockd.service
 }
 
 package() {
-  cd "$srcdir/libvirt"
+  cd "$srcdir/${pkgname/-git/}"
+
   make DESTDIR="$pkgdir" install
 
   install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
@@ -105,7 +141,5 @@ package() {
   rm -rf \
 	"$pkgdir"/var/run \
 	"$pkgdir"/etc/sysconfig \
-	"$pkgdir"/etc/rc.d/init.d \
-	"$pkgdir"/lib \
-	"$pkgdir"/etc/sysctl.d
+	"$pkgdir"/etc/rc.d
 }