wrong release number, Daniel

- Rebuild for RH #249435

.cvsignore

@@ -15,3 +15,10 @@ 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

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.4.1-qemud1.patch

@@ -0,0 +1,38 @@
+
+	Avoid segfault upon early libvirtd failure.
+	* qemud/qemud.c (main): Don't call qemudCleanup on an
+	uninitialized pointer.
+
+By the way, even though this evoked a warning from gcc,
+"make distcheck" passes.  Obviously, that means the distcheck
+rule is inadequate.  I'll fix it so that it turns on -Werror
+for the final build.
+
+Signed-off-by: Jim Meyering <meyering@redhat.com>
+---
+ qemud/qemud.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/qemud/qemud.c b/qemud/qemud.c
+index 96fdf32..b6b82ed 100644
+--- a/qemud/qemud.c
++++ b/qemud/qemud.c
+@@ -2025,7 +2025,7 @@ libvirt management daemon:\n\
+
+ #define MAX_LISTEN 5
+ int main(int argc, char **argv) {
+-    struct qemud_server *server;
++    struct qemud_server *server = NULL;
+     struct sigaction sig_action;
+     int sigpipe[2];
+     const char *pid_file = NULL;
+@@ -2180,7 +2180,8 @@ int main(int argc, char **argv) {
+         unlink (pid_file);
+
+  error1:
+-    qemudCleanup(server);
++    if (server)
++        qemudCleanup(server);
+     return ret;
+ }
+

libvirt-0.4.1-qemud2.patch

@@ -0,0 +1,23 @@
+
+	Don't use first byte of string as a pointer.
+	* src/qemu_conf.c (qemudReportError): Use the pointer, errorMessage,
+	not its first byte, errorMessage[0].
+
+Signed-off-by: Jim Meyering <meyering@redhat.com>
+---
+ src/qemu_conf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index eead0bc..e54da5b 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -68,7 +68,7 @@ void qemudReportError(virConnectPtr conn,
+         errorMessage[0] = '\0';
+     }
+
+-    virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL));
++    virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL));
+     __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR,
+                     virerr, errorMessage, NULL, -1, -1, virerr, errorMessage);
+ }

libvirt.spec

@@ -1,56 +1,128 @@
 # -*- rpm-spec -*-
 
-Summary: Library providing an API to use the Xen virtualization
+%if "%{fedora}" >= "8"
+%define with_polkit 1
+%define with_proxy no
+%else
+%define with_polkit 0
+%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.2.0
-Release: 4%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
+Patch0: libvirt-0.4.1-qemud1.patch
+Patch1: libvirt-0.4.1-qemud2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
-Requires: xen
 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 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: libsysfs-devel
 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
-Patch0: libvirt-0.2.0-Werror.patch
-Patch2: libvirt-0.2.0-qemu-fixes.patch
-# The 0.9.0 build of QEMU in Fedora has compiled out
-# the normal KQEMU support, so we drop that from libvirt
-# too, otherwise we fail on the unknown -no-kqemu command
-# line arg to qemu
-Patch3: libvirt-0.2.0-disable-kqemu.patch
 
-# QEMU 0.9.0 wants a : in front of the port number now :-(
-Patch4: libvirt-0.2.0-vnc-port.patch
-
-# Fix loading of network & guest configs
-Patch5: libvirt-0.2.0-config-load.patch
+# Fedora build root suckage
+BuildRequires: gawk
 
 %description
-This C library provides an API to use the Xen virtualization framework,
-and the virsh command line tool to control virtual domains.
+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: pkgconfig
+%ifarch i386 x86_64 ia64
+Requires: xen-devel
+%endif
 Obsoletes: libvir-devel
 
 %description devel
 Includes and documentations for the C library providing an API to use
-the Xen virtualization framework
+the virtualization capabilities of recent versions of Linux (and other OSes).
 
 %package python
 Summary: Python bindings for the libvirt library
@@ -61,31 +133,60 @@ 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 Xen virtualization framework.
+supplied by the libvirt library to use the virtualization capabilities
+of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
 %patch0 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch1 -p1
 
 %build
-%configure
+# 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
 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
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
-install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/libvirt/
+
+# 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.
+install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/
+cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
+   $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
+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
 %find_lang %{name}
 
 %clean
@@ -94,6 +195,27 @@ rm -fr %{buildroot}
 %post
 /sbin/ldconfig
 
+# 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 ]
+then
+    UUID=`/usr/bin/uuidgen`
+    sed -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
+         < %{_datadir}/libvirt/networks/default.xml \
+         > %{_sysconfdir}/libvirt/qemu/networks/default.xml
+    ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+fi
+
+/sbin/chkconfig --add libvirtd
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/service libvirtd stop 1>/dev/null 2>&1
+    /sbin/chkconfig --del libvirtd
+fi
+
 %postun
 /sbin/ldconfig
 
@@ -104,16 +226,37 @@ rm -fr %{buildroot}
 %doc %{_mandir}/man1/virsh.1*
 %{_bindir}/virsh
 %{_libdir}/lib*.so.*
-%config %{_sysconfdir}/libvirt/qemu/networks/
-%{_localstatedir}/run/libvirt/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
+%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
+%{_sysconfdir}/rc.d/init.d/libvirtd
+%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) %{_libexecdir}/libvirt_qemud
-%doc docs/libvirt.rng
+%endif
+%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
+%attr(0755, root, root) %{_sbindir}/libvirtd
+%doc docs/*.rng
+%doc docs/*.xml
 
 %files devel
 %defattr(-, root, root)
 
 %{_libdir}/lib*.so
+%dir %{_includedir}/libvirt
 %{_includedir}/libvirt/*.h
 %{_libdir}/pkgconfig/libvirt.pc
 %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
@@ -137,6 +280,98 @@ rm -fr %{buildroot}
 %doc docs/examples/python
 
 %changelog
+* Thu Mar  6 2008 Daniel Veillard <veillard@redhat.com> - 0.4.1-1.fc8
+- Update to 0.4.1
+- Storage APIs
+- xenner support
+- lots of assorted improvements, bugfixes and cleanups
+- documentation and localization improvements
+
+* Thu Jan 17 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc8
+- Fix SSH tunnelling (rhbz #428743)
+
+* Sun Jan 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-3.fc8
+- Fix crash when no auth callback
+
+* 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)
+
+* 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
+
+* 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
+
+* Thu Mar 22 2007 Jeremy Katz <katzj@redhat.com> - 0.2.1-2.fc7
+- don't require xen; we don't need the daemon and can control non-xen now
+- fix scriptlet error (need to own more directories)
+- update description text
+
+* 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
+- New API to detect the virtualization capabilities of a host
+- Documentation updates
+
 * Fri Feb 23 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-4.fc7
 - Fix loading of guest & network configs
 

sources

@@ -1 +1 @@
-65dd1d2da9bfb304a4e4a69b058cda9f  libvirt-0.2.0.tar.gz
+4dfe45869f082393cfd09f4690454c12  libvirt-0.4.1.tar.gz