Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/glibc/PKGBUILD
	extra/telepathy-logger-qt/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	testing/openssh/PKGBUILD
	testing/openssh/sshd
	testing/openssh/sshd.service
	testing/spamassassin/PKGBUILD
	testing/spamassassin/spamassassin.install
	testing/upower/PKGBUILD

2 files changed, 47 insertions, 24 deletions

diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index be0fd6f5c..3cbe6360c 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73804 2012-07-15 20:16:33Z spupykin $
+# $Id: PKGBUILD 75710 2012-08-29 09:58:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.9.13
-pkgrel=2
+pkgver=0.10.0
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -38,13 +38,13 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	openbsd-netcat-default.patch
 	libvirt-libnl3.patch
 	xdg.patch)
-md5sums=('86cbe53ee662e3b9e8bb0c63c737ba27'
+md5sums=('63ceb65bba07fc7690499d9eb6d2c844'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '8297b1be794a24cc77f66af9380ace59'
          'bc2971dacdbac967fc3474e50affc345'
          '8d98e62915785686b0b6c8c070628392'
-         'b0be50eb9dfe4d133decf23b60880f7d'
+         '456723b41903d3aaa7ec948c1feea265'
          'ba27fbcd989de8d84cfff98326f10c54'
          '9b9fcdbd64d37d84ae73d9da0a7efed7')
 
@@ -58,13 +58,12 @@ build() {
     sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
-
-  patch -Np1 -i ${srcdir}/libvirt-libnl3.patch
-  patch -Np1 -i ${srcdir}/xdg.patch
-  aclocal
-  automake --add-missing || true
-  autoreconf
+  patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch
+#  patch -Np1 -i ${srcdir}/libvirt-libnl3.patch
+#  patch -Np1 -i ${srcdir}/xdg.patch
+#  aclocal
+#  automake --add-missing || true
+#  autoreconf
 
   export LDFLAGS=-lX11
   export RADVD=/usr/sbin/radvd
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index a01b4f14e..5538c892d 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,7 +1,7 @@
-diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c
---- libvirt-0.9.7/src/qemu/qemu_migration.c	2011-10-31 07:46:04.000000000 +0400
-+++ libvirt-0.9.7.my/src/qemu/qemu_migration.c	2011-11-08 15:46:10.000000000 +0400
-@@ -1589,7 +1589,7 @@
+diff -wbBur libvirt-0.10.0.org/src/qemu/qemu_migration.c libvirt-0.10.0/src/qemu/qemu_migration.c
+--- libvirt-0.10.0.org/src/qemu/qemu_migration.c	2012-08-27 06:12:21.000000000 +0400
++++ libvirt-0.10.0/src/qemu/qemu_migration.c	2012-08-29 13:36:23.000000000 +0400
+@@ -1910,7 +1910,7 @@
                                             spec->dest.unix_socket.file);
          } else {
              const char *args[] = {
@@ -10,10 +10,10 @@ diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qe
              };
              ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
          }
-diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c
---- libvirt-0.9.7/src/remote/remote_driver.c	2011-11-08 07:53:30.000000000 +0400
-+++ libvirt-0.9.7.my/src/remote/remote_driver.c	2011-11-08 15:46:10.000000000 +0400
-@@ -614,7 +614,7 @@
+diff -wbBur libvirt-0.10.0.org/src/remote/remote_driver.c libvirt-0.10.0/src/remote/remote_driver.c
+--- libvirt-0.10.0.org/src/remote/remote_driver.c	2012-08-27 06:12:21.000000000 +0400
++++ libvirt-0.10.0/src/remote/remote_driver.c	2012-08-29 13:36:32.000000000 +0400
+@@ -693,7 +693,7 @@
                                                  username,
                                                  !tty,
                                                  !verify,
@@ -22,10 +22,22 @@ diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote
                                                  keyfile,
                                                  sockname)))
              goto failed;
-diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c
---- libvirt-0.9.7/src/rpc/virnetsocket.c	2011-11-08 07:53:30.000000000 +0400
-+++ libvirt-0.9.7.my/src/rpc/virnetsocket.c	2011-11-08 15:46:31.000000000 +0400
-@@ -642,7 +642,7 @@
+diff -wbBur libvirt-0.10.0.org/src/rpc/virnetclient.c libvirt-0.10.0/src/rpc/virnetclient.c
+--- libvirt-0.10.0.org/src/rpc/virnetclient.c	2012-08-28 07:44:50.000000000 +0400
++++ libvirt-0.10.0/src/rpc/virnetclient.c	2012-08-29 13:36:38.000000000 +0400
+@@ -469,7 +469,7 @@
+     DEFAULT_VALUE(host, "localhost");
+     DEFAULT_VALUE(port, "22");
+     DEFAULT_VALUE(username, "root");
+-    DEFAULT_VALUE(netcatPath, "nc");
++    DEFAULT_VALUE(netcatPath, "nc.openbsd");
+     DEFAULT_VALUE(knownHostsVerify, "normal");
+ 
+     virBufferEscapeShell(&buf, netcatPath);
+diff -wbBur libvirt-0.10.0.org/src/rpc/virnetsocket.c libvirt-0.10.0/src/rpc/virnetsocket.c
+--- libvirt-0.10.0.org/src/rpc/virnetsocket.c	2012-08-22 14:00:59.000000000 +0400
++++ libvirt-0.10.0/src/rpc/virnetsocket.c	2012-08-29 13:36:44.000000000 +0400
+@@ -698,7 +698,7 @@
          virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
  
      if (!netcat)
@@ -34,3 +46,15 @@ diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnet
  
      virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
  
+diff -wbBur libvirt-0.10.0.org/tests/virnetsockettest.c libvirt-0.10.0/tests/virnetsockettest.c
+--- libvirt-0.10.0.org/tests/virnetsockettest.c	2012-08-10 06:26:04.000000000 +0400
++++ libvirt-0.10.0/tests/virnetsockettest.c	2012-08-29 13:36:53.000000000 +0400
+@@ -593,7 +593,7 @@
+ 
+     struct testSSHData sshData7 = {
+         .nodename = "somehost",
+-        .netcat = "nc -4",
++        .netcat = "nc.openbsd -4",
+         .path = "/tmp/socket",
+         .expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
+                                          "ARG=-q0;"