forgot patch ... Daniel

Daniel

.cvsignore

@@ -3,12 +3,4 @@
 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-0.1.gitf055724.tar.gz
-libvirt-0.7.0-0.6.gite195b43.tar.gz
-libvirt-0.7.0.tar.gz
+libvirt-0.4.6.tar.gz

branch

@@ -0,0 +1 @@
+F-10

libvirt-0.5.1-read-only-checks.patch

@@ -0,0 +1,152 @@
+diff --git a/src/libvirt.c b/src/libvirt.c
+--- a/src/libvirt.c
++++ b/src/libvirt.c
+@@ -2296,6 +2296,16 @@ virDomainMigrate (virDomainPtr domain,
+     conn = domain->conn;        /* Source connection. */
+     if (!VIR_IS_CONNECT (dconn)) {
+         virLibConnError (conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
++        return NULL;
++    }
++
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++    if (dconn->flags & VIR_CONNECT_RO) {
++        /* NB, delibrately report error against source object, not dest here */
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+         return NULL;
+     }
+ 
+@@ -2426,6 +2436,11 @@ virDomainMigratePrepare (virConnectPtr d
+         return -1;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (dconn->driver->domainMigratePrepare)
+         return dconn->driver->domainMigratePrepare (dconn, cookie, cookielen,
+                                                     uri_in, uri_out,
+@@ -2457,6 +2472,11 @@ virDomainMigratePerform (virDomainPtr do
+     }
+     conn = domain->conn;
+ 
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (conn->driver->domainMigratePerform)
+         return conn->driver->domainMigratePerform (domain, cookie, cookielen,
+                                                    uri,
+@@ -2482,6 +2502,11 @@ virDomainMigrateFinish (virConnectPtr dc
+ 
+     if (!VIR_IS_CONNECT (dconn)) {
+         virLibConnError (NULL, VIR_ERR_INVALID_CONN, __FUNCTION__);
++        return NULL;
++    }
++
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+         return NULL;
+     }
+ 
+@@ -2517,6 +2542,11 @@ virDomainMigratePrepare2 (virConnectPtr 
+         return -1;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return -1;
++    }
++
+     if (dconn->driver->domainMigratePrepare2)
+         return dconn->driver->domainMigratePrepare2 (dconn, cookie, cookielen,
+                                                      uri_in, uri_out,
+@@ -2547,6 +2577,11 @@ virDomainMigrateFinish2 (virConnectPtr d
+         return NULL;
+     }
+ 
++    if (dconn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dconn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++
+     if (dconn->driver->domainMigrateFinish2)
+         return dconn->driver->domainMigrateFinish2 (dconn, dname,
+                                                     cookie, cookielen,
+@@ -2905,6 +2940,11 @@ virDomainBlockPeek (virDomainPtr dom,
+     }
+     conn = dom->conn;
+ 
++    if (dom->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     if (!path) {
+         virLibDomainError (dom, VIR_ERR_INVALID_ARG,
+                            _("path is NULL"));
+@@ -2980,6 +3020,11 @@ virDomainMemoryPeek (virDomainPtr dom,
+     }
+     conn = dom->conn;
+ 
++    if (dom->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(dom, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     /* Flags must be VIR_MEMORY_VIRTUAL at the moment.
+      *
+      * Note on access to physical memory: A VIR_MEMORY_PHYSICAL flag is
+@@ -3246,6 +3291,11 @@ virDomainSetAutostart(virDomainPtr domai
+     }
+ 
+     conn = domain->conn;
++
++    if (domain->conn->flags & VIR_CONNECT_RO) {
++        virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
+ 
+     if (conn->driver->domainSetAutostart)
+         return conn->driver->domainSetAutostart (domain, autostart);
+@@ -4197,6 +4247,11 @@ virNetworkSetAutostart(virNetworkPtr net
+         return (-1);
+     }
+ 
++    if (network->conn->flags & VIR_CONNECT_RO) {
++        virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     conn = network->conn;
+ 
+     if (conn->networkDriver && conn->networkDriver->networkSetAutostart)
+@@ -4395,6 +4450,11 @@ virConnectFindStoragePoolSources(virConn
+         return NULL;
+     }
+ 
++    if (conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return NULL;
++    }
++
+     if (conn->storageDriver && conn->storageDriver->findPoolSources)
+         return conn->storageDriver->findPoolSources(conn, type, srcSpec, flags);
+ 
+@@ -5068,6 +5128,11 @@ virStoragePoolSetAutostart(virStoragePoo
+         return (-1);
+     }
+ 
++    if (pool->conn->flags & VIR_CONNECT_RO) {
++        virLibStoragePoolError(pool, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        return (-1);
++    }
++
+     conn = pool->conn;
+ 
+     if (conn->storageDriver && conn->storageDriver->poolSetAutostart)

libvirt-0.6.4-svirt-sound.patch

@@ -1,33 +0,0 @@
---- src/qemu_conf.c.orig	2009-05-29 19:24:59.000000000 +0200
-+++ src/qemu_conf.c	2009-05-29 19:19:39.000000000 +0200
-@@ -792,6 +792,20 @@ int qemudBuildCommandLine(virConnectPtr 
-     char uuid[VIR_UUID_STRING_BUFLEN];
-     char domid[50];
-     const char *cpu = NULL;
-+    int skipSound = 0;
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->name &&
-+        STREQ(driver->securityDriver->name, "selinux") &&
-+        getuid() == 0) {
-+        static int soundWarned = 0; 
-+        skipSound = 1;
-+        if (def->nsounds &&
-+            !soundWarned) {
-+            soundWarned = 1;
-+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
-+        }
-+    }
- 
-     uname_normalize(&ut);
- 
-@@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr 
-     }
- 
-     /* Add sound hardware */
--    if (def->nsounds) {
-+    if (def->nsounds &&
-+        !skipSound) {
-         int size = 100;
-         char *modstr;
-         if (VIR_ALLOC_N(modstr, size+1) < 0)

libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch

@@ -1,73 +0,0 @@
-From: Mark McLoughlin <markmc@redhat.com>
-Subject: [PATCH] chown kernel/initrd before spawning qemu
-
-If we're running qemu unprivileged, we need to chown any supplied kernel
-or initrd before spawning it.
-
-* src/qemu_driver.c: rename qemuDomainSetDiskOwnership() to
-  qemuDomainSetFileOwnership(), pass it a path string instead of a disk
-  definition and use it for chowning the kernel/initrd in
-  qemuDomainSetAllDeviceOwnership()
----
- src/qemu_driver.c |   20 ++++++++++++--------
- 1 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 412b68d..bd58435 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1684,18 +1684,18 @@ static int qemuDomainSetHostdevOwnership(virConnectPtr conn,
- 
- }
- 
--static int qemuDomainSetDiskOwnership(virConnectPtr conn,
--                                      virDomainDiskDefPtr def,
-+static int qemuDomainSetFileOwnership(virConnectPtr conn,
-+                                      const char *path,
-                                       uid_t uid, gid_t gid)
- {
- 
--    if (!def->src)
-+    if (!path)
-         return 0;
- 
--    VIR_DEBUG("Setting ownership on %s to %d:%d", def->src, uid, gid);
--    if (chown(def->src, uid, gid) < 0) {
-+    VIR_DEBUG("Setting ownership on %s to %d:%d", path, uid, gid);
-+    if (chown(path, uid, gid) < 0) {
-         virReportSystemError(conn, errno, _("cannot set ownership on %s"),
--                             def->src);
-+                             path);
-         return -1;
-     }
-     return 0;
-@@ -1725,7 +1725,7 @@ static int qemuDomainSetDeviceOwnership(virConnectPtr conn,
-             (def->data.disk->readonly || def->data.disk->shared))
-             return 0;
- 
--        return qemuDomainSetDiskOwnership(conn, def->data.disk, uid, gid);
-+        return qemuDomainSetFileOwnership(conn, def->data.disk->src, uid, gid);
- 
-     case VIR_DOMAIN_DEVICE_HOSTDEV:
-         return qemuDomainSetHostdevOwnership(conn, def->data.hostdev, uid, gid);
-@@ -1753,12 +1753,16 @@ static int qemuDomainSetAllDeviceOwnership(virConnectPtr conn,
-     uid = restore ? 0 : driver->user;
-     gid = restore ? 0 : driver->group;
- 
-+    if (qemuDomainSetFileOwnership(conn, def->os.kernel, uid, gid) < 0 ||
-+        qemuDomainSetFileOwnership(conn, def->os.initrd, uid, gid) < 0)
-+        return -1;
-+
-     for (i = 0 ; i < def->ndisks ; i++) {
-         if (restore &&
-             (def->disks[i]->readonly || def->disks[i]->shared))
-             continue;
- 
--        if (qemuDomainSetDiskOwnership(conn, def->disks[i], uid, gid) < 0)
-+        if (qemuDomainSetFileOwnership(conn, def->disks[i]->src, uid, gid) < 0)
-             return -1;
-     }
- 
--- 
-1.6.2.5
-

libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch

@@ -1,39 +0,0 @@
-From: Mark McLoughlin <markmc@redhat.com>
-Subject: [PATCH] Handle kernels with no ipv6 support
-
-If the ipv6 kernel module is not loaded, then we get this when starting
-a virtual network:
-
-  libvir: Network Config error :
-  cannot enable /proc/sys/net/ipv6/conf/virbr0/disable_ipv6:
-  No such file or directory
-
-If disable_ipv6 is not present, we should just merrily continue on our
-way.
-
-* src/network_driver.c: make networkDisableIPV6() not fail if the kernel
-  has no ipv6 support
----
- src/network_driver.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/network_driver.c b/src/network_driver.c
-index eaea454..84910ab 100644
---- a/src/network_driver.c
-+++ b/src/network_driver.c
-@@ -801,6 +801,12 @@ static int networkDisableIPV6(virConnectPtr conn,
-         goto cleanup;
-     }
- 
-+    if (access(field, W_OK) < 0 && errno == ENOENT) {
-+        VIR_DEBUG("ipv6 appears to already be disabled on %s", network->def->bridge);
-+        ret = 0;
-+        goto cleanup;
-+    }
-+
-     if (virFileWriteStr(field, "1") < 0) {
-         virReportSystemError(conn, errno,
-                              _("cannot enable %s"), field);
--- 
-1.6.2.5
-

libvirt.spec

@@ -1,34 +1,19 @@
 # -*- rpm-spec -*-
 
-%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_vbox          0%{!?_without_vbox:1}
-%define with_sasl          0%{!?_without_sasl:1}
-%define with_avahi         0%{!?_without_avahi:1}
-%define with_python        0%{!?_without_python:1}
-%define with_libvirtd      0%{!?_without_libvirtd:1}
-%define with_uml           0%{!?_without_uml:1}
-%define with_one           0%{!?_without_one:1}
-%define with_network       0%{!?_without_network:1}
-%define with_storage_fs    0%{!?_without_storage_fs:1}
-%define with_storage_lvm   0%{!?_without_storage_lvm:1}
-%define with_storage_iscsi 0%{!?_without_storage_iscsi:1}
-%define with_storage_disk  0%{!?_without_storage_disk:1}
-%define with_numactl       0%{!?_without_numactl:1}
-
-# default to off - selectively enabled below
-%define with_polkit        0%{!?_without_polkit:0}
-%define with_capng         0%{!?_without_capng:0}
-%define with_netcf         0%{!?_without_netcf:0}
-
-# default to off
-%define with_phyp          0%{!?_without_phyp:0}
+%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}
 
 # Xen is available only on i386 x86_64 ia64
-%ifnarch i386 i586 i686 x86_64 ia64
+%ifnarch i386 i686 x86_64 ia64
 %define with_xen 0
 %endif
 
@@ -47,76 +32,42 @@
 %define with_xen_proxy 0
 %endif
 
-%if 0%{?fedora} >= 12
-%define with_capng     0%{!?_without_capng:1}
-%endif
-
-%if 0%{?fedora} >= 12
-%define with_netcf     0%{!?_without_netcf:1}
-%endif
-
-%if 0%{?fedora} >= 12
-%define qemu_user  qemu
-%define qemu_group  qemu
-%else
-%define qemu_user  root
-%define qemu_group  root
-%endif
-
-#
-# If building on RHEL switch on the specific support
-#
-%if 0%{?fedora}
-%define with_rhel5  0
-%else
-%define with_rhel5  1
-%define with_polkit 0
-%define with_one    0
-%endif
-
-
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.7.0
-Release: 3%{?dist}%{?extra_release}
+Version: 0.5.1
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-
-# Make sure qemu can access kernel/initrd (bug #516034)
-Patch01: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
-
-# Don't fail to start network if ipv6 modules is not loaded
-Patch02: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
-
-# Temporary hack till PulseAudio autostart problems are sorted
-# out when SELinux enforcing (bz 486112)
-Patch200: libvirt-0.6.4-svirt-sound.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch0: libvirt-0.5.1-read-only-checks.patch
 URL: http://libvirt.org/
-BuildRequires: python-devel
-
-# The client side, i.e. shared libs and virsh are in a subpackage
-Requires: libvirt-client = %{version}-%{release}
-
+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 dependencies
+Requires: cyrus-sasl-md5
+%endif
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
-%if %{with_storage_fs}
 # For mount/umount in FS driver
 BuildRequires: util-linux
 # For showmount in FS driver (netfs discovery)
 BuildRequires: nfs-utils
 Requires: nfs-utils
-# For glusterfs
-Requires: glusterfs-client >= 2.0.1
-%endif
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
@@ -126,24 +77,15 @@ Requires: /usr/bin/qemu-img
 Requires: /usr/sbin/qcow-create
 %endif
 %endif
-%if %{with_storage_lvm}
 # For LVM drivers
 Requires: lvm2
-%endif
-%if %{with_storage_iscsi}
 # For ISCSI driver
 Requires: iscsi-initiator-utils
-%endif
-%if %{with_storage_disk}
 # For disk driver
 Requires: parted
-%endif
 %if %{with_xen}
 BuildRequires: xen-devel
 %endif
-%if %{with_one}
-BuildRequires: xmlrpc-c-devel >= 1.14.0
-%endif
 BuildRequires: libxml2-devel
 BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
@@ -157,16 +99,17 @@ BuildRequires: avahi-devel
 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
-%if %{with_storage_fs}
 # For mount/umount in FS driver
 BuildRequires: util-linux
-%endif
 %if %{with_qemu}
 # From QEMU RPMs
 BuildRequires: /usr/bin/qemu-img
@@ -176,67 +119,30 @@ BuildRequires: /usr/bin/qemu-img
 BuildRequires: /usr/sbin/qcow-create
 %endif
 %endif
-%if %{with_storage_lvm}
 # For LVM drivers
 BuildRequires: lvm2
-%endif
-%if %{with_storage_iscsi}
 # For ISCSI driver
 BuildRequires: iscsi-initiator-utils
-%endif
-%if %{with_storage_disk}
 # For disk driver
 BuildRequires: parted-devel
-%endif
-%if %{with_numactl}
-# For QEMU/LXC numa info
-BuildRequires: numactl-devel
-%endif
-%if %{with_capng}
-BuildRequires: libcap-ng-devel >= 0.5.0
-%endif
-%if %{with_phyp}
-BuildRequires: libssh-devel >= 0.3.1
-%endif
-%if %{with_netcf}
-BuildRequires: netcf-devel
-%endif
+Obsoletes: libvir
 
 # Fedora build root suckage
 BuildRequires: gawk
 
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
-of recent versions of Linux (and other OSes). The main package includes
-the libvirtd server exporting the virtualization support.
-
-%package client
-Summary: Client side library and utilities of the libvirt library
-Group: Development/Libraries
-Requires: readline
-Requires: ncurses
-# 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 dependencies
-Requires: cyrus-sasl-md5
-%endif
-
-%description client
-Shared libraries and client binaries needed to access to the
-virtualization capabilities of recent versions of Linux (and other OSes).
+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}-%{release}
+Requires: libvirt = %{version}
 Requires: pkgconfig
 %if %{with_xen}
 Requires: xen-devel
 %endif
+Obsoletes: libvir-devel
 
 %description devel
 Includes and documentations for the C library providing an API to use
@@ -246,7 +152,8 @@ the virtualization capabilities of recent versions of Linux (and other OSes).
 %package python
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}-%{release}
+Requires: libvirt = %{version}
+Obsoletes: libvir-python
 
 %description python
 The libvirt-python package contains a module that permits applications
@@ -257,11 +164,7 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
-
-%patch01 -p1
-%patch02 -p1
-
-%patch200 -p0
+%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -280,10 +183,6 @@ of recent versions of Linux (and other OSes).
 %define _without_lxc --without-lxc
 %endif
 
-%if ! %{with_vbox}
-%define _without_vbox --without-vbox
-%endif
-
 %if ! %{with_sasl}
 %define _without_sasl --without-sasl
 %endif
@@ -292,10 +191,6 @@ of recent versions of Linux (and other OSes).
 %define _without_avahi --without-avahi
 %endif
 
-%if ! %{with_phyp}
-%define _without_phyp --without-phyp
-%endif
-
 %if ! %{with_polkit}
 %define _without_polkit --without-polkit
 %endif
@@ -312,87 +207,36 @@ of recent versions of Linux (and other OSes).
 %define _without_uml --without-uml
 %endif
 
-%if ! %{with_one}
-%define _without_one --without-one
-%endif
-
-%if %{with_rhel5}
-%define _with_rhel5_api --with-rhel5-api
-%endif
-
-%if ! %{with_network}
-%define _without_network --without-network
-%endif
-
-%if ! %{with_storage_fs}
-%define _without_storage_fs --without-storage-fs
-%endif
-
-%if ! %{with_storage_lvm}
-%define _without_storage_lvm --without-storage-lvm
-%endif
-
-%if ! %{with_storage_iscsi}
-%define _without_storage_iscsi --without-storage-iscsi
-%endif
-
-%if ! %{with_storage_disk}
-%define _without_storage_disk --without-storage-disk
-%endif
-
-%if ! %{with_numactl}
-%define _without_numactl --without-numactl
-%endif
-
-%if ! %{with_capng}
-%define _without_capng --without-capng
-%endif
-
-%if ! %{with_netcf}
-%define _without_netcf --without-netcf
-%endif
-
 %configure %{?_without_xen} \
            %{?_without_qemu} \
            %{?_without_openvz} \
            %{?_without_lxc} \
-           %{?_without_vbox} \
            %{?_without_sasl} \
            %{?_without_avahi} \
            %{?_without_polkit} \
            %{?_without_python} \
            %{?_without_libvirtd} \
            %{?_without_uml} \
-           %{?_without_one} \
-           %{?_without_phyp} \
-           %{?_without_network} \
-           %{?_with_rhel5_api} \
-           %{?_without_storage_fs} \
-           %{?_without_storage_lvm} \
-           %{?_without_storage_iscsi} \
-           %{?_without_storage_disk} \
-           %{?_without_numactl} \
-           %{?_without_capng} \
-           %{?_without_netcf} \
-           --with-qemu-user=%{qemu_user} \
-           --with-qemu-group=%{qemu_group} \
            --with-init-script=redhat \
-           --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid
+           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
 make %{?_smp_mflags}
-gzip -9 ChangeLog
 
 %install
 rm -fr %{buildroot}
 
 %makeinstall
 (cd docs/examples ; make clean ; rm -rf .deps 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)
+(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
 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
@@ -421,26 +265,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
 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}
 
-%pre
-%if 0%{?fedora} >= 12
-# Normally 'setup' adds this in /etc/passwd, but this is
-# here for case of upgrades from earlier Fedora. This
-# UID/GID pair is reserved for qemu:qemu
-getent group kvm >/dev/null || groupadd -g 36 -r kvm
-getent group qemu >/dev/null || groupadd -g 107 -r qemu
-getent passwd qemu >/dev/null || \
-  useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
-    -c "qemu user" qemu
-%endif
-
 %post
+/sbin/ldconfig
 
 %if %{with_libvirtd}
 %if %{with_qemu}
@@ -448,7 +277,7 @@ getent passwd qemu >/dev/null || \
 # 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 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ]
+if [ $? != 0 ]
 then
     UUID=`/usr/bin/uuidgen`
     sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
@@ -469,14 +298,16 @@ if [ $1 = 0 ]; then
 fi
 %endif
 
-%post client -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
 
-%postun client -p /sbin/ldconfig
-
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO
+%doc AUTHORS ChangeLog NEWS README COPYING.LIB TODO
+%doc %{_mandir}/man1/virsh.1*
+%{_bindir}/virsh
+%{_libdir}/lib*.so.*
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 
 %if %{with_qemu}
@@ -489,13 +320,16 @@ fi
 %{_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/
@@ -503,32 +337,9 @@ fi
 %endif
 
 %dir %{_localstatedir}/run/libvirt/
-
 %dir %{_localstatedir}/lib/libvirt/
-%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
-%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
-%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/
-
-%if %{with_qemu}
-%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/run/libvirt/qemu/
-%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
-%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/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
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
 
 %if %{with_qemu}
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
@@ -544,7 +355,6 @@ fi
 %{_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/
 %endif
@@ -562,33 +372,9 @@ fi
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %endif
 
+%doc docs/*.rng
 %doc docs/*.xml
 
-%files client -f %{name}.lang
-%defattr(-, root, root)
-%doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO
-
-%{_mandir}/man1/virsh.1*
-%{_mandir}/man1/virt-xml-validate.1*
-%{_bindir}/virsh
-%{_bindir}/virt-xml-validate
-%{_libdir}/lib*.so.*
-
-%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
-%{_datadir}/libvirt/schemas/interface.rng
-
-%if %{with_sasl}
-%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-%endif
-
 %files devel
 %defattr(-, root, root)
 
@@ -596,7 +382,6 @@ fi
 %dir %{_includedir}/libvirt
 %{_includedir}/libvirt/*.h
 %{_libdir}/pkgconfig/libvirt.pc
-%dir %{_datadir}/gtk-doc/html/libvirt/
 %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
 %doc %{_datadir}/gtk-doc/html/libvirt/*.html
 %doc %{_datadir}/gtk-doc/html/libvirt/*.png
@@ -605,7 +390,6 @@ fi
 %doc docs/*.html docs/html docs/*.gif
 %doc docs/examples
 %doc docs/libvirt-api.xml
-%doc examples
 
 %if %{with_python}
 %files python
@@ -621,209 +405,15 @@ fi
 %endif
 
 %changelog
-* Mon Aug 10 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-3
-- Don't fail to start network if ipv6 modules is not loaded
-
-* Thu Aug  6 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-2
-- Make sure qemu can access kernel/initrd (bug #516034)
-- Set perms on /var/lib/libvirt/boot to 0711 (bug #516034)
-
-* Wed Aug  5 2009 Daniel Veillard <veillard@redhat.com> - 0.7.0-1
-- Upstream release of 0.7.0
-- ESX, VBox3, Power Hypervisor drivers
-- new net filesystem glusterfs
-- Storage cloning for LVM and Disk backends
-- interface implementation based on netcf
-- Support cgroups in QEMU driver
-- QEmu hotplug NIC support
-- a lot of fixes
-
-* Fri Jul 31 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.9.gite195b43
-- Set perms on /var/lib/libvirt/images to 0711
-
-* Thu Jul 30 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.8.gite195b43
-- Add patch from upstream to fix qemu pidfile perms problem
-
-* Thu Jul 30 2009 Daniel P. Berrange <berrange@redhat.com> - 0.7.0-0.7.gite195b43
-- Create qemu/kvm user & group to fix upgrades
-
-* Wed Jul 29 2009 Daniel Veillard <veillard@redhat.com> - 0.7.0-0.6.gite195b43
-- another prerelease with qemu, uml and remote patches
-- drop the news patch as it's now UTF8 upstream
-
-* Wed Jul 29 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.5.gitf055724
-- Move ldconfig call to libvirt-client %post/%postun
-- Fix rpmlint warning about libvirt-client summary
-- Fix disabling polkit and netcf on older fedoras
-
-* Wed Jul 29 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.4.gitf055724
-- Drop explicit libselinux requires, it is autorequired
-- Drop cleanup of python/tests, apparently not needed
-- Cherry-pick upstream patch to convert NEWS to UTF-8, drop iconv
-- Drop python BR; python-devel requires it
-
-* Tue Jul 28 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.3.gitf055724
-- Enable netcf support
-- Pass --with-qemu-user=qemu etc. to configure
-- Move various requires to the libvirt-client sub-package
-- Sync some trivial cleanups from upstream spec file
-- Remove explicit libxml2 requires, again
-- Build with --without-capng if capng support is disabled
-- Remove explicit dir creating in makeinstall, replaced by attr in files
-- Set perms on /var/{run,lib,cache}/libvirt/qemu
-
-* Tue Jul 28 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.2.gitf055724
-- Drop glusterfs dep to 2.0.1 (bug #514191)
-
-* Mon Jul 27 2009 Daniel Veillard <veillard@redhat.com> - 0.7.0-0.1.gitf055724
-- prerelease of 0.7.0
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 10 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.5-2.fc12
-- Bump release number to rebuild against new libparted.
-
-* Fri Jul  3 2009 Daniel Veillard <veillard@redhat.com> - 0.6.5-1.fc12
-- Upstream release of 0.6.5
-- OpenNebula driver
-- many bug fixes
-
-* Fri Jul  3 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.4-4.fc12
-- Fix libvirtd crash with bad capabilities data (bug #505635)
-
-* Fri Jul  3 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.4-3.fc12
-- Handle shared/readonly image labelling (bug #493692)
-- Don't unnecessarily try to change a file context (bug #507555)
-- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)
-
-* Fri Jun  5 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.4-2.fc12
-- Remove the qemu BuildRequires
-
-* Fri May 29 2009 Daniel Veillard <veillard@redhat.com> - 0.6.4-1.fc12
-- Upstream release of 0.6.4
-- new APIs
-- fixes for latests QEmu/KVM versions
-- various assorted fixes
-
-* Mon May 25 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-11.fc12
-- Bring up the bridge, even if it doesn't have an IP address (bug #501912)
-
-* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-10.fc12
-- Fix XML attribute escaping (bug #499791)
-- Fix serious event handling issues causing guests to be destroyed (bug #499698)
-
-* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-9.fc12
-- Fix qemu argv detection with latest qemu (bug #501923)
-
-* Sun May 10 2009 Cole Robinson <crobinso@redhat.com> - 0.6.2-8.fc12
-- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)
-
-* Thu May  7 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-7.fc12
-- Enable migration for qemu 0.10 (bug #499704)
-
-* Wed May  6 2009 Cole Robinson <crobinso@redhat.com> - 0.6.3-6.fc12
-- Refresh qemu caps when getCapabilities is called (bug #460649)
-
-* Wed May  6 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.3-5.fc12
-- Fix handling of <hostdev managed='yes'> (bug #499386)
-
-* Tue May  5 2009 Daniel Berrange <berrange@redhat.com> - 0.6.3-4.fc12
-- Fix readonly/shared disk image labelling (rhbz #493692)
-
-* Tue Apr 28 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-3.fc12
-- was also missing /usr/share/gtk-doc/html/libvirt in -devel
-
-* Tue Apr 28 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-2.fc12
-- fix packaging bug #496945 libvirt should own /var/cache/libvirt
-
-* Fri Apr 24 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-1.fc12
-- release of 0.6.3
-- VirtualBox driver
-- new virt-xml-validate command
-- assorted bug fixes
-
-* Thu Apr 16 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-2.fc12
-- Fix qemu drive format specification (#496092)
-
-* Fri Apr  3 2009 Daniel Veillard <veillard@redhat.com> - 0.6.2-1.fc11
-- release of 0.6.2
-- memory ballooning in QEMU
-- SCSI HBA storage pool support
-- support SASL auth for VNC server
-- PCI passthrough in Xen driver
-- assorted bug fixes
-
-* Fri Apr  3 2009 Daniel P. Berrange  <berrange@redhat.com> - 0.6.1-6.fc11
-- Fix typo in previous patch
-
-* Tue Mar 17 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.1-5.fc11
-- Don't relabel shared/readonly disks
-- Disable sound cards when running sVirt
-
-* Tue Mar 17 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.1-4.fc11
-- Fix memory allocation for xend lookup
-- Avoid crash if storage volume deletion fails
-- Fix multiple FD leaks
-- Fix bug in dispatch FD events when a callback is marked deleted
-- Fix parsing of storage volume owner/group/mode
-- Fix memory allocation for virDomainGetVcpus RPC handler
-- Avoid deadlock in setting vCPU count
-- Use correct driver name in Xen block detach
-
-* Mon Mar  9 2009 Cole Robinson <crobinso@redhat.com> - 0.6.1-3.fc11
-- Add Requires: libselinux
-
-* 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
+* Wed Dec 17 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-2.fc10
 - fix missing read-only access checks, fixes CVE-2008-5086
 
-* Fri Dec  5 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-1.fc11
+* Fri Dec  5 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-1.fc10
 - 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
+* Wed Nov 26 2008 Daniel Veillard <veillard@redhat.com> - 0.5.0-1.fc10
 - upstream release 0.5.0
 - domain lifecycle event support
 - node device enumeration
@@ -866,7 +456,7 @@ fi
 
 * 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
+- 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)
@@ -1051,7 +641,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 @@
-8c2c14a7695c9c661004bcfc6468d62d  libvirt-0.7.0.tar.gz
+abc697978e9c66cbc8d8db4fa3f1c1b6  libvirt-0.5.1.tar.gz