Sun Feb 10 01:12:35 PST 2013

3 files changed, 0 insertions, 185 deletions

diff --git a/community/libvirt/libvirt-libnl3.patch b/community/libvirt/libvirt-libnl3.patch
deleted file mode 100644
index 1e5f141b9..000000000
--- a/community/libvirt/libvirt-libnl3.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-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
- 
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
deleted file mode 100644
index 5538c892d..000000000
--- a/community/libvirt/openbsd-netcat-default.patch
+++ /dev/null
@@ -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;"
diff --git a/community/libvirt/xdg.patch b/community/libvirt/xdg.patch
deleted file mode 100644
index 0a12c83b5..000000000
--- a/community/libvirt/xdg.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 0b32ffe..08dfbb0 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -97,6 +97,9 @@ static int virNetSocketForkDaemon(const char *binary)
-                                              NULL);
- 
-     virCommandAddEnvPassCommon(cmd);
-+    virCommandAddEnvPass(cmd, "XDG_CACHE_HOME");
-+    virCommandAddEnvPass(cmd, "XDG_CONFIG_HOME");
-+    virCommandAddEnvPass(cmd, "XDG_RUNTIME_DIR");
-     virCommandClearCaps(cmd);
-     virCommandDaemonize(cmd);
-     ret = virCommandRun(cmd, NULL);