dist-git conversion

.cvsignore

@@ -1,14 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.gz
-libvirt-0.6.0.tar.gz
-libvirt-0.6.1.tar.gz
-libvirt-0.6.2.tar.gz
-libvirt-0.6.3.tar.gz
-libvirt-0.6.4.tar.gz
-libvirt-0.6.5.tar.gz
-libvirt-0.7.0.tar.gz
-libvirt-0.7.1.tar.gz
-libvirt-0.7.2.tar.gz

.gitignore

@@ -0,0 +1,19 @@
+libvirt-0.0.3.tar.gz
+libvirt-0.0.4.tar.gz
+libvirt-0.0.5.tar.gz
+libvirt-0.0.6.tar.gz
+libvirt-0.1.0.tar.gz
+libvirt-0.1.2.tar.gz
+libvirt-0.1.1.tar.gz
+libvirt-0.1.3.tar.gz
+libvirt-0.1.4.tar.gz
+libvirt-0.1.5.tar.gz
+libvirt-0.1.6.tar.gz
+libvirt-0.1.7.tar.gz
+libvirt-0.1.8.tar.gz
+libvirt-0.1.9.tar.gz
+libvirt-0.1.10.tar.gz
+libvirt-0.1.11.tar.gz
+libvirt-0.2.0.tar.gz
+libvirt-0.2.1.tar.gz
+libvirt-0.2.2.tar.gz

Makefile

@@ -3,19 +3,4 @@
 NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))
 
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
+include ../common/Makefile.common

branch

@@ -0,0 +1 @@
+F-7

libvirt-0.4.0-auth-null-cb-2.patch

@@ -0,0 +1,83 @@
+diff -rupN libvirt-0.4.0.orig/src/remote_internal.c libvirt-0.4.0.new/src/remote_internal.c
+--- libvirt-0.4.0.orig/src/remote_internal.c	2008-01-11 10:39:34.000000000 -0500
++++ libvirt-0.4.0.new/src/remote_internal.c	2008-01-11 10:43:12.000000000 -0500
+@@ -3054,8 +3054,12 @@ remoteAuthSASL (virConnectPtr conn, stru
+     if ((remoteAddr = addrToString(&sa, salen)) == NULL)
+         goto cleanup;
+ 
+-    if ((saslcb = remoteAuthMakeCallbacks(auth->credtype, auth->ncredtype)) == NULL)
+-        goto cleanup;
++    if (auth) {
++        if ((saslcb = remoteAuthMakeCallbacks(auth->credtype, auth->ncredtype)) == NULL)
++            goto cleanup;
++    } else {
++        saslcb = NULL;
++    }
+ 
+     /* Setup a handle for being a client */
+     err = sasl_client_new("libvirt",
+@@ -3168,15 +3172,21 @@ remoteAuthSASL (virConnectPtr conn, stru
+             goto cleanup;
+         }
+         /* Run the authentication callback */
+-        if ((*(auth->cb))(cred, ncred, auth->cbdata) < 0) {
++        if (auth && auth->cb) {
++            if ((*(auth->cb))(cred, ncred, auth->cbdata) < 0) {
++                __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
++                                 VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
++                                 "Failed to collect auth credentials");
++                goto cleanup;
++            }
++            remoteAuthFillInteract(cred, interact);
++            goto restart;
++        } else {
+             __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
+                              VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
+-                             "Failed to collect auth credentials");
++                             "No authentication callback available");
+             goto cleanup;
+-            return -1;
+         }
+-        remoteAuthFillInteract(cred, interact);
+-        goto restart;
+     }
+     free(iret.mechlist);
+ 
+@@ -3240,15 +3250,22 @@ remoteAuthSASL (virConnectPtr conn, stru
+                 return -1;
+             }
+             /* Run the authentication callback */
+-            if ((*(auth->cb))(cred, ncred, auth->cbdata) < 0) {
++            if (auth && auth->cb) {
++                if ((*(auth->cb))(cred, ncred, auth->cbdata) < 0) {
++                    __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
++                                     VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
++                                     "Failed to collect auth credentials");
++                    goto cleanup;
++                    return -1;
++                }
++                remoteAuthFillInteract(cred, interact);
++                goto restep;
++            } else {
+                 __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
+                                  VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
+-                                 "Failed to collect auth credentials");
++                                 "No authentication callback available");
+                 goto cleanup;
+-                return -1;
+             }
+-            remoteAuthFillInteract(cred, interact);
+-            goto restep;
+         }
+ 
+         if (serverin) {
+@@ -3319,7 +3336,8 @@ remoteAuthSASL (virConnectPtr conn, stru
+     if (remoteAddr) free(remoteAddr);
+     if (serverin) free(serverin);
+ 
+-    free(saslcb);
++    if (saslcb)
++        free(saslcb);
+     remoteAuthFreeCredentials(cred, ncred);
+     if (ret != 0 && saslconn)
+         sasl_dispose(&saslconn);

libvirt-0.4.0-auth-null-cb.patch

@@ -0,0 +1,44 @@
+diff -rup libvirt-0.4.0.orig/src/remote_internal.c libvirt-0.4.0.new/src/remote_internal.c
+--- libvirt-0.4.0.orig/src/remote_internal.c	2007-12-17 16:51:09.000000000 -0500
++++ libvirt-0.4.0.new/src/remote_internal.c	2008-01-02 16:28:44.000000000 -0500
+@@ -3347,24 +3347,26 @@ remoteAuthPolkit (virConnectPtr conn, st
+     };
+     remoteDebug(priv, "Client initialize PolicyKit authentication");
+ 
+-    for (i = 0 ; i < auth->ncredtype ; i++) {
+-        if (auth->credtype[i] == VIR_CRED_EXTERNAL)
+-            allowcb = 1;
+-    }
++    if (auth && auth->cb) {
++        /* Check if the neccessary credential type for PolicyKit is supported */
++        for (i = 0 ; i < auth->ncredtype ; i++) {
++            if (auth->credtype[i] == VIR_CRED_EXTERNAL)
++                allowcb = 1;
++        }
+ 
+-    /* Run the authentication callback */
+-    if (allowcb) {
+-        if (auth && auth->cb &&
+-            (*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
+-            __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
+-                             VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
+-                             "Failed to collect auth credentials");
+-            return -1;
++        if (allowcb) {
++            /* Run the authentication callback */
++            if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
++                __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
++                                 VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
++                                 "Failed to collect auth credentials");
++                return -1;
++            }
+         } else {
+-            remoteDebug(priv, "No auth callback provided for PolicyKit");
++            remoteDebug(priv, "Client auth callback does not support PolicyKit");
+         }
+     } else {
+-        remoteDebug(priv, "Client auth callback does not support PolicyKit");
++        remoteDebug(priv, "No auth callback provided");
+     }
+ 
+     memset (&ret, 0, sizeof ret);

libvirt-0.4.0-conffile-size.patch

@@ -0,0 +1,12 @@
+diff -rup libvirt-0.4.0.orig/src/conf.c libvirt-0.4.0.new/src/conf.c
+--- libvirt-0.4.0.orig/src/conf.c	2007-12-12 08:30:49.000000000 -0500
++++ libvirt-0.4.0.new/src/conf.c	2008-01-02 16:30:12.000000000 -0500
+@@ -705,7 +705,7 @@ error:
+ virConfPtr
+ __virConfReadFile(const char *filename)
+ {
+-    char content[4096];
++    char content[8192];
+     int fd;
+     int len;
+ 

libvirt-0.4.0-remote-ssh.patch

@@ -0,0 +1,17 @@
+diff -rup libvirt-0.4.0.orig/src/remote_internal.c libvirt-0.4.0.new/src/remote_internal.c
+--- libvirt-0.4.0.orig/src/remote_internal.c	2008-01-14 19:32:25.000000000 -0500
++++ libvirt-0.4.0.new/src/remote_internal.c	2008-01-14 19:32:42.000000000 -0500
+@@ -677,11 +677,12 @@ doRemoteOpen (virConnectPtr conn,
+         cmd_argv[j++] = strdup (sockname ? sockname : LIBVIRTD_PRIV_UNIX_SOCKET);
+         cmd_argv[j++] = 0;
+         assert (j == nr_args);
+-        for (j = 0; j < nr_args; j++)
++        for (j = 0; j < (nr_args-1); j++) {
+             if (cmd_argv[j] == NULL) {
+                 error (conn, VIR_ERR_SYSTEM_ERROR, strerror (ENOMEM));
+                 goto failed;
+             }
++        }
+     }
+ 
+         /*FALLTHROUGH*/

libvirt-qemu-machine-type-fixes2.patch

@@ -1,42 +0,0 @@
-From b7b6a28eb9eae641762de9408a90971d849ce92e Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Thu, 15 Oct 2009 12:09:17 +0100
-Subject: [PATCH] Don't copy old machines from a domain which has none
-
-If the the qemu and kvm binaries are the same, we don't include machine
-types in the kvm domain info.
-
-However, the code which refreshes the machine types info from the
-previous capabilities structure first looks at the kvm domain's info,
-finds it matches and then copies the empty machine types list over
-for the top-level qemu domain.
-
-That doesn't make sense, we shouldn't copy an empty machin types list.
-
-* src/qemu/qemu_conf.c: qemudGetOldMachinesFromInfo(): don't copy an
-  empty machine types list.
-
-(cherry picked from commit 2210f8a3a8e2774ca4fb8b42e21899e5b85ca913)
-
-Fedora-patch: libvirt-qemu-machine-type-fixes2.patch
----
- src/qemu/qemu_conf.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index ac63570..b881f1e 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -505,6 +505,9 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info,
-     virCapsGuestMachinePtr *list;
-     int i;
- 
-+    if (!info->nmachines)
-+        return 0;
-+
-     if (!info->emulator || !STREQ(emulator, info->emulator))
-         return 0;
- 
--- 
-1.6.2.5
-

sources

@@ -1 +1 @@
-133aead8c46c0601b6b37e024c6aa86a  libvirt-0.7.2.tar.gz
+2f6c6adb62145988f0e5021e5cbd71d3  libvirt-0.4.0.tar.gz