Actually add the patch this time

Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)
Fix timeout when autostarting session daemon

.cvsignore

@@ -1,25 +1,7 @@
-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
-libvirt-0.2.3.tar.gz
-libvirt-0.3.0.tar.gz
-libvirt-0.3.1.tar.gz
-libvirt-0.3.2.tar.gz
-libvirt-0.3.3.tar.gz
-libvirt-0.4.0.tar.gz
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.gz
+libvirt-0.6.0.tar.gz
+libvirt-0.6.1.tar.gz

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

@@ -1,83 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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-nodeinfo-compat.patch

@@ -1,22 +0,0 @@
-diff -rup libvirt-0.4.0.orig/src/xend_internal.c libvirt-0.4.0.new/src/xend_internal.c
---- libvirt-0.4.0.orig/src/xend_internal.c	2007-12-17 18:05:27.000000000 -0500
-+++ libvirt-0.4.0.new/src/xend_internal.c	2008-01-18 21:13:30.000000000 -0500
-@@ -1907,6 +1907,9 @@ sexpr_to_xend_node_info(struct sexpr *ro
-     info->mhz = sexpr_int(root, "node/cpu_mhz");
-     info->nodes = sexpr_int(root, "node/nr_nodes");
-     info->sockets = sexpr_int(root, "node/sockets_per_node");
-+    info->cores = sexpr_int(root, "node/cores_per_socket");
-+    info->threads = sexpr_int(root, "node/threads_per_core");
-+
-     /* Xen 3.2.0 replaces sockets_per_node with 'nr_cpus'.
-      * Old Xen calculated sockets_per_node using its internal
-      * nr_cpus / (nodes*cores*threads), so fake it ourselves
-@@ -1921,8 +1924,6 @@ sexpr_to_xend_node_info(struct sexpr *ro
-         if (info->sockets == 0)
-             info->sockets = 1;
-     }
--    info->cores = sexpr_int(root, "node/cores_per_socket");
--    info->threads = sexpr_int(root, "node/threads_per_core");
-     return (0);
- }
- 

libvirt-0.4.0-remote-ssh.patch

@@ -1,17 +0,0 @@
-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-0.6.1-storage-delete-fail.patch

@@ -0,0 +1,11 @@
+diff -rup libvirt-0.6.1.orig/src/storage_driver.c libvirt-0.6.1.new/src/storage_driver.c
+--- libvirt-0.6.1.orig/src/storage_driver.c	2009-02-16 03:43:41.000000000 -0500
++++ libvirt-0.6.1.new/src/storage_driver.c	2009-03-06 08:02:51.000000000 -0500
+@@ -1296,7 +1296,6 @@ storageVolumeDelete(virStorageVolPtr obj
+     ret = 0;
+ 
+ cleanup:
+-    virStorageVolDefFree(vol);
+     if (pool)
+         virStoragePoolObjUnlock(pool);
+     return ret;

libvirt-0.6.1-vnc-sasl-auth.patch

@@ -0,0 +1,277 @@
+diff -r 961d4b1ca1d3 qemud/libvirtd_qemu.aug
+--- a/qemud/libvirtd_qemu.aug	Wed Mar 04 13:17:44 2009 +0000
++++ b/qemud/libvirtd_qemu.aug	Thu Mar 05 14:22:50 2009 +0000
+@@ -27,6 +27,8 @@ module Libvirtd_qemu =
+                  | str_entry "vnc_tls_x509_cert_dir"
+                  | bool_entry "vnc_tls_x509_verify"
+                  | str_entry "vnc_password"
++                 | bool_entry "vnc_sasl"
++                 | str_entry "vnc_sasl_dir"
+ 
+    (* Each enty in the config is one of the following three ... *)
+    let entry = vnc_entry
+diff -r 961d4b1ca1d3 qemud/test_libvirtd_qemu.aug
+--- a/qemud/test_libvirtd_qemu.aug	Wed Mar 04 13:17:44 2009 +0000
++++ b/qemud/test_libvirtd_qemu.aug	Thu Mar 05 14:22:50 2009 +0000
+@@ -60,6 +60,25 @@ vnc_tls_x509_verify = 1
+ # example here before you set this
+ #
+ vnc_password = \"XYZ12345\"
++
++
++# Enable use of SASL encryption on the VNC server. This requires
++# a VNC client which supports the SASL protocol extension.
++# Examples include vinagre, virt-viewer and virt-manager
++# itself. UltraVNC, RealVNC, TightVNC do not support this
++#
++# It is necessary to configure /etc/sasl2/qemu.conf to choose
++# the desired SASL plugin (eg, GSSPI for Kerberos)
++#
++vnc_sasl = 1
++
++
++# The default SASL configuration file is located in /etc/sasl2/
++# When running libvirtd unprivileged, it may be desirable to
++# override the configs in this location. Set this parameter to
++# point to the directory, and create a qemu.conf in that location
++#
++vnc_sasl_dir = \"/some/directory/sasl2\"
+ "
+ 
+    test Libvirtd_qemu.lns get conf =
+@@ -123,3 +142,22 @@ vnc_password = \"XYZ12345\"
+ { "#comment" = "example here before you set this" }
+ { "#comment" = "" }
+ { "vnc_password" = "XYZ12345" }
++{ "#empty" }
++{ "#empty" }
++{ "#comment" = "Enable use of SASL encryption on the VNC server. This requires" }
++{ "#comment" = "a VNC client which supports the SASL protocol extension." }
++{ "#comment" = "Examples include vinagre, virt-viewer and virt-manager" }
++{ "#comment" = "itself. UltraVNC, RealVNC, TightVNC do not support this" }
++{ "#comment" = "" }
++{ "#comment" = "It is necessary to configure /etc/sasl2/qemu.conf to choose" }
++{ "#comment" = "the desired SASL plugin (eg, GSSPI for Kerberos)" }
++{ "#comment" = "" }
++{ "vnc_sasl" = "1" }
++{ "#empty" }
++{ "#empty" }
++{ "#comment" = "The default SASL configuration file is located in /etc/sasl2/" }
++{ "#comment" = "When running libvirtd unprivileged, it may be desirable to" }
++{ "#comment" = "override the configs in this location. Set this parameter to" }
++{ "#comment" = "point to the directory, and create a qemu.conf in that location" }
++{ "#comment" = "" }
++{ "vnc_sasl_dir" = "/some/directory/sasl2" }
+diff -r 961d4b1ca1d3 src/qemu.conf
+--- a/src/qemu.conf	Wed Mar 04 13:17:44 2009 +0000
++++ b/src/qemu.conf	Thu Mar 05 14:22:50 2009 +0000
+@@ -60,6 +60,27 @@
+ # vnc_password = "XYZ12345"
+ 
+ 
++# Enable use of SASL encryption on the VNC server. This requires
++# a VNC client which supports the SASL protocol extension.
++# Examples include vinagre, virt-viewer and virt-manager
++# itself. UltraVNC, RealVNC, TightVNC do not support this
++#
++# It is necessary to configure /etc/sasl2/qemu.conf to choose
++# the desired SASL plugin (eg, GSSPI for Kerberos)
++#
++# vnc_sasl = 1
++
++
++# The default SASL configuration file is located in /etc/sasl2/
++# When running libvirtd unprivileged, it may be desirable to
++# override the configs in this location. Set this parameter to
++# point to the directory, and create a qemu.conf in that location
++#
++# vnc_sasl_dir = "/some/directory/sasl2"
++
++
++
++
+ # The default security driver is SELinux. If SELinux is disabled
+ # on the host, then the security driver will automatically disable
+ # itself. If you wish to disable QEMU SELinux security driver while
+diff -r 961d4b1ca1d3 src/qemu_conf.c
+--- a/src/qemu_conf.c	Wed Mar 04 13:17:44 2009 +0000
++++ b/src/qemu_conf.c	Thu Mar 05 14:22:50 2009 +0000
+@@ -161,6 +161,21 @@ int qemudLoadDriverConfig(struct qemud_d
+         }
+     }
+ 
++    p = virConfGetValue (conf, "vnc_sasl");
++    CHECK_TYPE ("vnc_sasl", VIR_CONF_LONG);
++    if (p) driver->vncSASL = p->l;
++
++    p = virConfGetValue (conf, "vnc_sasl_dir");
++    CHECK_TYPE ("vnc_sasl_dir", VIR_CONF_STRING);
++    if (p && p->str) {
++        VIR_FREE(driver->vncSASLdir);
++        if (!(driver->vncSASLdir = strdup(p->str))) {
++            virReportOOMError(NULL);
++            virConfFree(conf);
++            return -1;
++        }
++    }
++
+     virConfFree (conf);
+     return 0;
+ }
+@@ -838,15 +853,20 @@ int qemudBuildCommandLine(virConnectPtr 
+             goto no_memory;                                             \
+     } while (0)
+ 
++#define ADD_ENV_PAIR(envname, val)                                      \
++    do {                                                                \
++        char *envval;                                                   \
++        ADD_ENV_SPACE;                                                  \
++        if (virAsprintf(&envval, "%s=%s", envname, val) < 0)            \
++            goto no_memory;                                             \
++        qenv[qenvc++] = envval;                                         \
++    } while (0)
++
+ #define ADD_ENV_COPY(envname)                                           \
+     do {                                                                \
+         char *val = getenv(envname);                                    \
+-        char *envval;                                                   \
+-        ADD_ENV_SPACE;                                                  \
+         if (val != NULL) {                                              \
+-            if (virAsprintf(&envval, "%s=%s", envname, val) < 0)        \
+-                goto no_memory;                                         \
+-            qenv[qenvc++] = envval;                                     \
++            ADD_ENV_PAIR(envname, val);                                 \
+         }                                                               \
+     } while (0)
+ 
+@@ -1295,6 +1315,15 @@ int qemudBuildCommandLine(virConnectPtr 
+                                       driver->vncTLSx509certdir);
+                 }
+             }
++
++            if (driver->vncSASL) {
++                virBufferAddLit(&opt, ",sasl");
++
++                if (driver->vncSASLdir)
++                    ADD_ENV_PAIR("SASL_CONF_DIR", driver->vncSASLdir);
++
++                /* TODO: Support ACLs later */
++            }
+         } else {
+             virBufferVSprintf(&opt, "%d",
+                               vm->def->graphics->data.vnc.port - 5900);
+diff -r 961d4b1ca1d3 src/qemu_conf.h
+--- a/src/qemu_conf.h	Wed Mar 04 13:17:44 2009 +0000
++++ b/src/qemu_conf.h	Thu Mar 05 14:22:50 2009 +0000
+@@ -73,9 +73,11 @@ struct qemud_driver {
+     char *stateDir;
+     unsigned int vncTLS : 1;
+     unsigned int vncTLSx509verify : 1;
++    unsigned int vncSASL : 1;
+     char *vncTLSx509certdir;
+     char *vncListen;
+     char *vncPassword;
++    char *vncSASLdir;
+ 
+     virCapsPtr caps;
+ 
+diff -r 961d4b1ca1d3 src/qemu_driver.c
+--- a/src/qemu_driver.c	Wed Mar 04 13:17:44 2009 +0000
++++ b/src/qemu_driver.c	Thu Mar 05 14:22:50 2009 +0000
+@@ -620,6 +620,7 @@ qemudShutdown(void) {
+     VIR_FREE(qemu_driver->vncTLSx509certdir);
+     VIR_FREE(qemu_driver->vncListen);
+     VIR_FREE(qemu_driver->vncPassword);
++    VIR_FREE(qemu_driver->vncSASLdir);
+ 
+     /* Free domain callback list */
+     virDomainEventCallbackListFree(qemu_driver->domainEventCallbacks);
+diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	Thu Mar 05 14:22:50 2009 +0000
+@@ -0,0 +1,1 @@
++LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,sasl
+diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml	Thu Mar 05 14:22:50 2009 +0000
+@@ -0,0 +1,24 @@
++<domain type='qemu'>
++  <name>QEMUGuest1</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory>219200</memory>
++  <currentMemory>219200</currentMemory>
++  <vcpu>1</vcpu>
++  <os>
++    <type arch='i686' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu</emulator>
++    <disk type='block' device='disk'>
++      <source dev='/dev/HostVG/QEMUGuest1'/>
++      <target dev='hda' bus='ide'/>
++    </disk>
++    <input type='mouse' bus='ps2'/>
++    <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>
++  </devices>
++</domain>
+diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	Thu Mar 05 14:22:50 2009 +0000
+@@ -0,0 +1,1 @@
++LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test SASL_CONF_DIR=/root/.sasl2 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -pidfile /nowhere/QEMUGuest1.pid -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3,tls,x509verify=/etc/pki/tls/qemu,sasl
+diff -r 961d4b1ca1d3 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml	Thu Mar 05 14:22:50 2009 +0000
+@@ -0,0 +1,24 @@
++<domain type='qemu'>
++  <name>QEMUGuest1</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory>219200</memory>
++  <currentMemory>219200</currentMemory>
++  <vcpu>1</vcpu>
++  <os>
++    <type arch='i686' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu</emulator>
++    <disk type='block' device='disk'>
++      <source dev='/dev/HostVG/QEMUGuest1'/>
++      <target dev='hda' bus='ide'/>
++    </disk>
++    <input type='mouse' bus='ps2'/>
++    <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'/>
++  </devices>
++</domain>
+diff -r 961d4b1ca1d3 tests/qemuxml2argvtest.c
+--- a/tests/qemuxml2argvtest.c	Wed Mar 04 13:17:44 2009 +0000
++++ b/tests/qemuxml2argvtest.c	Thu Mar 05 14:22:50 2009 +0000
+@@ -213,6 +213,19 @@ mymain(int argc, char **argv)
+             QEMUD_CMD_FLAG_DRIVE_CACHE_V2);
+     DO_TEST("disk-usb", 0);
+     DO_TEST("graphics-vnc", 0);
++
++    driver.vncSASL = 1;
++    driver.vncSASLdir = strdup("/root/.sasl2");
++    DO_TEST("graphics-vnc-sasl", 0);
++    driver.vncTLS = 1;
++    driver.vncTLSx509verify = 1;
++    driver.vncTLSx509certdir = strdup("/etc/pki/tls/qemu");
++    DO_TEST("graphics-vnc-tls", 0);
++    driver.vncSASL = driver.vncTLSx509verify = driver.vncTLS = 0;
++    free(driver.vncSASLdir);
++    free(driver.vncTLSx509certdir);
++    driver.vncSASLdir = driver.vncTLSx509certdir = NULL;
++
+     DO_TEST("graphics-sdl", 0);
+     DO_TEST("graphics-sdl-fullscreen", 0);
+     DO_TEST("input-usbmouse", 0);

libvirt.spec

@@ -1,125 +1,281 @@
 # -*- rpm-spec -*-
 
-%if "%{fedora}" >= "8"
-%define with_polkit 1
-%define with_proxy no
-%else
-%define with_polkit 0
-%define with_proxy yes
+%define with_xen       0%{!?_without_xen:1}
+%define with_xen_proxy 0%{!?_without_xen_proxy:1}
+%define with_qemu      0%{!?_without_qemu:1}
+%define with_openvz    0%{!?_without_openvz:1}
+%define with_lxc       0%{!?_without_lxc:1}
+%define with_sasl      0%{!?_without_sasl:1}
+%define with_avahi     0%{!?_without_avahi:1}
+%define with_polkit    0%{!?_without_polkit:0}
+%define with_python    0%{!?_without_python:1}
+%define with_libvirtd  0%{!?_without_libvirtd:1}
+%define with_uml       0%{!?_without_uml:1}
+%define with_network   0%{!?_without_network:1}
+
+# Xen is available only on i386 x86_64 ia64
+%ifnarch i386 i586 i686 x86_64 ia64
+%define with_xen 0
 %endif
 
+%if ! %{with_xen}
+%define with_xen_proxy 0
+%endif
+
+%if 0%{?fedora}
+%ifarch ppc64
+%define with_qemu 0
+%endif
+%endif
+
+%if 0%{?fedora} >= 8
+%define with_polkit    0%{!?_without_polkit:1}
+%define with_xen_proxy 0
+%endif
+
+#
+# If building on RHEL switch on the specific support
+# for the specific Xen version
+#
+%if 0%{?fedora}
+%define with_rhel5 0
+%else
+%define with_rhel5 1
+%endif
+
+
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.0
-Release: 4%{?dist}%{?extra_release}
-License: LGPL
+Version: 0.6.1
+Release: 2%{?dist}%{?extra_release}
+License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch1: libvirt-%{version}-auth-null-cb.patch
-Patch2: libvirt-%{version}-conffile-size.patch
-Patch3: libvirt-%{version}-auth-null-cb-2.patch
-Patch4: libvirt-%{version}-remote-ssh.patch
-Patch5: libvirt-%{version}-nodeinfo-compat.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Patch1: libvirt-%{version}-storage-delete-fail.patch
+
+# Not upstream yet - pending QEMU merge
+Patch100: libvirt-%{version}-vnc-sasl-auth.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
-Requires: libxml2
 Requires: readline
 Requires: ncurses
 Requires: dnsmasq
 Requires: bridge-utils
 Requires: iptables
+# needed for device enumeration
+Requires: hal
 # So remote clients can access libvirt over SSH tunnel
 # (client invokes 'nc' against the UNIX socket on the server)
 Requires: nc
+%if %{with_sasl}
 Requires: cyrus-sasl
 # Not technically required, but makes 'out-of-box' config
-# work correctly & doesn't have onerous dependancies
+# work correctly & doesn't have onerous dependencies
 Requires: cyrus-sasl-md5
+%endif
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
-
-%ifarch i386 x86_64 ia64
+# For mount/umount in FS driver
+BuildRequires: util-linux
+# For showmount in FS driver (netfs discovery)
+BuildRequires: nfs-utils
+Requires: nfs-utils
+%if %{with_qemu}
+# From QEMU RPMs
+Requires: /usr/bin/qemu-img
+%else
+%if %{with_xen}
+# From Xen RPMs
+Requires: /usr/sbin/qcow-create
+%endif
+%endif
+# For LVM drivers
+Requires: lvm2
+# For ISCSI driver
+Requires: iscsi-initiator-utils
+# For disk driver
+Requires: parted
+%if %{with_xen}
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
+BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: gnutls-devel
+BuildRequires: hal-devel
+%if %{with_avahi}
 BuildRequires: avahi-devel
+%endif
+BuildRequires: libselinux-devel
 BuildRequires: dnsmasq
 BuildRequires: bridge-utils
+%if %{with_qemu}
+BuildRequires: qemu
+%endif
+%if %{with_sasl}
 BuildRequires: cyrus-sasl-devel
+%endif
 %if %{with_polkit}
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
-Obsoletes: libvir
+# For mount/umount in FS driver
+BuildRequires: util-linux
+%if %{with_qemu}
+# From QEMU RPMs
+BuildRequires: /usr/bin/qemu-img
+%else
+%if %{with_xen}
+# From Xen RPMs
+BuildRequires: /usr/sbin/qcow-create
+%endif
+%endif
+# For LVM drivers
+BuildRequires: lvm2
+# For ISCSI driver
+BuildRequires: iscsi-initiator-utils
+# For disk driver
+BuildRequires: parted-devel
+# For QEMU/LXC numa info
+BuildRequires: numactl-devel
+Obsoletes: libvir <= 0.2
+Provides: libvir = %{version}-%{release}
 
 # Fedora build root suckage
 BuildRequires: gawk
 
 %description
-Libvirt is a C toolkit to interract with the virtualization capabilities
+Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes).
 
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}
+Requires: libvirt = %{version}-%{release}
 Requires: pkgconfig
-%ifarch i386 x86_64 ia64
+%if %{with_xen}
 Requires: xen-devel
 %endif
-Obsoletes: libvir-devel
+Obsoletes: libvir-devel <= 0.2
+Provides: libvir-devel = %{version}-%{release}
 
 %description devel
 Includes and documentations for the C library providing an API to use
 the virtualization capabilities of recent versions of Linux (and other OSes).
 
+%if %{with_python}
 %package python
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}
-Obsoletes: libvir-python
+Requires: libvirt = %{version}-%{release}
+Obsoletes: libvir-python <= 0.2
+Provides: libvir-python = %{version}-%{release}
 
 %description python
 The libvirt-python package contains a module that permits applications
 written in the Python programming language to use the interface
-supplied by the libvirt library to use the the virtualization capabilities 
+supplied by the libvirt library to use the virtualization capabilities
 of recent versions of Linux (and other OSes).
+%endif
 
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+
+%patch100 -p1
+
+mv NEWS NEWS.old
+iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
 
 %build
-# Xen is availble only on i386 x86_64 ia64
-%ifarch i386 i686 x86_64 ia64
-%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-%else
-%configure --without-xen --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+%if ! %{with_xen}
+%define _without_xen --without-xen
 %endif
 
-make
+%if ! %{with_qemu}
+%define _without_qemu --without-qemu
+%endif
+
+%if ! %{with_openvz}
+%define _without_openvz --without-openvz
+%endif
+
+%if ! %{with_lxc}
+%define _without_lxc --without-lxc
+%endif
+
+%if ! %{with_sasl}
+%define _without_sasl --without-sasl
+%endif
+
+%if ! %{with_avahi}
+%define _without_avahi --without-avahi
+%endif
+
+%if ! %{with_polkit}
+%define _without_polkit --without-polkit
+%endif
+
+%if ! %{with_python}
+%define _without_python --without-python
+%endif
+
+%if ! %{with_libvirtd}
+%define _without_libvirtd --without-libvirtd
+%endif
+
+%if ! %{with_uml}
+%define _without_uml --without-uml
+%endif
+
+%if %{with_rhel5}
+%define _with_rhel5_api --with-rhel5-api
+%endif
+
+%if ! %{with_network}
+%define _without_network --without-network
+%endif
+
+%configure %{?_without_xen} \
+           %{?_without_qemu} \
+           %{?_without_openvz} \
+           %{?_without_lxc} \
+           %{?_without_sasl} \
+           %{?_without_avahi} \
+           %{?_without_polkit} \
+           %{?_without_python} \
+           %{?_without_libvirtd} \
+           %{?_without_uml} \
+           %{?_without_network} \
+           %{?_with_rhel5_api} \
+           --with-init-script=redhat \
+           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+make %{?_smp_mflags}
 
 %install
-rm -fr %{buildroot}
+rm -rf %{buildroot}
 
 %makeinstall
 (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
-(cd docs/examples/python ; rm -f Makefile Makefile.in)
+(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in)
+(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
+(cd examples/domain-events/events-c ;  make clean ;rm -rf .deps .libs Makefile Makefile.in)
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
+# Default dir for disk images defined in SELinux policy
+install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/
+# Default dir for kernel+initrd images defnied in SELinux policy
+install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/
 
+%if %{with_qemu}
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
 # because if the admin wants to delete the default network completely, we don't
 # want to end up re-incarnating it on every RPM upgrade.
@@ -130,19 +286,39 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 # Strip auto-generated UUID - we need it generated per-install
 sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
+%else
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
+%endif
 %find_lang %{name}
 
+%if ! %{with_python}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
+%endif
+
+%if ! %{with_qemu}
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
+%endif
+
+%if %{with_libvirtd}
+chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd
+%endif
+
 %clean
 rm -fr %{buildroot}
 
 %post
 /sbin/ldconfig
 
+%if %{with_libvirtd}
+%if %{with_qemu}
 # We want to install the default network for initial RPM installs
 # or on the first upgrade from a non-network aware libvirt only.
 # We check this by looking to see if the daemon is already installed
 /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1
-if [ $? != 0 ]
+if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
 then
     UUID=`/usr/bin/uuidgen`
     sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
@@ -150,17 +326,20 @@ then
          > %{_sysconfdir}/libvirt/qemu/networks/default.xml
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
 fi
+%endif
 
 /sbin/chkconfig --add libvirtd
+%endif
 
 %preun
+%if %{with_libvirtd}
 if [ $1 = 0 ]; then
     /sbin/service libvirtd stop 1>/dev/null 2>&1
     /sbin/chkconfig --del libvirtd
 fi
+%endif
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -170,28 +349,102 @@ fi
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
+
+%if %{with_qemu}
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
+%endif
+
+%if %{with_libvirtd}
 %{_sysconfdir}/rc.d/init.d/libvirtd
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
+%endif
+
+%if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
+%endif
+
+%if %{with_sasl}
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%endif
+
+%if %{with_qemu}
 %dir %{_datadir}/libvirt/
 %dir %{_datadir}/libvirt/networks/
 %{_datadir}/libvirt/networks/default.xml
-%dir %{_localstatedir}/run/libvirt/
-%dir %{_localstatedir}/lib/libvirt/
-%if %{with_polkit}
-%{_datadir}/PolicyKit/policy/libvirtd.policy
 %endif
+
+%dir %{_datadir}/libvirt/
+%dir %{_datadir}/libvirt/schemas/
+
+%{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/network.rng
+%{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagevol.rng
+%{_datadir}/libvirt/schemas/nodedev.rng
+%{_datadir}/libvirt/schemas/capability.rng
+
+%dir %{_localstatedir}/run/libvirt/
+
+%dir %{_localstatedir}/lib/libvirt/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+
+%if %{with_qemu}
+%dir %{_localstatedir}/run/libvirt/qemu/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/qemu/
+%endif
+%if %{with_lxc}
+%dir %{_localstatedir}/run/libvirt/lxc/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/
+%endif
+%if %{with_uml}
+%dir %{_localstatedir}/run/libvirt/uml/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
+%endif
+%if %{with_network}
+%dir %{_localstatedir}/run/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
+%endif
+
+%if %{with_qemu}
+%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
+%endif
+
+%if %{with_libvirtd}
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%endif
+
+%if %{with_polkit}
+%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
+%endif
+
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
+%if %{with_qemu}
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%if %{with_proxy} == "yes"
+%endif
+
+%if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
+
+%if %{with_lxc}
+%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
+%endif
+
+%if %{with_libvirtd}
+%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %attr(0755, root, root) %{_sbindir}/libvirtd
-%doc docs/*.rng
+%endif
+
 %doc docs/*.xml
 
 %files devel
@@ -209,7 +462,9 @@ fi
 %doc docs/*.html docs/html docs/*.gif
 %doc docs/examples
 %doc docs/libvirt-api.xml
+%doc examples
 
+%if %{with_python}
 %files python
 %defattr(-, root, root)
 
@@ -220,8 +475,154 @@ fi
 %doc python/TODO
 %doc python/libvirtclass.txt
 %doc docs/examples/python
+%endif
 
 %changelog
+* Fri Mar  6 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.1-2.fc11
+- Fix crash after storage vol deletion fails
+- Add patch to enable VNC SASL authentication
+
+* Wed Mar  4 2009 Daniel Veillard <veillard@redhat.com> - 0.6.1-1.fc11
+- upstream release 0.6.1
+- support for node device detach reattach and reset
+- sVirt mandatory access control support
+- many bug fixes and small improvements
+
+* Mon Mar  2 2009 Daniel Veillard <veillard@redhat.com> - 0.6.0-6.fc11
+- make sure Xen is handled in i586 new default 32bits x86 packages
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-5.fc11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.0-4.fc11
+- Fix QEMU startup timeout/race (rhbz #484649)
+- Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)
+- Fix timeout when autostarting session daemon
+
+* Wed Feb 11 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.0-3.fc11
+- Multiple fixes to remove rpmlint warnings/errors (rhbz #226055)
+
+* Fri Feb  6 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.0-2.fc11
+- Fix libvirtd --timeout usage
+- Fix RPC call problems and QEMU startup handling (rhbz #484414)
+- Fix unowned directories (rhbz #483442)
+
+* Sat Jan 31 2009 Daniel Veillard <veillard@redhat.com> - 0.6.0-1.fc11
+- upstream release 0.6.0
+- thread safety of API
+- allow QEmu/KVM domains to survive daemon restart
+- extended logging capabilities
+- support copy on write storage volumes for QEmu/KVM
+- support of storage cache control options for QEmu/KVM
+- a lot of bug fixes
+
+* Wed Dec 17 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-2.fc11
+- fix missing read-only access checks, fixes CVE-2008-5086
+
+* Fri Dec  5 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-1.fc11
+- upstream release 0.5.1
+- mostly bugfixes e.g #473071
+- some driver improvments
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.5.0-2
+- Rebuild for Python 2.6
+
+* Wed Nov 26 2008 Daniel Veillard <veillard@redhat.com> - 0.5.0-1.fc11
+- upstream release 0.5.0
+- domain lifecycle event support
+- node device enumeration
+- KVM/QEmu migration support
+- improved LXC support
+- SDL display configuration
+- User Mode Linux driver (Daniel Berrange)
+
+* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-3.fc10
+- apply the python makefile patch for #463733
+
+* Wed Sep 24 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-2.fc10
+- upstream release 0.4.6
+- fixes some problems with 0.4.5
+
+* Tue Sep  9 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-2.fc10
+- fix a crash if a QEmu/KVM domain is defined without an emulator path
+
+* Mon Sep  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-1.fc10
+- upstream release 0.4.5
+- a lot of bug fixes
+- major updates to QEmu/KVM and Linux containers drivers
+- support for OpenVZ if installed
+
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.4.4-3.fc10
+- fix license tag
+
+* Tue Jul  8 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-2.fc10
+- Fix booting of CDROM images with KVM (rhbz #452355)
+
+* Wed Jun 25 2008 Daniel Veillard <veillard@redhat.com> - 0.4.4-1.fc10
+- upstream release 0.4.4
+- fix a few bugs in previous release
+
+* Thu Jun 12 2008 Daniel Veillard <veillard@redhat.com> - 0.4.3-1.fc10
+- upstream release 0.4.3
+- many bug fixes
+- many small improvements
+- serious xenner fixes
+
+* Wed Jun  4 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-6.fc10
+- Disable lokkit support again (#449996, #447633)
+- Ensure %-fedora is evaluated correctly
+
+* Thu May 15 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-5.fc10
+- Rebuild with policy enabled (rhbz #446616)
+
+* Fri May  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-4.fc10
+- Added directory for initrd/kernel images for SELinux policy
+
+* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-3.fc10
+- Simplify the way arch conditionals are handled
+
+* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc10
+- Enable lokkit support (#443796)
+
+* Tue Apr  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.2-1.fc9
+- upstream release 0.4.2
+- many bug fixes
+- localization updates
+
+* Thu Apr  4 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-7.fc9
+- Don't run polkit-auth as root
+- Don't request polkit auth if client is root
+
+* Fri Mar 28 2008 Chris Lalancette <clalance@redhat.com> - 0.4.1-6.fc9
+- When dumping XML for a storage pool, make the <source> directory tag
+  match the <dir> tag used for specifying the pool in the first place
+
+* Thu Mar 27 2008 Chris Lalancette <clalance@redhat.com> - 0.4.1-5.fc9
+- Do iscsiadm sendtarget before trying to do login
+- Do sysfs scanning for iSCSI LUNs instead of trying to parse them from
+  iscsiadm session output
+
+* Thu Mar 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-4.fc9
+- Fix QEMU tap device setup
+- Fix Xen boot device XML processing
+- Fixed QEMU cdrom media change
+
+* Mon Mar 10 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-3.fc9
+- Fixed daemon startup when run with --daemon flag
+
+* Mon Mar  3 2008 Daniel Veillard <veillard@redhat.com> - 0.4.1-2.fc9
+- 2 patches found just after the release
+
+* Mon Mar  3 2008 Daniel Veillard <veillard@redhat.com> - 0.4.1-1.fc9
+- Release of 0.4.1
+- Storage APIs
+- xenner support
+- lots of assorted improvements, bugfixes and cleanups
+- documentation and localization improvements
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.4.0-5
+- Autorebuild for GCC 4.3
+
 * Fri Jan 18 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc9
 - Fix SSH tunnelling (rhbz #428743)
 - Fix back-compat for nodeinfo call changes.
@@ -354,7 +755,7 @@ fi
 - it's pkgconfig not pgkconfig !
 
 * Mon Nov  6 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-2
-- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel
+- fixing spec file, added %-dist, -devel requires pkgconfig and xen-devel
 - Resolves: rhbz#202320
 
 * Mon Oct 16 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-1

sources

@@ -1 +1 @@
-2f6c6adb62145988f0e5021e5cbd71d3  libvirt-0.4.0.tar.gz
+3154ea9d4a0778497dfdf58cb98127c0  libvirt-0.6.1.tar.gz