[arch-commits] Commit in libvirt/trunk (PKGBUILD openbsd-netcat-default.patch)

[Sergej Pupykin]

    Date: Tuesday, January 29, 2013 @ 15:01:45
  Author: spupykin
Revision: 83316

upgpkg: libvirt 1.0.1-3

upd

Modified:
  libvirt/trunk/PKGBUILD
Deleted:
  libvirt/trunk/openbsd-netcat-default.patch

------------------------------+
 PKGBUILD                     |   12 ++++----
 openbsd-netcat-default.patch |   60 -----------------------------------------
 2 files changed, 7 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-29 14:01:01 UTC (rev 83315)
+++ PKGBUILD	2013-01-29 14:01:45 UTC (rev 83316)
@@ -4,7 +4,7 @@
 
 pkgname=libvirt
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
 url="http://libvirt.org/"
@@ -12,7 +12,7 @@
 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' 'libnl' 'libx11')
+	 'iproute2' 'netcf' 'libnl' 'libx11' 'audit')
 makedepends=('pkgconfig' 'lvm2' 'linux-api-headers')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
@@ -40,7 +40,7 @@
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0ee5b6c58590ff392a266f20f7928d1f'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
-         '8d98e62915785686b0b6c8c070628392')
+         '020971887442ebbf1b6949e031c8dd3f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -56,8 +56,10 @@
   export RADVD=/usr/sbin/radvd
   [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \
 	--with-storage-lvm --without-xen --with-udev --without-hal --disable-static \
-	--with-init-script=systemd
-  make -j1
+	--with-init-script=systemd --with-audit \
+	--with-qemu-user=nobody --with-qemu-group=nobody \
+	--without-netcf --with-interface
+  make
   sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service
   sed -i 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' tools/libvirt-guests.service
   sed -i 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' tools/libvirt-guests.service

Deleted: openbsd-netcat-default.patch
===================================================================
--- openbsd-netcat-default.patch	2013-01-29 14:01:01 UTC (rev 83315)
+++ openbsd-netcat-default.patch	2013-01-29 14:01:45 UTC (rev 83316)
@@ -1,60 +0,0 @@
-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[] = {
--                "nc", "-U", spec->dest.unix_socket.file, NULL
-+                "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL
-             };
-             ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
-         }
-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,
--                                                netcat ? netcat : "nc",
-+                                                netcat ? netcat : "nc.openbsd",
-                                                 keyfile,
-                                                 sockname)))
-             goto failed;
-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)
--        netcat = "nc";
-+        netcat = "nc.openbsd";
- 
-     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;"