diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-08 17:23:24 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-08 17:23:24 -0300 |
| commit | da4865e38266a85c230abd569a95aa7152c4f9e9 (patch) | |
| tree | 610329610e1d43cd175b799f48942201b718329d /community/libvirt | |
| parent | 19ae256a3867f63f4a1db7ed50da6f0bed71ec8d (diff) | |
| parent | 4d91fc9a2dc38054b8748f27193dc3a6950bda3c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/luaexpat/PKGBUILD
community/qps/PKGBUILD
extra/python-egenix-mx-base/PKGBUILD
libre/thunderbird-libre/rePKGBUILD
staging/kdesdk/PKGBUILD
Diffstat (limited to 'community/libvirt')
| -rw-r--r-- | community/libvirt/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/libvirt/openbsd-netcat-default.patch | 38 |
2 files changed, 24 insertions, 24 deletions
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 96d77eb23..5ab7903be 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46367 2011-05-06 10:37:16Z spupykin $ +# $Id: PKGBUILD 48842 2011-06-06 14:43:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') @@ -37,10 +37,10 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) -md5sums=('4182dbe290cca4344a5387950dc06433' +md5sums=('a9f974e173471a9c9b381ad1e93642b0' '018d97dafc0049075fba6f2850f17a12' '3ed0e24f5b5e25bf553f5427d64915e6' - '7d5a841d51321be56ad3c4f93d112fb0' + '1c151434af552b8a30fe87d21ef5d783' 'db95aecdf2ccf3693fef5821cdcb7eba' '5745bb8d0b254abb7a3528c66e03b0f9') @@ -62,7 +62,7 @@ build() { [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch # fixes for yajl 2.0 API changes - [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch" +# [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch" export LDFLAGS=-lX11 [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch index 382611c74..8a0d9aec8 100644 --- a/community/libvirt/openbsd-netcat-default.patch +++ b/community/libvirt/openbsd-netcat-default.patch @@ -1,24 +1,24 @@ -diff -wbBur libvirt-0.9.0/src/qemu/qemu_migration.c libvirt-0.9.0.my/src/qemu/qemu_migration.c ---- libvirt-0.9.0/src/qemu/qemu_migration.c 2011-03-29 14:18:53.000000000 +0000 -+++ libvirt-0.9.0.my/src/qemu/qemu_migration.c 2011-04-04 14:34:43.000000000 +0000 -@@ -819,7 +819,7 @@ +diff -wbBur libvirt-0.9.2/src/qemu/qemu_migration.c libvirt-0.9.2.my/src/qemu/qemu_migration.c +--- libvirt-0.9.2/src/qemu/qemu_migration.c 2011-06-06 06:47:32.000000000 +0400 ++++ libvirt-0.9.2.my/src/qemu/qemu_migration.c 2011-06-06 18:27:38.000000000 +0400 +@@ -1770,7 +1770,7 @@ + ret = qemuMonitorMigrateToUnix(priv->mon, background_flags, unixfile); - } - else if (qemuCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { + } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { - const char *args[] = { "nc", "-U", unixfile, NULL }; + const char *args[] = { "nc.openbsd", "-U", unixfile, NULL }; - internalret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args); + ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args); } else { - internalret = -1; -diff -wbBur libvirt-0.9.0/src/remote/remote_driver.c libvirt-0.9.0.my/src/remote/remote_driver.c ---- libvirt-0.9.0/src/remote/remote_driver.c 2011-03-29 12:57:01.000000000 +0000 -+++ libvirt-0.9.0.my/src/remote/remote_driver.c 2011-04-04 14:34:23.000000000 +0000 -@@ -777,7 +777,7 @@ - cmd_argv[j++] = strdup ("none"); + ret = -1; +diff -wbBur libvirt-0.9.2/src/remote/remote_driver.c libvirt-0.9.2.my/src/remote/remote_driver.c +--- libvirt-0.9.2/src/remote/remote_driver.c 2011-06-06 04:15:12.000000000 +0400 ++++ libvirt-0.9.2.my/src/remote/remote_driver.c 2011-06-06 18:27:52.000000000 +0400 +@@ -774,7 +774,7 @@ + virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes", "-e", + "none", NULL); } - cmd_argv[j++] = strdup (priv->hostname); -- cmd_argv[j++] = strdup (netcat ? netcat : "nc"); -+ cmd_argv[j++] = strdup (netcat ? netcat : "nc.openbsd"); - cmd_argv[j++] = strdup ("-U"); - cmd_argv[j++] = strdup (sockname ? sockname : - (flags & VIR_CONNECT_RO +- virCommandAddArgList(cmd, priv->hostname, netcat ? netcat : "nc", ++ virCommandAddArgList(cmd, priv->hostname, netcat ? netcat : "nc.openbsd", + "-U", (sockname ? sockname : + (flags & VIR_CONNECT_RO + ? LIBVIRTD_PRIV_UNIX_SOCKET_RO |