Update sysutils/libvirt from 0.9.3 to 1.2.1

Reason for updating: numerous security vulnerabilities have been fixed,
and many changes made - functional and fixes. The list is really too long
to include here:

	-rw-r--r--  1 agc  wheel  3437489 Jan 24 18:26 /tmp/news


(agc)

$NetBSD: patch-gnulib-lib-base64.h,v 1.1 2014/01/25 02:54:27 agc Exp $

Avoid native header definitions

--- gnulib/lib/base64.h.orig	2014-01-07 19:14:57.000000000 -0800
+++ gnulib/lib/base64.h	2014-01-24 18:03:33.000000000 -0800
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BASE64_H
-# define BASE64_H
+#ifndef GNULIB_LIB_BASE64_H
+# define GNULIB_LIB_BASE64_H
 
 /* Get size_t. */
 # include <stddef.h>
@@ -65,4 +65,4 @@
 }
 # endif
 
-#endif /* BASE64_H */
+#endif /* GNULIB_LIB_BASE64_H */

$NetBSD: patch-src-rpc-virnetmessage.c,v 1.1 2014/01/25 02:54:27 agc Exp $

fix for # of args in xdrproc_t on NetBSD

--- src/rpc/virnetmessage.c	2014/01/25 02:27:37	1.1
+++ src/rpc/virnetmessage.c	2014/01/25 02:30:04
@@ -345,7 +345,11 @@
                   msg->bufferLength - msg->bufferOffset, XDR_ENCODE);
 
     /* Try to encode the payload. If the buffer is too small increase it. */
+#ifdef __NetBSD__
+    while (!(*filter)(&xdr, data)) {
+#else
     while (!(*filter)(&xdr, data, 0)) {
+#endif
         unsigned int newlen = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4;
 
         if (newlen > VIR_NET_MESSAGE_MAX) {
@@ -402,7 +406,11 @@
     xdrmem_create(&xdr, msg->buffer + msg->bufferOffset,
                   msg->bufferLength - msg->bufferOffset, XDR_DECODE);
 
+#ifdef __NetBSD__
+    if (!(*filter)(&xdr, data)) {
+#else
     if (!(*filter)(&xdr, data, 0)) {
+#endif
         virReportError(VIR_ERR_RPC, "%s", _("Unable to decode message payload"));
         goto error;
     }

$NetBSD: patch-src-util-virutil.c,v 1.1 2014/01/25 02:54:27 agc Exp $

Only use uselocale() if we have it

--- src/util/virutil.c	2014/01/25 02:40:22	1.1
+++ src/util/virutil.c	2014/01/25 02:41:41
@@ -428,9 +428,13 @@
     if (virLocaleInitialize() < 0)
         goto error;
 
+#ifdef HAVE_USELOCALE
     old_loc = uselocale(virLocale);
+#endif
     ret = virAsprintf(strp, "%lf", number);
+#ifdef HAVE_USELOCALE
     uselocale(old_loc);
+#endif
 
 #else
 

$NetBSD: patch-tools--virsh-secret.c,v 1.1 2014/01/25 02:54:27 agc Exp $

bring forward previous patch to allocate the context with the correct args
"There is a problem expanding the macro in base64.h, so we'll do it here"

--- tools/virsh-secret.c	2014/01/25 01:56:56	1.1
+++ tools/virsh-secret.c	2014/01/25 01:57:41
@@ -212,7 +212,7 @@
     if (vshCommandOptStringReq(ctl, cmd, "base64", &base64) < 0)
         goto cleanup;
 
-    if (!base64_decode_alloc(base64, strlen(base64), &value, &value_size)) {
+    if (!base64_decode_alloc_ctx(NULL, base64, strlen(base64), &value, &value_size)) {
         vshError(ctl, "%s", _("Invalid base64 data"));
         goto cleanup;
     }