Mon May 28 17:43:57 UTC 2012

2 files changed, 124 insertions, 6 deletions

diff --git a/community-testing/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD
index d2ac57345..5000e9a3d 100644
--- a/community-testing/libvirt/PKGBUILD
+++ b/community-testing/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70775 2012-05-16 15:03:54Z spupykin $
+# $Id: PKGBUILD 71494 2012-05-27 13:14:57Z dreisner $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=0.9.12
-pkgrel=2
+pkgrel=4
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -12,8 +12,8 @@ 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' 'netcf' 'libnl1')
-makedepends=('pkgconfig' 'lvm2')
+	 'iproute2' 'netcf' 'libnl')
+makedepends=('pkgconfig' 'lvm2' 'linux-api-headers')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
 	    'kvm'
@@ -34,13 +34,15 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd.conf.d
 	libvirtd-guests.rc.d
 	libvirtd-guests.conf.d
-	openbsd-netcat-default.patch)
+	openbsd-netcat-default.patch
+	libvirt-libnl3.patch)
 md5sums=('5e842bc55733ceba60c64767580ff3e4'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '8297b1be794a24cc77f66af9380ace59'
          'bc2971dacdbac967fc3474e50affc345'
-         'b0be50eb9dfe4d133decf23b60880f7d')
+         'b0be50eb9dfe4d133decf23b60880f7d'
+         'ba27fbcd989de8d84cfff98326f10c54')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -54,6 +56,11 @@ build() {
 
   [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
 
+  patch -Np1 -i ${srcdir}/libvirt-libnl3.patch
+  aclocal
+  automake --add-missing || true
+  autoreconf
+
   export LDFLAGS=-lX11
   export RADVD=/usr/sbin/radvd
   [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
diff --git a/community-testing/libvirt/libvirt-libnl3.patch b/community-testing/libvirt/libvirt-libnl3.patch
new file mode 100644
index 000000000..1e5f141b9
--- /dev/null
+++ b/community-testing/libvirt/libvirt-libnl3.patch
@@ -0,0 +1,111 @@
+diff -wbBur libvirt-0.9.12/configure.ac libvirt-0.9.12.my/configure.ac
+--- libvirt-0.9.12/configure.ac	2012-05-14 06:15:40.000000000 +0400
++++ libvirt-0.9.12.my/configure.ac	2012-05-17 13:18:22.000000000 +0400
+@@ -71,7 +71,7 @@
+ LIBCURL_REQUIRED="7.18.0"
+ OPENWSMAN_REQUIRED="2.2.3"
+ LIBPCAP_REQUIRED="1.0.0"
+-LIBNL_REQUIRED="1.1"
++LIBNL_REQUIRED="3.2"
+ LIBSSH2_REQUIRED="1.0"
+ LIBBLKID_REQUIRED="2.17"
+ DBUS_REQUIRED="1.0.0"
+@@ -2652,21 +2652,9 @@
+     PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [
+         have_libnl=yes
+         AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0])
+-        AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available])
+         PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0])
+         LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS"
+         LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS"
+-    ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [
+-            have_libnl=yes
+-            AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1],
+-             [whether the netlink library is available])
+-            AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1],
+-             [whether the netlink v1 library is available])
+-        ], [
+-            if test "$with_macvtap" = "yes"; then
+-                AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support])
+-            fi
+-        ])
+     ])
+ fi
+ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"])
+diff -wbBur libvirt-0.9.12/daemon/Makefile.am libvirt-0.9.12.my/daemon/Makefile.am
+--- libvirt-0.9.12/daemon/Makefile.am	2012-04-20 08:25:25.000000000 +0400
++++ libvirt-0.9.12.my/daemon/Makefile.am	2012-05-17 13:18:22.000000000 +0400
+@@ -96,6 +96,7 @@
+ 	$(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
+ 	$(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \
+ 	$(WARN_CFLAGS) \
++	$(LIBNL_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+ 	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \
+ 	-DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\""
+diff -wbBur libvirt-0.9.12/src/Makefile.am libvirt-0.9.12.my/src/Makefile.am
+--- libvirt-0.9.12/src/Makefile.am	2012-05-05 16:53:48.000000000 +0400
++++ libvirt-0.9.12.my/src/Makefile.am	2012-05-17 13:18:22.000000000 +0400
+@@ -16,6 +16,7 @@
+ 
+ AM_CFLAGS =	$(DRIVER_MODULE_CFLAGS)				\
+ 		$(LIBXML_CFLAGS)				\
++                $(LIBNL_CFLAGS)                                 \
+ 		$(WARN_CFLAGS)					\
+ 		$(LOCK_CHECKING_CFLAGS)				\
+ 		$(WIN32_EXTRA_CFLAGS)				\
+diff -wbBur libvirt-0.9.12/src/util/virnetdevmacvlan.c libvirt-0.9.12.my/src/util/virnetdevmacvlan.c
+--- libvirt-0.9.12/src/util/virnetdevmacvlan.c	2012-05-09 05:21:54.000000000 +0400
++++ libvirt-0.9.12.my/src/util/virnetdevmacvlan.c	2012-05-17 13:25:21.000000000 +0400
+@@ -27,6 +27,10 @@
+ 
+ #include <config.h>
+ 
++#include <netlink/msg.h>
++#include <linux/rtnetlink.h>
++#include <linux/if_link.h>
++
+ #include "virnetdevmacvlan.h"
+ #include "virmacaddr.h"
+ #include "util.h"
+diff -wbBur libvirt-0.9.12/src/util/virnetdevvportprofile.c libvirt-0.9.12.my/src/util/virnetdevvportprofile.c
+--- libvirt-0.9.12/src/util/virnetdevvportprofile.c	2012-05-09 05:21:54.000000000 +0400
++++ libvirt-0.9.12.my/src/util/virnetdevvportprofile.c	2012-05-17 13:27:54.000000000 +0400
+@@ -22,6 +22,10 @@
+ 
+ #include <config.h>
+ 
++#include <netlink/msg.h>
++#include <linux/rtnetlink.h>
++#include <linux/if_link.h>
++
+ #include "virnetdevvportprofile.h"
+ #include "virterror_internal.h"
+ 
+diff -wbBur libvirt-0.9.12/src/util/virnetlink.c libvirt-0.9.12.my/src/util/virnetlink.c
+--- libvirt-0.9.12/src/util/virnetlink.c	2012-05-09 16:41:41.000000000 +0400
++++ libvirt-0.9.12.my/src/util/virnetlink.c	2012-05-17 13:38:08.000000000 +0400
+@@ -49,7 +49,7 @@
+ 
+ #define NETLINK_ACK_TIMEOUT_S  2
+ 
+-#if defined(__linux__) && defined(HAVE_LIBNL)
++#if defined(__linux__) && defined(HAVE_LIBNL3)
+ /* State for a single netlink event handle */
+ struct virNetlinkEventHandle {
+     int watch;
+diff -wbBur libvirt-0.9.12/src/util/virnetlink.h libvirt-0.9.12.my/src/util/virnetlink.h
+--- libvirt-0.9.12/src/util/virnetlink.h	2012-05-09 05:21:54.000000000 +0400
++++ libvirt-0.9.12.my/src/util/virnetlink.h	2012-05-17 13:27:37.000000000 +0400
+@@ -23,9 +23,10 @@
+ # include "config.h"
+ # include "internal.h"
+ 
+-# if defined(__linux__) && defined(HAVE_LIBNL)
++# if defined(__linux__) && defined(HAVE_LIBNL3)
+ 
+ #  include <netlink/msg.h>
++#  include <stdint.h>
+ 
+ # else
+