Fixed auth callback crash and config file reading

- Rebuild for RH #249435

.cvsignore

@@ -17,3 +17,8 @@ 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

Makefile

@@ -3,4 +3,19 @@
 NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))
 
-include ../common/Makefile.common
+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)

branch

@@ -0,0 +1 @@
+F-8

libvirt-0.2.2-disable-xm.patch

@@ -1,15 +0,0 @@
-diff -rup libvirt-0.2.2/src/xen_unified.c libvirt-0.2.2.new/src/xen_unified.c
---- libvirt-0.2.2/src/xen_unified.c	2007-04-17 04:38:52.000000000 -0400
-+++ libvirt-0.2.2.new/src/xen_unified.c	2007-05-01 16:49:54.000000000 -0400
-@@ -112,6 +112,11 @@ xenUnifiedOpen (virConnectPtr conn, cons
-     for (i = 0; i < nb_drivers; ++i) {
-         int failed_to_open = 1;
- 
-+        /* Only use XM driver for Xen <= 3.0.3 (ie xendConfigVersion <= 2) */
-+        if (drivers[i] == &xenXMDriver &&
-+            priv->xendConfigVersion > 2)
-+            continue;
-+
-         /* Ignore proxy for root */
-         if (i == proxy_offset && getuid() == 0)
-             continue;

libvirt-0.2.2-dnsmasq-order.patch

@@ -1,23 +0,0 @@
-diff -rup libvirt-0.2.2/qemud/qemud.c libvirt-0.2.2.new/qemud/qemud.c
---- libvirt-0.2.2/qemud/qemud.c	2007-04-11 10:13:36.000000000 -0400
-+++ libvirt-0.2.2.new/qemud/qemud.c	2007-05-01 16:51:15.000000000 -0400
-@@ -1110,6 +1110,7 @@ qemudBuildDnsmasqArgv(struct qemud_serve
-     len =
-         1 + /* dnsmasq */
-         1 + /* --keep-in-foreground */
-+        1 + /* --strict-order */
-         1 + /* --bind-interfaces */
-         2 + /* --pid-file "" */
-         2 + /* --conf-file "" */
-@@ -1133,6 +1134,11 @@ qemudBuildDnsmasqArgv(struct qemud_serve
-     APPEND_ARG(*argv, i++, "dnsmasq");
- 
-     APPEND_ARG(*argv, i++, "--keep-in-foreground");
-+    /*
-+     * Needed to ensure dnsmasq uses same algorithm for processing
-+     * multiple nameserver entries in /etc/resolv.conf as GLibC.
-+     */
-+    APPEND_ARG(*argv, i++, "--strict-order");
-     APPEND_ARG(*argv, i++, "--bind-interfaces");
- 
-     APPEND_ARG(*argv, i++, "--pid-file");

libvirt-0.2.2-graphics-hvm.patch

@@ -1,70 +0,0 @@
-diff -rup libvirt-0.2.2.new/src/xend_internal.c libvirt-0.2.2/src/xend_internal.c
---- libvirt-0.2.2.new/src/xend_internal.c	2007-04-15 16:09:10.000000000 -0400
-+++ libvirt-0.2.2/src/xend_internal.c	2007-05-03 14:52:42.000000000 -0400
-@@ -1676,35 +1676,38 @@ xend_parse_sexp_desc(virConnectPtr conn,
-         }
-     }
- 
--    /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.4) vnc config */
--    tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
--    if (tmp != NULL) {
--        if (tmp[0] == '1') {
--            int port = xenStoreDomainGetVNCPort(conn, domid);
--            const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
--            const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
--            /* For Xen >= 3.0.3, don't generate a fixed port mapping
--             * because it will almost certainly be wrong ! Just leave
--             * it as -1 which lets caller see that the VNC server isn't
--             * present yet. Subsquent dumps of the XML will eventually
--             * find the port in XenStore once VNC server has started
--             */
--            if (port == -1 && xendConfigVersion < 2)
--                port = 5900 + domid;
--            virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
--            if (listenAddr)
--                virBufferVSprintf(&buf, " listen='%s'", listenAddr);
--            if (keymap)
--                virBufferVSprintf(&buf, " keymap='%s'", keymap);
--            virBufferAdd(&buf, "/>\n", 3);
-+    /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */
-+    if ((hvm && xendConfigVersion < 4) ||
-+        (!hvm && xendConfigVersion < 3)) {
-+        tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
-+        if (tmp != NULL) {
-+            if (tmp[0] == '1') {
-+                int port = xenStoreDomainGetVNCPort(conn, domid);
-+                const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
-+                const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
-+                /* For Xen >= 3.0.3, don't generate a fixed port mapping
-+                 * because it will almost certainly be wrong ! Just leave
-+                 * it as -1 which lets caller see that the VNC server isn't
-+                 * present yet. Subsquent dumps of the XML will eventually
-+                 * find the port in XenStore once VNC server has started
-+                 */
-+                if (port == -1 && xendConfigVersion < 2)
-+                    port = 5900 + domid;
-+                virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
-+                if (listenAddr)
-+                    virBufferVSprintf(&buf, " listen='%s'", listenAddr);
-+                if (keymap)
-+                    virBufferVSprintf(&buf, " keymap='%s'", keymap);
-+                virBufferAdd(&buf, "/>\n", 3);
-+            }
-         }
--    }
- 
--    /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
--    tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
--    if (tmp != NULL) {
--        if (tmp[0] == '1')
--            virBufferAdd(&buf, "    <graphics type='sdl'/>\n", 27 );
-+        /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
-+        tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
-+        if (tmp != NULL) {
-+            if (tmp[0] == '1')
-+                virBufferAdd(&buf, "    <graphics type='sdl'/>\n", 27 );
-+        }
-     }
- 
-     tty = xenStoreDomainGetConsolePath(conn, domid);
-Only in libvirt-0.2.2/src: xend_internal.c.orig

libvirt-0.2.2-qemu-noreboot.patch

@@ -1,128 +0,0 @@
-diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
---- libvirt-0.2.2/qemud/conf.c	2007-04-17 04:34:42.000000000 -0400
-+++ libvirt-0.2.2.new/qemud/conf.c	2007-05-01 18:16:46.000000000 -0400
-@@ -245,21 +245,25 @@ static int qemudExtractVersionInfo(const
-     cleanup1:
-         _exit(-1); /* Just in case */
-     } else { /* Parent */
--        char help[4096]; /* Ought to be enough to hold QEMU help screen */
-+        char help[8192]; /* Ought to be enough to hold QEMU help screen */
-         int got, ret = -1;
-         int major, minor, micro;
- 
-         if (close(newstdout[1]) < 0)
-             goto cleanup2;
- 
--    reread:
--        if ((got = read(newstdout[0], help, sizeof(help)-1)) < 0) {
--            if (errno == EINTR)
--                goto reread;
--            goto cleanup2;
-+        while (got < (sizeof(help)-1)) {
-+            int len;
-+            if ((len = read(newstdout[0], help+got, sizeof(help)-got-1)) <= 0) {
-+                if (!len)
-+                    break;
-+                if (errno == EINTR)
-+                    continue;
-+                goto cleanup2;
-+            }
-+            got += len;
-         }
-         help[got] = '\0';
--
-         if (sscanf(help, "QEMU PC emulator version %d.%d.%d", &major,&minor, &micro) != 3) {
-             goto cleanup2;
-         }
-@@ -267,6 +271,8 @@ static int qemudExtractVersionInfo(const
-         *version = (major * 1000 * 1000) + (minor * 1000) + micro;
-         if (strstr(help, "-no-kqemu"))
-             *flags |= QEMUD_CMD_FLAG_KQEMU;
-+        if (strstr(help, "-no-reboot"))
-+            *flags |= QEMUD_CMD_FLAG_NO_REBOOT;
-         if (*version >= 9000)
-             *flags |= QEMUD_CMD_FLAG_VNC_COLON;
-         ret = 0;
-@@ -858,6 +864,22 @@ static struct qemud_vm_def *qemudParseXM
-     }
-     xmlXPathFreeObject(obj);
- 
-+
-+    /* See if we disable reboots */
-+    obj = xmlXPathEval(BAD_CAST "string(/domain/on_reboot)", ctxt);
-+    if ((obj == NULL) || (obj->type != XPATH_STRING) ||
-+        (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
-+        def->noReboot = 0;
-+    } else {
-+        if (!strcmp((char*)obj->stringval, "destroy"))
-+            def->noReboot = 1;
-+        else
-+            def->noReboot = 0;
-+    }
-+    if (obj)
-+        xmlXPathFreeObject(obj);
-+
-+
-     /* Extract OS type info */
-     obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1])", ctxt);
-     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
-@@ -1220,6 +1242,8 @@ int qemudBuildCommandLine(struct qemud_s
-         2 + /* cpus */
-         2 + /* boot device */
-         2 + /* monitor */
-+        (server->qemuCmdFlags & QEMUD_CMD_FLAG_NO_REBOOT &&
-+         vm->def->noReboot ? 1 : 0) + /* no-reboot */
-         (vm->def->features & QEMUD_FEATURE_ACPI ? 0 : 1) + /* acpi */
-         (vm->def->os.kernel[0] ? 2 : 0) + /* kernel */
-         (vm->def->os.initrd[0] ? 2 : 0) + /* initrd */
-@@ -1255,6 +1279,11 @@ int qemudBuildCommandLine(struct qemud_s
-         goto no_memory;
-     if (!((*argv)[++n] = strdup("pty")))
-         goto no_memory;
-+    if (server->qemuCmdFlags & QEMUD_CMD_FLAG_NO_REBOOT &&
-+        vm->def->noReboot) {
-+        if (!((*argv)[++n] = strdup("-no-reboot")))
-+            goto no_memory;
-+    }
- 
-     if (!(vm->def->features & QEMUD_FEATURE_ACPI)) {
-         if (!((*argv)[++n] = strdup("-no-acpi")))
-@@ -2517,6 +2546,17 @@ char *qemudGenerateXML(struct qemud_serv
-             goto no_memory;
-     }
- 
-+    if (bufferAdd(buf, "  <on_poweroff>destroy</on_poweroff>\n", -1) < 0)
-+        goto no_memory;
-+    if (def->noReboot) {
-+        if (bufferAdd(buf, "  <on_reboot>destroy</on_reboot>\n", -1) < 0)
-+            goto no_memory;
-+    } else {
-+        if (bufferAdd(buf, "  <on_reboot>restart</on_reboot>\n", -1) < 0)
-+            goto no_memory;
-+    }
-+    if (bufferAdd(buf, "  <on_crash>destroy</on_crash>\n", -1) < 0)
-+        goto no_memory;
- 
-     if (bufferAdd(buf, "  <devices>\n", -1) < 0)
-         goto no_memory;
-diff -rup libvirt-0.2.2/qemud/internal.h libvirt-0.2.2.new/qemud/internal.h
---- libvirt-0.2.2/qemud/internal.h	2007-04-11 10:13:36.000000000 -0400
-+++ libvirt-0.2.2.new/qemud/internal.h	2007-05-01 17:53:42.000000000 -0400
-@@ -161,6 +161,7 @@ enum qemud_vm_grapics_type {
- enum qemud_cmd_flags {
-     QEMUD_CMD_FLAG_KQEMU = 1,
-     QEMUD_CMD_FLAG_VNC_COLON = 2,
-+    QEMUD_CMD_FLAG_NO_REBOOT = 4,
- };
- 
- 
-@@ -191,6 +192,8 @@ struct qemud_vm_def {
-     int maxmem;
-     int vcpus;
- 
-+    int noReboot;
-+
-     struct qemud_vm_os_def os;
- 
-     int features;
-Only in libvirt-0.2.2.new/qemud: libvirt-0.2.2-qemu-noreboot.patch

libvirt-0.2.2-sync-daemon-restart.patch

@@ -1,19 +0,0 @@
---- libvirt-0.2.2/ChangeLog.sync-restart	2007-05-02 13:07:21.719425000 -0400
-+++ libvirt-0.2.2/ChangeLog	2007-05-02 13:08:23.204879000 -0400
-@@ -0,0 +1,5 @@
-+Wed May  2 17:55:12 IST 2007 Mark McLoughlin <markmc@redhat.com>
-+
-+	* qemud/libvirtd.in: synchronously restart the daemon in
-+	order to avoid https://bugzilla.redhat.com/238492
-+	
---- libvirt-0.2.2/qemud/libvirtd.in.sync-restart	2007-02-23 07:50:58.000000000 -0500
-+++ libvirt-0.2.2/qemud/libvirtd.in	2007-05-02 13:08:23.209868000 -0400
-@@ -34,7 +34,7 @@
- stop() {
-     echo -n $"Stopping $SERVICE daemon: "
- 
--    killproc $PROCESS -TERM
-+    killproc $PROCESS
-     RETVAL=$?
-     echo
-     if [ $RETVAL -eq 0 ]; then

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.spec

@@ -1,23 +1,22 @@
 # -*- rpm-spec -*-
 
-# This macro is used for the continuous automated builds. It just
-# allows an extra fragment based on the timestamp to be appended
-# to the release. This distinguishes automated builds, from formal
-# Fedora RPM builds
-%define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
+%if "%{fedora}" >= "8"
+%define with_polkit 1
+%define with_proxy no
+%else
+%define with_polkit 0
+%define with_proxy yes
+%endif
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.2.2
-Release: 3%{?_extra_release}
+Version: 0.4.0
+Release: 2%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-Patch1: libvirt-0.2.2-disable-xm.patch
-Patch2: libvirt-0.2.2-dnsmasq-order.patch
-Patch3: libvirt-0.2.2-qemu-noreboot.patch
-Patch4: libvirt-0.2.2-sync-daemon-restart.patch
-Patch5: libvirt-0.2.2-graphics-hvm.patch
+Patch1: libvirt-%{version}-auth-null-cb.patch
+Patch2: libvirt-%{version}-conffile-size.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -25,15 +24,38 @@ Requires: libxml2
 Requires: readline
 Requires: ncurses
 Requires: dnsmasq
+Requires: bridge-utils
+Requires: iptables
+# So remote clients can access libvirt over SSH tunnel
+# (client invokes 'nc' against the UNIX socket on the server)
+Requires: nc
+Requires: cyrus-sasl
+# Not technically required, but makes 'out-of-box' config
+# work correctly & doesn't have onerous dependancies
+Requires: cyrus-sasl-md5
+%if %{with_polkit}
+Requires: PolicyKit >= 0.6
+%endif
+
+%ifarch i386 x86_64 ia64
 BuildRequires: xen-devel
+%endif
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
-BuildRequires: libsysfs-devel
-BuildRequires: /sbin/iptables
+BuildRequires: gnutls-devel
+BuildRequires: avahi-devel
+BuildRequires: dnsmasq
+BuildRequires: bridge-utils
+BuildRequires: cyrus-sasl-devel
+%if %{with_polkit}
+BuildRequires: PolicyKit-devel >= 0.6
+%endif
 Obsoletes: libvir
-ExclusiveArch: i386 x86_64 ia64
+
+# Fedora build root suckage
+BuildRequires: gawk
 
 %description
 Libvirt is a C toolkit to interract with the virtualization capabilities
@@ -44,6 +66,9 @@ Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Requires: pkgconfig
+%ifarch i386 x86_64 ia64
+Requires: xen-devel
+%endif
 Obsoletes: libvir-devel
 
 %description devel
@@ -59,26 +84,30 @@ Obsoletes: libvir-python
 %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 the virtualization capabilities 
 of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
-%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid
+# 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
+%endif
+
 make
 
 %install
 rm -fr %{buildroot}
 
 %makeinstall
-(cd docs/examples ; make clean ; rm -rf .deps)
+(cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
+(cd docs/examples/python ; rm -f 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
@@ -139,18 +168,25 @@ fi
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
 %{_sysconfdir}/rc.d/init.d/libvirtd
-%dir %{_sysconfdir}/libvirt
-%dir %{_sysconfdir}/libvirt/qemu
-%dir %{_sysconfdir}/libvirt/qemu/networks
-%dir %{_sysconfdir}/libvirt/qemu/networks/autostart
+%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
+%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
+%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 %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 %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
+%if %{with_proxy} == "yes"
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
-%attr(0755, root, root) %{_sbindir}/libvirt_qemud
-%doc docs/libvirt.rng
+%endif
+%attr(0755, root, root) %{_sbindir}/libvirtd
+%doc docs/*.rng
+%doc docs/*.xml
 
 %files devel
 %defattr(-, root, root)
@@ -180,17 +216,69 @@ fi
 %doc docs/examples/python
 
 %changelog
-* Thu May  3 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.2-3.fc7
-- Fixed init script restart race
-- Remove duplicate <graphics> tag for HVM
-- Support -no-reboot in qemu for installs
-- Disable xm config file driver for 3.0.5
-- Force dnsmasq ordering for resolv.conf
+* Wed Jan  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2.fc8
+- Fix reading large config files (rhbz #426425)
+- Fix crash when connecting to a PolicyKit enabled server with not auth callback (rhbz #427107)
 
-* Fri Apr 21 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.2-2.fc7
-- Added Requires on dnsmasq for virtual networking
+* Tue Dec 18 2007 Daniel Veillard <veillard@redhat.com> - 0.4.0-1.fc8
+- Release of 0.4.0
+- SASL based authentication
+- PolicyKit authentication
+- improved NUMA and statistics support
+- lots of assorted improvements, bugfixes and cleanups
+- documentation and localization improvements
 
-* Tue Apr 17 2007 Daniel Veillard <veillard@redhat.com> - 0.2.2-1.fc7
+* Mon Oct 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.3.3-2.fc8
+- Added QEMU driver config file support
+- Added example config files
+
+* Sun Sep 30 2007 Daniel Veillard <veillard@redhat.com> - 0.3.3-1
+- Release of 0.3.3
+- Avahi support
+- NUMA support
+- lots of assorted improvements, bugfixes and cleanups
+- documentation and localization improvements
+
+* Fri Aug 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-2.fc8
+- also build on arches where Xen is not available
+
+* Tue Aug 21 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-1.fc8
+- Release of 0.3.2
+- API for domains migration
+- APIs for collecting statistics on disks and interfaces
+- lots of assorted bugfixes and cleanups
+- documentation and localization improvements
+
+* Thu Aug 16 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-4.fc8
+- Fixes missing Requires for libvirt-devel
+
+* Thu Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-3.fc8
+- adds fix for bug #249594
+
+* Wed Jul 25 2007 Jesse Keating <jkeating@redhat.com> - 0.3.1-2
+- Rebuild for RH #249435
+
+* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1.fc8
+- Release of 0.3.1
+- localtime clock support
+- PS/2 and USB input devices
+- lots of assorted bugfixes and cleanups
+- documentation and localization improvements
+
+* Mon Jul  9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.0-1.fc8
+- Release of 0.3.0
+- Secure remote access support
+- unification of daemons
+- lots of assorted bugfixes and cleanups
+- documentation and localization improvements
+
+* Fri Jun  8 2007 Daniel Veillard <veillard@redhat.com> - 0.2.3-1.fc8
+- Release of 0.2.3
+- lot of assorted bugfixes and cleanups
+- support for Xen-3.1
+- new scheduler API
+
+* Tue Apr 17 2007 Daniel Veillard <veillard@redhat.com> - 0.2.2-1
 - Release of 0.2.2
 - lot of assorted bugfixes and cleanups
 - preparing for Xen-3.0.5
@@ -200,7 +288,7 @@ fi
 - fix scriptlet error (need to own more directories)
 - update description text
 
-* Fri Mar 16 2007 Daniel Veillard <veillard@redhat.com> - 0.2.1-1.fc7
+* Fri Mar 16 2007 Daniel Veillard <veillard@redhat.com> - 0.2.1-1
 - Release of 0.2.1
 - lot of bug and portability fixes
 - Add support for network autostart and init scripts

sources

@@ -1 +1 @@
-5abe4b1fd6b57948ce259036afdc9194  libvirt-0.2.2.tar.gz
+2f6c6adb62145988f0e5021e5cbd71d3  libvirt-0.4.0.tar.gz