Avoid a segfault if missing an emulator, Daniel

- Disable lokkit support again (#449996, #447633)

.cvsignore

@@ -3,4 +3,3 @@
 i686
 x86_64
 libvirt-*.tar.gz
-libvirt-0.4.2.tar.gz

libvirt-0.4.5-no-emulator-segfault.patch

@@ -0,0 +1,13 @@
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index d742c32..23ef050 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -790,7 +790,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
+     if (!emulator)
+         return -1;
+ 
+-    ADD_ARG_LIT(vm->def->emulator);
++    ADD_ARG_LIT(emulator);
+     ADD_ARG_LIT("-S");
+     ADD_ARG_LIT("-M");
+     ADD_ARG_LIT(vm->def->os.machine);

libvirt.spec

@@ -3,8 +3,9 @@
 %define with_xen       1
 %define with_xen_proxy 1
 %define with_qemu      1
+%define with_openvz    1
+%define with_lxc       1
 %define with_polkit    0
-%define with_lokkit    0
 
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i686 x86_64 ia64
@@ -21,20 +22,20 @@
 %endif
 %endif
 
-%if "%{fedora}" >= "8"
+%if 0%{fedora} >= 8
 %define with_polkit    1
-%define with_lokkit    1
 %define with_xen_proxy 0
 %endif
 
 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.4.2
-Release: 4%{?dist}%{?extra_release}
-License: LGPL
+Version: 0.4.5
+Release: 2%{?dist}%{?extra_release}
+License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Patch0: libvirt-0.4.5-no-emulator-segfault.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
 Requires: libxml2
@@ -53,11 +54,11 @@ 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
+# For showmount in FS driver (netfs discovery)
+BuildRequires: nfs-utils
+Requires: nfs-utils
 %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
@@ -77,6 +78,7 @@ Requires: parted
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
+BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext
@@ -92,9 +94,6 @@ 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
 %if %{with_qemu}
@@ -149,6 +148,7 @@ of recent versions of Linux (and other OSes).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if ! %{with_xen}
@@ -159,12 +159,22 @@ of recent versions of Linux (and other OSes).
 %define _without_qemu --without-qemu
 %endif
 
+%if ! %{with_openvz}
+%define _without_openvz --without-openvz
+%endif
+
+%if ! %{with_lxc}
+%define _without_lxc --without-lxc
+%endif
+
 %configure %{?_without_xen} \
            %{?_without_qemu} \
+           %{?_without_openvz} \
+           %{?_without_lxc} \
            --with-init-script=redhat \
            --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
            --with-remote-file=%{_localstatedir}/run/libvirtd.pid
-make
+make %{?_smp_mflags}
 
 %install
 rm -fr %{buildroot}
@@ -247,14 +257,21 @@ fi
 %dir %{_localstatedir}/lib/libvirt/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/libvirtd_qemu.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %if %{with_polkit}
-%{_datadir}/PolicyKit/policy/libvirtd.policy
+%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
 %endif
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
+%if %{with_lxc}
+%attr(0755, root, root) %{_libexecdir}/libvirt_lxc
+%endif
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %doc docs/*.rng
 %doc docs/*.xml
@@ -287,6 +304,38 @@ fi
 %doc docs/examples/python
 
 %changelog
+* Tue Sep  9 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-2.fc10
+- fix a crash if a QEmu/KVM domain is defined without an emulator path
+
+* Mon Sep  8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-1.fc10
+- upstream release 0.4.5
+- a lot of bug fixes
+- major updates to QEmu/KVM and Linux containers drivers
+- support for OpenVZ if installed
+
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.4.4-3.fc10
+- fix license tag
+
+* Tue Jul  8 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-2.fc10
+- Fix booting of CDROM images with KVM (rhbz #452355)
+
+* Wed Jun 25 2008 Daniel Veillard <veillard@redhat.com> - 0.4.4-1.fc10
+- upstream release 0.4.4
+- fix a few bugs in previous release
+
+* Thu Jun 12 2008 Daniel Veillard <veillard@redhat.com> - 0.4.3-1.fc10
+- upstream release 0.4.3
+- many bug fixes
+- many small improvements
+- serious xenner fixes
+
+* 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
+
+* Thu May 15 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-5.fc10
+- Rebuild with policy enabled (rhbz #446616)
+
 * Fri May  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-4.fc10
 - Added directory for initrd/kernel images for SELinux policy
 

sources

@@ -1 +1 @@
-c87e3d91eaa9445bb3cb1ba191573c83  libvirt-0.4.2.tar.gz
+dcb590a6202c332907eae7b44e47ca4b  libvirt-0.4.5.tar.gz