wrong release number, Daniel

.cvsignore

@@ -1,6 +1,24 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.gz
-libvirt-0.4.2.tar.gz
+libvirt-0.0.3.tar.gz
+libvirt-0.0.4.tar.gz
+libvirt-0.0.5.tar.gz
+libvirt-0.0.6.tar.gz
+libvirt-0.1.0.tar.gz
+libvirt-0.1.2.tar.gz
+libvirt-0.1.1.tar.gz
+libvirt-0.1.3.tar.gz
+libvirt-0.1.4.tar.gz
+libvirt-0.1.5.tar.gz
+libvirt-0.1.6.tar.gz
+libvirt-0.1.7.tar.gz
+libvirt-0.1.8.tar.gz
+libvirt-0.1.9.tar.gz
+libvirt-0.1.10.tar.gz
+libvirt-0.1.11.tar.gz
+libvirt-0.2.0.tar.gz
+libvirt-0.2.1.tar.gz
+libvirt-0.2.2.tar.gz
+libvirt-0.2.3.tar.gz
+libvirt-0.3.0.tar.gz
+libvirt-0.3.1.tar.gz
+libvirt-0.3.2.tar.gz
+libvirt-0.3.3.tar.gz

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,39 +1,32 @@
 # -*- rpm-spec -*-
 
-%define with_xen       1
-%define with_xen_proxy 1
-%define with_qemu      1
-%define with_polkit    0
-%define with_lokkit    0
-
-# Xen is available only on i386 x86_64 ia64
-%ifnarch i386 i686 x86_64 ia64
-%define with_xen 0
-%endif
-
-%if ! %{with_xen}
-%define with_xen_proxy 0
+%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
-%endif
-
-%if "%{fedora}" >= "8"
-%define with_polkit    1
-%define with_lokkit    1
-%define with_xen_proxy 0
+%else
+%define with_qemu 0
 %endif
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.2
-Release: 4%{?dist}%{?extra_release}
+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
@@ -53,16 +46,14 @@ Requires: cyrus-sasl-md5
 %if %{with_polkit}
 Requires: PolicyKit >= 0.6
 %endif
-%if %{with_lokkit}
-Requires: /usr/sbin/lokkit
-%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
-%if %{with_xen}
 # From Xen RPMs
 Requires: /usr/sbin/qcow-create
 %endif
@@ -73,7 +64,7 @@ Requires: lvm2
 Requires: iscsi-initiator-utils
 # For disk driver
 Requires: parted
-%if %{with_xen}
+%ifarch i386 x86_64 ia64
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
@@ -92,16 +83,14 @@ BuildRequires: cyrus-sasl-devel
 %if %{with_polkit}
 BuildRequires: PolicyKit-devel >= 0.6
 %endif
-%if %{with_lokkit}
-BuildRequires: /usr/sbin/lokkit
-%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
-%if %{with_xen}
 # From Xen RPMs
 BuildRequires: /usr/sbin/qcow-create
 %endif
@@ -126,7 +115,7 @@ Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
 Requires: libvirt = %{version}
 Requires: pkgconfig
-%if %{with_xen}
+%ifarch i386 x86_64 ia64
 Requires: xen-devel
 %endif
 Obsoletes: libvir-devel
@@ -149,21 +138,31 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-%if ! %{with_xen}
-%define _without_xen --without-xen
-%endif
-
-%if ! %{with_qemu}
-%define _without_qemu --without-qemu
-%endif
-
-%configure %{?_without_xen} \
-           %{?_without_qemu} \
+# 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
@@ -177,10 +176,6 @@ 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/
 
 # 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
@@ -245,13 +240,11 @@ fi
 %{_datadir}/libvirt/networks/default.xml
 %dir %{_localstatedir}/run/libvirt/
 %dir %{_localstatedir}/lib/libvirt/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
-%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
 %if %{with_polkit}
 %{_datadir}/PolicyKit/policy/libvirtd.policy
 %endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%if %{with_xen_proxy}
+%if %{with_proxy} == "yes"
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
@@ -287,62 +280,20 @@ fi
 %doc docs/examples/python
 
 %changelog
-* Fri May  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-4.fc10
-- Added directory for initrd/kernel images for SELinux policy
-
-* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-3.fc10
-- Simplify the way arch conditionals are handled
-
-* Mon Apr 28 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-2.fc10
-- Enable lokkit support (#443796)
-
-* Tue Apr  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.2-1.fc9
-- upstream release 0.4.2
-- many bug fixes
-- localization updates
-
-* Thu Apr  4 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-7.fc9
-- Don't run polkit-auth as root
-- Don't request polkit auth if client is root
-
-* Fri Mar 28 2008 Chris Lalancette <clalance@redhat.com> - 0.4.1-6.fc9
-- When dumping XML for a storage pool, make the <source> directory tag
-  match the <dir> tag used for specifying the pool in the first place
-
-* Thu Mar 27 2008 Chris Lalancette <clalance@redhat.com> - 0.4.1-5.fc9
-- Do iscsiadm sendtarget before trying to do login
-- Do sysfs scanning for iSCSI LUNs instead of trying to parse them from
-  iscsiadm session output
-
-* Thu Mar 13 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-4.fc9
-- Fix QEMU tap device setup
-- Fix Xen boot device XML processing
-- Fixed QEMU cdrom media change
-
-* Mon Mar 10 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-3.fc9
-- Fixed daemon startup when run with --daemon flag
-
-* Mon Mar  3 2008 Daniel Veillard <veillard@redhat.com> - 0.4.1-2.fc9
-- 2 patches found just after the release
-
-* Mon Mar  3 2008 Daniel Veillard <veillard@redhat.com> - 0.4.1-1.fc9
-- Release of 0.4.1
+* 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
 
-* 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
+* Thu Jan 17 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-4.fc8
 - 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
+* 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.fc9
+* 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)
 

sources

@@ -1 +1 @@
-c87e3d91eaa9445bb3cb1ba191573c83  libvirt-0.4.2.tar.gz
+4dfe45869f082393cfd09f4690454c12  libvirt-0.4.1.tar.gz