Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2014-01-23 14:03:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2014-01-07 20:58:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-01-23 15:48:44.000000000 +0100 @@ -1,0 +2,34 @@ +Wed Jan 22 10:02:06 MST 2014 - [email protected] + +- Add CAP_SYS_PACCT capability to libvirtd AppArmor profile + Modified install-apparmor-profiles.patch + bnc#817407 + +------------------------------------------------------------------- +Mon Jan 20 18:22:59 MST 2014 - [email protected] + +- Fix build on code 11 +- Fix rpmlint warning + +------------------------------------------------------------------- +Mon Jan 20 17:40:10 MST 2014 - [email protected] + +- Following the upstream pattern, introduce the + daemon-config-network subpackage to handle defining the default + network + bnc#859041 + +------------------------------------------------------------------- +Fri Jan 17 12:30:48 MST 2014 - [email protected] + +- Update to libvirt 1.2.1 + - CVE-2014-0028, CVE-2014-1447, CVE-2013-6458, CVE-2013-6457, + CVE-2013-6436 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped upstream patches: 5e397d9c-test-fix-dbus-crash.patch, + 78af457e-fix-virnettlscontexttest.patch, + 9faf3f29-LXC-memtune.patch, f8c1cb90-CVE-2013-6436.patch, + libxl-hvm-nic.patch + +------------------------------------------------------------------- Old: ---- 5e397d9c-test-fix-dbus-crash.patch 78af457e-fix-virnettlscontexttest.patch 9faf3f29-LXC-memtune.patch f8c1cb90-CVE-2013-6436.patch libvirt-1.2.0.tar.bz2 libxl-hvm-nic.patch New: ---- libvirt-1.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvirt # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -233,7 +233,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -241,6 +241,9 @@ %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} +%if %{with_network} +Requires: libvirt-daemon-config-network = %{version}-%{release} +%endif %if %{with_nwfilter} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} %endif @@ -418,16 +421,11 @@ Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: f8c1cb90-CVE-2013-6436.patch -Patch1: 9faf3f29-LXC-memtune.patch -Patch2: 5e397d9c-test-fix-dbus-crash.patch -Patch3: 78af457e-fix-virnettlscontexttest.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: ia64-clone.patch Patch102: xen-pv-cdrom.patch Patch103: libxl-hvm-vnc.patch -Patch104: libxl-hvm-nic.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: libvirtd-init-script.patch @@ -518,6 +516,17 @@ of recent versions of Linux. Requires a hypervisor specific sub-RPM for specific drivers. +%if %{with_network} +%package daemon-config-network +Summary: Default configuration files for the libvirtd daemon +Group: Development/Libraries/C and C++ + +Requires: libvirt-daemon = %{version}-%{release} + +%description daemon-config-network +Default configuration files for setting up NAT based networking +%endif + %if %{with_nwfilter} %package daemon-config-nwfilter @@ -919,15 +928,10 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 %patch103 -p1 -%patch104 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 @@ -1021,6 +1025,8 @@ %endif %if ! %{with_apparmor} %define _without_apparmor --without-apparmor +%else +%define _with_apparmor_profiles --with-apparmor-profiles %endif %if ! %{with_capng} %define _without_capng --without-capng @@ -1125,6 +1131,7 @@ %{?_without_selinux} \ %{?_with_selinux_mount} \ %{?_without_apparmor} \ + %{?_with_apparmor_profiles} \ %{?_without_udev} \ %{?_without_yajl} \ %{?_without_sanlock} \ @@ -1146,7 +1153,7 @@ %install %makeinstall SYSTEMD_UNIT_DIR=%{_unitdir} DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name} -for i in domain-events/events-c dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap +for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done @@ -1182,6 +1189,10 @@ 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 +cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-config-network.README << 'EOF' +Any empty package containing only a post install scriptlet that ensures +a default network is defined. +EOF %else rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml @@ -1298,16 +1309,6 @@ %post daemon /sbin/ldconfig -%if %{with_network} -# Install the default network if one doesn't exist -if test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml -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 -fi -%endif %if %{with_systemd} %service_add_post libvirtd.service %service_add_post virtlockd.service virtlockd.socket @@ -1336,6 +1337,17 @@ %restart_on_update libvirtd %restart_on_update virtlockd %insserv_cleanup + +%if %{with_network} +%post daemon-config-network +# Install the default network if one doesn't exist +if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; 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 +fi +%endif %endif # with_libvirtd %post client @@ -1421,11 +1433,11 @@ %if %{with_apparmor} %dir %{_sysconfdir}/apparmor.d %dir %{_sysconfdir}/apparmor.d/abstractions -%dir %{_sysconfdir}/apparmor.d/libvirt +%dir %{_sysconfdir}/apparmor.d/libvirtd %config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper %config(noreplace) %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu -%config(noreplace) %{_sysconfdir}/apparmor.d/libvirt/TEMPLATE +%config(noreplace) %{_sysconfdir}/apparmor.d/libvirtd/TEMPLATE %{_libdir}/%{name}/virt-aa-helper %endif %config %{_fwdefdir}/libvirtd-relocation-server @@ -1475,6 +1487,12 @@ %endif %endif # ! %{with_driver_modules} +%if %{with_network} +%files daemon-config-network +%defattr(-, root, root) +%doc %{_docdir}/%{name}/libvirt-daemon-config-network.README +%endif + %if %{with_nwfilter} %files daemon-config-nwfilter ++++++ fix-pci-attach-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:45.000000000 +0100 @@ -8,11 +8,11 @@ This patch changes the xend driver to always call 'device_configure' for PCI devices to be consistent with the usage in the xen tools. -Index: libvirt-1.2.0/src/xen/xend_internal.c +Index: libvirt-1.2.1/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.0.orig/src/xen/xend_internal.c -+++ libvirt-1.2.0/src/xen/xend_internal.c -@@ -2207,6 +2207,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr +--- libvirt-1.2.1.orig/src/xen/xend_internal.c ++++ libvirt-1.2.1/src/xen/xend_internal.c +@@ -2216,6 +2216,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; char *target = NULL; @@ -20,7 +20,7 @@ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); -@@ -2305,8 +2306,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr +@@ -2314,8 +2315,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr } sexpr = virBufferContentAndReset(&buf); ++++++ ia64-clone.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:45.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.0/src/lxc/lxc_container.c +Index: libvirt-1.2.1/src/lxc/lxc_container.c =================================================================== ---- libvirt-1.2.0.orig/src/lxc/lxc_container.c -+++ libvirt-1.2.0/src/lxc/lxc_container.c +--- libvirt-1.2.1.orig/src/lxc/lxc_container.c ++++ libvirt-1.2.1/src/lxc/lxc_container.c @@ -162,12 +162,19 @@ int lxcContainerHasReboot(void) VIR_FREE(buf); cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; @@ -22,7 +22,7 @@ VIR_FREE(stack); if (cpid < 0) { virReportSystemError(errno, "%s", -@@ -1985,6 +1992,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2004,6 +2011,9 @@ int lxcContainerStart(virDomainDefPtr de .handshakefd = handshakefd }; @@ -32,7 +32,7 @@ /* allocate a stack for the container */ if (VIR_ALLOC_N(stack, stacksize) < 0) return -1; -@@ -2010,7 +2020,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2029,7 +2039,11 @@ int lxcContainerStart(virDomainDefPtr de cflags |= CLONE_NEWNET; } @@ -44,7 +44,7 @@ VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -2044,12 +2058,19 @@ int lxcContainerAvailable(int features) +@@ -2063,12 +2077,19 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ install-apparmor-profiles.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-1.2.0/examples/apparmor/Makefile.am +Index: libvirt-1.2.1/examples/apparmor/Makefile.am =================================================================== ---- libvirt-1.2.0.orig/examples/apparmor/Makefile.am -+++ libvirt-1.2.0/examples/apparmor/Makefile.am -@@ -14,8 +14,45 @@ +--- libvirt-1.2.1.orig/examples/apparmor/Makefile.am ++++ libvirt-1.2.1/examples/apparmor/Makefile.am +@@ -14,13 +14,32 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>. @@ -16,8 +16,8 @@ + libvirt-qemu.in \ + usr.lib.libvirt.virt-aa-helper.in \ + usr.sbin.libvirtd.in -+ -+if WITH_SECDRIVER_APPARMOR + + if WITH_APPARMOR_PROFILES + +libvirt-qemu: libvirt-qemu.in + sed \ @@ -37,26 +37,13 @@ + < $< > $@-t + mv $@-t $@ + -+install-data-local: libvirt-qemu usr.sbin.libvirtd usr.lib.libvirt.virt-aa-helper -+ mkdir -p $(DESTDIR)$(sysconfdir)/apparmor.d/ -+ $(INSTALL_DATA) usr.lib.libvirt.virt-aa-helper $(DESTDIR)$(sysconfdir)/apparmor.d/usr.lib.libvirt.virt-aa-helper -+ $(INSTALL_DATA) usr.sbin.libvirtd $(DESTDIR)$(sysconfdir)/apparmor.d/usr.sbin.libvirtd -+ mkdir -p $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt -+ $(INSTALL_DATA) TEMPLATE $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE -+ mkdir -p $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions -+ $(INSTALL_DATA) libvirt-qemu $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/libvirt-qemu -+ -+uninstall-local:: -+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/usr.lib.libvirt.virt-aa-helper -+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/usr.sbin.libvirtd -+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/abstractions/libvirt-qemu -+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE -+ -+endif -Index: libvirt-1.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in + apparmordir = $(sysconfdir)/apparmor.d/ + apparmor_DATA = \ + usr.lib.libvirt.virt-aa-helper \ +Index: libvirt-1.2.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-1.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-1.2.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -0,0 +1,41 @@ +# Last Modified: Fri Aug 19 11:21:48 2011 +#include <tunables/global> @@ -99,9 +86,9 @@ + /var/lib/kvm/images/ r, + /var/lib/kvm/images/** r, +} -Index: libvirt-1.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-1.2.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-1.2.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-1.2.1.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ /dev/null @@ -1,38 +0,0 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 @@ -142,9 +129,9 @@ - /var/lib/libvirt/images/ r, - /var/lib/libvirt/images/** r, -} -Index: libvirt-1.2.0/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-1.2.1/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-1.2.0.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-1.2.1.orig/examples/apparmor/usr.sbin.libvirtd +++ /dev/null @@ -1,52 +0,0 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 @@ -199,11 +186,11 @@ - change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, - -} -Index: libvirt-1.2.0/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-1.2.1/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-1.2.0/examples/apparmor/usr.sbin.libvirtd.in -@@ -0,0 +1,61 @@ ++++ libvirt-1.2.1/examples/apparmor/usr.sbin.libvirtd.in +@@ -0,0 +1,62 @@ +# Last Modified: Fri Aug 19 11:20:36 2011 +#include <tunables/global> +@{LIBVIRT}="libvirt" @@ -218,6 +205,7 @@ + capability sys_admin, + capability sys_module, + capability sys_ptrace, ++ capability sys_pacct, + capability sys_nice, + capability sys_chroot, + capability setuid, @@ -265,9 +253,9 @@ + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-1.2.0/examples/apparmor/libvirt-qemu +Index: libvirt-1.2.1/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.0.orig/examples/apparmor/libvirt-qemu +--- libvirt-1.2.1.orig/examples/apparmor/libvirt-qemu +++ /dev/null @@ -1,129 +0,0 @@ -# Last Modified: Fri Mar 9 14:43:22 2012 @@ -399,10 +387,10 @@ - - /usr/libexec/qemu-bridge-helper rmix, - } -Index: libvirt-1.2.0/examples/apparmor/libvirt-qemu.in +Index: libvirt-1.2.1/examples/apparmor/libvirt-qemu.in =================================================================== --- /dev/null -+++ libvirt-1.2.0/examples/apparmor/libvirt-qemu.in ++++ libvirt-1.2.1/examples/apparmor/libvirt-qemu.in @@ -0,0 +1,132 @@ +# Last Modified: Fri Mar 9 14:43:22 2012 + ++++++ libvirt-1.2.0.tar.bz2 -> libvirt-1.2.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-1.2.0.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.2.1.tar.bz2 differ: char 11, line 1 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:45.000000000 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.2.0/tools/libvirt-guests.init.in +Index: libvirt-1.2.1/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.2.0.orig/tools/libvirt-guests.init.in -+++ libvirt-1.2.0/tools/libvirt-guests.init.in +--- libvirt-1.2.1.orig/tools/libvirt-guests.init.in ++++ libvirt-1.2.1/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.2.0/tools/libvirt-guests.sh.in +Index: libvirt-1.2.1/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.2.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.2.0/tools/libvirt-guests.sh.in +--- libvirt-1.2.1.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.2.1/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -189,10 +189,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-1.2.0/tools/libvirt-guests.sysconf +Index: libvirt-1.2.1/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.2.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.2.0/tools/libvirt-guests.sysconf +--- libvirt-1.2.1.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.2.1/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:45.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.0/configure.ac +Index: libvirt-1.2.1/configure.ac =================================================================== ---- libvirt-1.2.0.orig/configure.ac -+++ libvirt-1.2.0/configure.ac +--- libvirt-1.2.1.orig/configure.ac ++++ libvirt-1.2.1/configure.ac @@ -231,6 +231,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -10,7 +10,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2312,11 +2313,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2337,11 +2338,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ esac if test "$with_interface" = "yes" ; then -@@ -2631,6 +2633,7 @@ LIBVIRT_RESULT_FUSE +@@ -2656,6 +2658,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.2.0/src/Makefile.am +Index: libvirt-1.2.1/src/Makefile.am =================================================================== ---- libvirt-1.2.0.orig/src/Makefile.am -+++ libvirt-1.2.0/src/Makefile.am -@@ -781,6 +781,10 @@ if WITH_NETCF +--- libvirt-1.2.1.orig/src/Makefile.am ++++ libvirt-1.2.1/src/Makefile.am +@@ -790,6 +790,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1346,10 +1350,15 @@ if WITH_NETCF +@@ -1355,10 +1359,15 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) else ! WITH_NETCF @@ -65,10 +65,10 @@ endif ! WITH_NETCF if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la -Index: libvirt-1.2.0/tools/virsh.c +Index: libvirt-1.2.1/tools/virsh.c =================================================================== ---- libvirt-1.2.0.orig/tools/virsh.c -+++ libvirt-1.2.0/tools/virsh.c +--- libvirt-1.2.1.orig/tools/virsh.c ++++ libvirt-1.2.1/tools/virsh.c @@ -3029,6 +3029,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -78,10 +78,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.2.0/src/interface/interface_backend_netcf.c +Index: libvirt-1.2.1/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.2.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.2.0/src/interface/interface_backend_netcf.c +--- libvirt-1.2.1.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.2.1/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -165,10 +165,10 @@ return 0; } -Index: libvirt-1.2.0/src/interface/interface_driver.c +Index: libvirt-1.2.1/src/interface/interface_driver.c =================================================================== ---- libvirt-1.2.0.orig/src/interface/interface_driver.c -+++ libvirt-1.2.0/src/interface/interface_driver.c +--- libvirt-1.2.1.orig/src/interface/interface_driver.c ++++ libvirt-1.2.1/src/interface/interface_driver.c @@ -28,8 +28,15 @@ interfaceRegister(void) { if (netcfIfaceRegister() == 0) return 0; @@ -186,10 +186,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.2.0/m4/virt-netcontrol.m4 +Index: libvirt-1.2.1/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.2.0/m4/virt-netcontrol.m4 ++++ libvirt-1.2.1/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:45.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.0/daemon/libvirtd.conf +Index: libvirt-1.2.1/daemon/libvirtd.conf =================================================================== ---- libvirt-1.2.0.orig/daemon/libvirtd.conf -+++ libvirt-1.2.0/daemon/libvirtd.conf +--- libvirt-1.2.1.orig/daemon/libvirtd.conf ++++ libvirt-1.2.1/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,10 +13,10 @@ # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-1.2.0/daemon/libvirtd-config.c +Index: libvirt-1.2.1/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.2.0.orig/daemon/libvirtd-config.c -+++ libvirt-1.2.0/daemon/libvirtd-config.c +--- libvirt-1.2.1.orig/daemon/libvirtd-config.c ++++ libvirt-1.2.1/daemon/libvirtd-config.c @@ -222,7 +222,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:45.000000000 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.2.0/daemon/libvirtd.sysconf +Index: libvirt-1.2.1/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.2.0.orig/daemon/libvirtd.sysconf -+++ libvirt-1.2.0/daemon/libvirtd.sysconf +--- libvirt-1.2.1.orig/daemon/libvirtd.sysconf ++++ libvirt-1.2.1/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ libxl-hvm-vnc.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:46.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:46.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.0/src/libxl/libxl_conf.c +Index: libvirt-1.2.1/src/libxl/libxl_conf.c =================================================================== ---- libvirt-1.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-1.2.0/src/libxl/libxl_conf.c +--- libvirt-1.2.1.orig/src/libxl/libxl_conf.c ++++ libvirt-1.2.1/src/libxl/libxl_conf.c @@ -561,6 +561,30 @@ libxlMakeChrdevStr(virDomainChrDefPtr de } @@ -33,7 +33,7 @@ libxlMakeDomBuildInfo(virDomainObjPtr vm, libxl_domain_config *d_config) { virDomainDefPtr def = vm->def; -@@ -1174,6 +1198,9 @@ libxlBuildDomainConfig(libxlDriverPrivat +@@ -1189,6 +1213,9 @@ libxlBuildDomainConfig(libxlDriverPrivat if (libxlMakeVfbList(driver, def, d_config) < 0) return -1; ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:46.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:46.000000000 +0100 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.2.0/src/xenxs/xen_sxpr.c +Index: libvirt-1.2.1/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.2.0.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.2.0/src/xenxs/xen_sxpr.c +--- libvirt-1.2.1.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.2.1/src/xenxs/xen_sxpr.c @@ -996,6 +996,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; @@ -78,10 +78,10 @@ xenFormatSxprPCI(def->hostdevs[i], buf); } } -Index: libvirt-1.2.0/src/xenxs/xen_xm.c +Index: libvirt-1.2.1/src/xenxs/xen_xm.c =================================================================== ---- libvirt-1.2.0.orig/src/xenxs/xen_xm.c -+++ libvirt-1.2.0/src/xenxs/xen_xm.c +--- libvirt-1.2.1.orig/src/xenxs/xen_xm.c ++++ libvirt-1.2.1/src/xenxs/xen_xm.c @@ -802,6 +802,8 @@ xenParseXM(virConfPtr conf, int xendConf int busID; int slotID; ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:46.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:46.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.0/src/qemu/qemu.conf +Index: libvirt-1.2.1/src/qemu/qemu.conf =================================================================== ---- libvirt-1.2.0.orig/src/qemu/qemu.conf -+++ libvirt-1.2.0/src/qemu/qemu.conf +--- libvirt-1.2.1.orig/src/qemu/qemu.conf ++++ libvirt-1.2.1/src/qemu/qemu.conf @@ -200,7 +200,16 @@ # a special value; security_driver can be set to that value in # isolation, but it cannot appear in a list of drivers. ++++++ systemd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:46.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:46.000000000 +0100 @@ -1,13 +1,13 @@ -Index: libvirt-1.2.0/daemon/libvirtd.service.in +Index: libvirt-1.2.1/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.2.0.orig/daemon/libvirtd.service.in -+++ libvirt-1.2.0/daemon/libvirtd.service.in +--- libvirt-1.2.1.orig/daemon/libvirtd.service.in ++++ libvirt-1.2.1/daemon/libvirtd.service.in @@ -9,6 +9,8 @@ Before=libvirt-guests.service After=network.target After=dbus.service After=iscsid.service +Wants=xencommons.service +After=xencommons.service + Documentation=man:libvirtd(8) + Documentation=http://libvirt.org - [Service] - EnvironmentFile=-/etc/sysconfig/libvirtd ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:46.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:46.000000000 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.2.0/src/locking/virtlockd.sysconf +Index: libvirt-1.2.1/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.0/src/locking/virtlockd.sysconf +--- libvirt-1.2.1.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.1/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,20 +12,22 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.2.0/src/locking/virtlockd.init.in +Index: libvirt-1.2.1/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.0.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.0/src/locking/virtlockd.init.in -@@ -4,11 +4,13 @@ +--- libvirt-1.2.1.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.1/src/locking/virtlockd.init.in +@@ -4,12 +4,14 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # ### BEGIN INIT INFO -# Provides: virtlockd --# Default-Start: 3 4 5 +-# Default-Start: +-# Default-Stop: 0 1 2 3 4 5 6 +# Provides: virtlockd +# Required-Start: $network $remote_fs -+# Default-Start: 3 4 5 ++# Default-Start: 3 5 +# Required-Stop: $network $remote_fs ++# Default-Stop: 0 1 2 4 6 # Short-Description: virtual machine lock manager -# Description: This is a daemon for managing locks -# on virtual machine disk images @@ -34,8 +36,8 @@ ### END INIT INFO # the following is chkconfig init header -@@ -23,35 +25,33 @@ - # pidfile: @localstatedir@/run/libvirt/virtlockd.pid +@@ -24,35 +26,33 @@ + # pidfile: @localstatedir@/run/virtlockd.pid # -# Source function library. @@ -45,7 +47,7 @@ SERVICE=virtlockd -PROCESS=virtlockd --PIDFILE=@localstatedir@/run/libvirt/lockd/$SERVICE.pid +-PIDFILE=@localstatedir@/run/$SERVICE.pid +PROCESS=@sbindir@/virtlockd +PIDDIR=@localstatedir@/run/libvirt/lockd/ +PIDFILE=$PIDDIR/$SERVICE.pid @@ -82,10 +84,10 @@ rm -f $PIDFILE fi } -@@ -65,9 +65,7 @@ reload() { +@@ -66,9 +66,7 @@ reload() { echo -n $"Reloading $SERVICE configuration: " - killproc -p $PIDFILE $PROCESS -HUP + killproc -p $PIDFILE $PROCESS -USR1 - RETVAL=$? - echo - return $RETVAL @@ -93,7 +95,7 @@ } # See how we were called. -@@ -76,18 +74,20 @@ case "$1" in +@@ -77,18 +75,20 @@ case "$1" in $1 ;; status) ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:46.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:46.000000000 +0100 @@ -14,10 +14,10 @@ is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-1.2.0/src/xen/xend_internal.c +Index: libvirt-1.2.1/src/xen/xend_internal.c =================================================================== ---- libvirt-1.2.0.orig/src/xen/xend_internal.c -+++ libvirt-1.2.0/src/xen/xend_internal.c +--- libvirt-1.2.1.orig/src/xen/xend_internal.c ++++ libvirt-1.2.1/src/xen/xend_internal.c @@ -70,7 +70,7 @@ #define XEND_RCV_BUF_MAX_LEN (256 * 1024) @@ -27,7 +27,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, int ref_len); -@@ -3316,18 +3316,18 @@ xenDaemonDomainBlockPeek(virConnectPtr c +@@ -3325,18 +3325,18 @@ xenDaemonDomainBlockPeek(virConnectPtr c * Returns 0 in case of success, -1 in case of failure. */ static int @@ -50,7 +50,7 @@ if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); -@@ -3337,19 +3337,17 @@ virDomainXMLDevID(virConnectPtr conn, +@@ -3346,19 +3346,17 @@ virDomainXMLDevID(virConnectPtr conn, else strcpy(class, "vbd"); @@ -81,7 +81,7 @@ } else if (dev->type == VIR_DOMAIN_DEVICE_NET) { char mac[VIR_MAC_STRING_BUFLEN]; virDomainNetDefPtr netdef = dev->data.net; -@@ -3357,16 +3355,22 @@ virDomainXMLDevID(virConnectPtr conn, +@@ -3366,16 +3364,22 @@ virDomainXMLDevID(virConnectPtr conn, strcpy(class, "vif"); @@ -114,7 +114,7 @@ } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { -@@ -3382,17 +3386,44 @@ virDomainXMLDevID(virConnectPtr conn, +@@ -3391,17 +3395,44 @@ virDomainXMLDevID(virConnectPtr conn, strcpy(class, "pci"); ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.H6Dyu5/_old 2014-01-23 15:48:46.000000000 +0100 +++ /var/tmp/diff_new_pack.H6Dyu5/_new 2014-01-23 15:48:46.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.0/src/xenxs/xen_sxpr.c +Index: libvirt-1.2.1/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.2.0.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.2.0/src/xenxs/xen_sxpr.c +--- libvirt-1.2.1.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.2.1/src/xenxs/xen_sxpr.c @@ -330,7 +330,7 @@ error: static int xenParseSxprDisks(virDomainDefPtr def, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
