upstream release of 0.4.2, remove old patches, daniel

dumpxml didn't match up with what was used to define the pool to begin with.

.cvsignore

@@ -0,0 +1,6 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.gz
+libvirt-0.4.2.tar.gz

.gitignore

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

Makefile

@@ -3,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

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

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

@@ -8,17 +8,23 @@
 %define with_proxy yes
 %endif
 
+%if "%{fedora}"
+%ifarch ppc64
+%define with_qemu 0
+%else
+%define with_qemu 1
+%endif
+%else
+%define with_qemu 0
+%endif
+
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.0
+Version: 0.4.2
-Release: 4%{?dist}%{?extra_release}
+Release: 1%{?dist}%{?extra_release}
 License: LGPL
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -33,33 +39,73 @@ Requires: iptables
 Requires: nc
 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
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
-
+# For mount/umount in FS driver
+BuildRequires: util-linux
+# PPC64 has no Xen nor QEmu, try to build anyway
+%ifnarch ppc64
+%if %{with_qemu}
+# From QEMU RPMs
+Requires: /usr/bin/qemu-img
+%else
+# 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
+%ifarch i386 x86_64 ia64
 BuildRequires: xen-devel
+%endif
 BuildRequires: libxml2-devel
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: gnutls-devel
 BuildRequires: avahi-devel
+BuildRequires: libselinux-devel
 BuildRequires: dnsmasq
 BuildRequires: bridge-utils
+%if %{with_qemu}
+BuildRequires: qemu
+%endif
 BuildRequires: cyrus-sasl-devel
 %if %{with_polkit}
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
+# For mount/umount in FS driver
+BuildRequires: util-linux
+# PPC64 has no Xen nor QEmu, try to build anyway
+%ifnarch ppc64
+%if %{with_qemu}
+# From QEMU RPMs
+BuildRequires: /usr/bin/qemu-img
+%else
+# 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
 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
+Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes).
 
 %package devel
@@ -67,7 +113,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
@@ -83,18 +131,34 @@ 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 virtualization capabilities
 of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+# Xen is available 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 \
+           --with-xen-proxy=%{with_proxy}
+%else
+%ifnarch ppc64
+%configure --without-xen \
+           --with-init-script=redhat \
+           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+%else
+%configure --without-xen \
+           --without-qemu \
+           --with-init-script=redhat \
+           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --with-remote-file=%{_localstatedir}/run/libvirtd.pid
+%endif
+%endif
+
 make
 
 %install
@@ -108,6 +172,8 @@ 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/
 
 # 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
@@ -172,6 +238,7 @@ fi
 %{_datadir}/libvirt/networks/default.xml
 %dir %{_localstatedir}/run/libvirt/
 %dir %{_localstatedir}/lib/libvirt/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %if %{with_polkit}
 %{_datadir}/PolicyKit/policy/libvirtd.policy
 %endif
@@ -179,6 +246,7 @@ fi
 %if %{with_proxy} == "yes"
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
+%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/*.rng
 %doc docs/*.xml
@@ -211,54 +279,109 @@ fi
 %doc docs/examples/python
 
 %changelog
-* Fri Jan 18 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc7
+* Tue Apr  8 2008 Daniel Veillard ,veillard@redhat.com> 0.4.2-1.fc9
-- Fix SSH tunnelling (rhbz #428743)
+- upstream release 0.4.2
+- many bug fixes
+- localization updates
 
-* Sun Jan 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-3.fc7
+* 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.
+
+* Sun Jan 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-3.fc9
 - Fix crash when no auth callback
 
-* Wed Jan  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2.fc7
+* Wed Jan  2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2.fc9
 - Fix reading large config files (rhbz #426425)
+- Fix crash when connecting to a PolicyKit enabled server with not auth callback (rhbz #427107)
 
-* Tue Dec 18 2007 Daniel Veillard <veillard@redhat.com> - 0.4.0-1.fc7
+* 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 Oct  9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.3-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
 
-* Tue Aug 21 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-1.fc7
+* 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 Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-2.fc7
+* 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
 
-* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1.fc7
+* 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.fc7
+* 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.fc7
+* 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

sources

@@ -1 +1 @@
-2f6c6adb62145988f0e5021e5cbd71d3  libvirt-0.4.0.tar.gz
+c87e3d91eaa9445bb3cb1ba191573c83  libvirt-0.4.2.tar.gz