Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2013-02-04 18:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2013-01-24 10:24:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2013-02-04 18:00:17.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 30 11:28:32 MST 2013 - [email protected] + +- Update to libvirt 1.0.2 + - LXC improvements + - S390 architecture improvements + - Power architecture improvements + - large Coverity report cleanups and associated bug fixes + - virTypedParams* APIs to help with those data structures + - libxenlight driver improvements + - Fixes CVE-2013-0170, bnc#800976 + - Drop upstream patches: 68e7bc45-libxl-link-fix.patch, + 462a6962-script-fixes1.patch, cb854b8f-script-fixes2.patch, + 5ec4b22b-script-fixes3.patch, a1fd56cb-script-fixes4.patch, + 66ff2ddc-virtlockd-systemd-file-perms.patch + +------------------------------------------------------------------- Old: ---- 462a6962-script-fixes1.patch 5ec4b22b-script-fixes3.patch 66ff2ddc-virtlockd-systemd-file-perms.patch 68e7bc45-libxl-link-fix.patch a1fd56cb-script-fixes4.patch cb854b8f-script-fixes2.patch libvirt-1.0.1.tar.bz2 New: ---- libvirt-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -337,7 +337,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: A C toolkit to interact with the virtualization capabilities of Linux License: LGPL-2.1+ @@ -417,12 +417,6 @@ Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: 66ff2ddc-virtlockd-systemd-file-perms.patch -Patch1: 462a6962-script-fixes1.patch -Patch2: cb854b8f-script-fixes2.patch -Patch3: 5ec4b22b-script-fixes3.patch -Patch4: a1fd56cb-script-fixes4.patch -Patch5: 68e7bc45-libxl-link-fix.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch @@ -562,12 +556,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %patch100 -p1 %patch101 %patch102 -p1 @@ -1088,6 +1076,7 @@ %dir %{_datadir}/libvirt/api/ %{_datadir}/libvirt/api/libvirt-api.xml %{_datadir}/libvirt/api/libvirt-qemu-api.xml +%{_datadir}/libvirt/api/libvirt-lxc-api.xml %files doc %defattr(-, root, root) @@ -1125,7 +1114,8 @@ %defattr(-, root, root) %doc %{_docdir}/%{name}-python %{py_sitedir}/libvirt.py* -%{_libdir}/python*/site-packages/libvirt_qemu.py* +%{py_sitedir}/libvirt_qemu.py* +%{py_sitedir}/libvirt_lxc.py* %{py_sitedir}/libvirtmod* %endif ++++++ AF_PACKET.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.0.1/src/util/virnetdev.c +Index: libvirt-1.0.2/src/util/virnetdev.c =================================================================== ---- libvirt-1.0.1.orig/src/util/virnetdev.c -+++ libvirt-1.0.1/src/util/virnetdev.c +--- libvirt-1.0.2.orig/src/util/virnetdev.c ++++ libvirt-1.0.2/src/util/virnetdev.c @@ -81,7 +81,7 @@ static int virNetDevSetupControlFull(con static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) @@ -11,11 +11,11 @@ } #endif -Index: libvirt-1.0.1/src/util/virnetdevbridge.c +Index: libvirt-1.0.2/src/util/virnetdevbridge.c =================================================================== ---- libvirt-1.0.1.orig/src/util/virnetdevbridge.c -+++ libvirt-1.0.1/src/util/virnetdevbridge.c -@@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con +--- libvirt-1.0.2.orig/src/util/virnetdevbridge.c ++++ libvirt-1.0.2/src/util/virnetdevbridge.c +@@ -85,7 +85,7 @@ static int virNetDevSetupControlFull(con static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) { ++++++ clone.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -1982,6 +1982,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2358,6 +2358,9 @@ int lxcContainerStart(virDomainDefPtr de ttyPaths, nttyPaths, handshakefd}; /* allocate a stack for the container */ @@ -12,7 +12,7 @@ if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -2001,7 +2004,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2377,7 +2380,11 @@ int lxcContainerStart(virDomainDefPtr de cflags |= CLONE_NEWNET; } @@ -24,7 +24,7 @@ VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -2027,6 +2034,7 @@ int lxcContainerAvailable(int features) +@@ -2403,6 +2410,7 @@ int lxcContainerAvailable(int features) int cpid; char *childStack; char *stack; @@ -32,7 +32,7 @@ if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -2034,14 +2042,21 @@ int lxcContainerAvailable(int features) +@@ -2410,14 +2418,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ install-apparmor-profiles.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.0.1/examples/apparmor/Makefile.am +Index: libvirt-1.0.2/examples/apparmor/Makefile.am =================================================================== ---- libvirt-1.0.1.orig/examples/apparmor/Makefile.am -+++ libvirt-1.0.1/examples/apparmor/Makefile.am +--- libvirt-1.0.2.orig/examples/apparmor/Makefile.am ++++ libvirt-1.0.2/examples/apparmor/Makefile.am @@ -1,8 +1,39 @@ ## Copyright (C) 2005-2011 Red Hat, Inc. ## See COPYING.LIB for the License of this software @@ -47,10 +47,10 @@ + rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE + +endif -Index: libvirt-1.0.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-1.0.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-1.0.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-1.0.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -0,0 +1,40 @@ +# Last Modified: Fri Aug 19 11:21:48 2011 +#include <tunables/global> @@ -92,9 +92,9 @@ + /var/lib/kvm/images/ r, + /var/lib/kvm/images/** r, +} -Index: libvirt-1.0.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-1.0.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-1.0.1.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-1.0.2.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ /dev/null @@ -1,38 +0,0 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 @@ -135,9 +135,9 @@ - /var/lib/libvirt/images/ r, - /var/lib/libvirt/images/** r, -} -Index: libvirt-1.0.1/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-1.0.2/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-1.0.1.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-1.0.2.orig/examples/apparmor/usr.sbin.libvirtd +++ /dev/null @@ -1,52 +0,0 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 @@ -192,10 +192,10 @@ - change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, - -} -Index: libvirt-1.0.1/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-1.0.2/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-1.0.1/examples/apparmor/usr.sbin.libvirtd.in ++++ libvirt-1.0.2/examples/apparmor/usr.sbin.libvirtd.in @@ -0,0 +1,57 @@ +# Last Modified: Fri Aug 19 11:20:36 2011 +#include <tunables/global> @@ -254,10 +254,10 @@ + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-1.0.1/examples/apparmor/libvirt-qemu +Index: libvirt-1.0.2/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.0.1.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.0.1/examples/apparmor/libvirt-qemu +--- libvirt-1.0.2.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.0.2/examples/apparmor/libvirt-qemu @@ -52,6 +52,7 @@ # access to firmware's etc /usr/share/kvm/** r, ++++++ libvirt-1.0.1.tar.bz2 -> libvirt-1.0.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-1.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.0.2.tar.bz2 differ: char 11, line 1 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.0.1/tools/libvirt-guests.init.in +Index: libvirt-1.0.2/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.0.1.orig/tools/libvirt-guests.init.in -+++ libvirt-1.0.1/tools/libvirt-guests.init.in +--- libvirt-1.0.2.orig/tools/libvirt-guests.init.in ++++ libvirt-1.0.2/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.0.1/tools/libvirt-guests.sh.in +Index: libvirt-1.0.2/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.0.1.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.0.1/tools/libvirt-guests.sh.in +--- libvirt-1.0.2.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.0.2/tools/libvirt-guests.sh.in @@ -1,13 +1,12 @@ #!/bin/sh @@ -187,10 +187,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-1.0.1/tools/libvirt-guests.sysconf +Index: libvirt-1.0.2/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.0.1.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.0.1/tools/libvirt-guests.sysconf +--- libvirt-1.0.2.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.0.2/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,55 +1,16 @@ -Index: libvirt-1.0.1/configure.ac +Index: libvirt-1.0.2/configure.ac =================================================================== ---- libvirt-1.0.1.orig/configure.ac -+++ libvirt-1.0.1/configure.ac -@@ -102,6 +102,7 @@ AVAHI_REQUIRED="0.6.0" - POLKIT_REQUIRED="0.6" - PARTED_REQUIRED="1.8.0" - NETCF_REQUIRED="0.1.4" -+NETCONTROL_REQUIRED="0.2.0" - UDEV_REQUIRED=145 - PCIACCESS_REQUIRED=0.10.0 - XMLRPC_REQUIRED=1.14.0 -@@ -2005,6 +2006,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit - AC_SUBST([NETCF_CFLAGS]) - AC_SUBST([NETCF_LIBS]) - -+AC_ARG_WITH([netcontrol], -+ AC_HELP_STRING([--with-netcontrol], [SUSE netcontrol support to configure physical host network interfaces @<:@default=check@:>@]), -+ [], -+ [test "$with_netcontrol" = "yes" && with_netcontrol=no || with_netcontrol=check]) -+ -+NETCONTROL_CFLAGS= -+NETCONTROL_LIBS= -+if test "$with_netcf" = "yes"; then -+ if test "$with_netcontrol" = "yes" || test "$with_netcontrol" = "check"; then -+ AC_MSG_WARN([netcf and netcontrol cannot be used together, disabling netcontrol]) -+ with_netcontrol=no -+ fi -+fi -+ -+if test "$with_netcontrol" = "yes" || test "$with_netcontrol" = "check"; then -+ PKG_CHECK_MODULES(NETCONTROL, netcontrol >= $NETCONTROL_REQUIRED, -+ [with_netcontrol=yes], [ -+ if test "$with_netcontrol" = "check" ; then -+ with_netcontrol=no -+ else -+ AC_MSG_ERROR( -+ [You must install netcontrol >= $NETCONTROL_REQUIRED to compile libvirt]) -+ fi -+ ]) -+ if test "$with_netcontrol" = "yes" ; then -+ AC_DEFINE_UNQUOTED([WITH_NETCONTROL], 1, -+ [whether libnetcontrol is available to configure physical host network interfaces]) -+ fi -+fi -+AM_CONDITIONAL([WITH_NETCONTROL], [test "$with_netcontrol" = "yes"]) -+AC_SUBST([NETCONTROL_CFLAGS]) -+AC_SUBST([NETCONTROL_LIBS]) - - AC_ARG_WITH([secrets], - AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes]) -@@ -2863,11 +2896,12 @@ if test "$with_libvirtd" = "no" ; then +--- libvirt-1.0.2.orig/configure.ac ++++ libvirt-1.0.2/configure.ac +@@ -153,6 +153,7 @@ LIBVIRT_CHECK_DBUS + LIBVIRT_CHECK_FUSE + LIBVIRT_CHECK_HAL + LIBVIRT_CHECK_NETCF ++LIBVIRT_CHECK_NETCONTROL + LIBVIRT_CHECK_NUMACTL + LIBVIRT_CHECK_OPENWSMAN + LIBVIRT_CHECK_PCIACCESS +@@ -2199,11 +2200,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -65,23 +26,19 @@ esac if test "$with_interface" = "yes" ; then -@@ -3253,6 +3287,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ - else - AC_MSG_NOTICE([ netcf: no]) - fi -+if test "$with_netcontrol" = "yes" ; then -+AC_MSG_NOTICE([ netctrl: $NETCONTROL_CFLAGS $NETCONTROL_LIBS]) -+else -+AC_MSG_NOTICE([ netctrl: no]) -+fi - if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then - AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) - else -Index: libvirt-1.0.1/src/Makefile.am +@@ -2473,6 +2475,7 @@ LIBVIRT_RESULT_DBUS + LIBVIRT_RESULT_FUSE + LIBVIRT_RESULT_HAL + LIBVIRT_RESULT_NETCF ++LIBVIRT_RESULT_NETCONTROL + LIBVIRT_RESULT_NUMACTL + LIBVIRT_RESULT_OPENWSMAN + LIBVIRT_RESULT_PCIACCESS +Index: libvirt-1.0.2/src/Makefile.am =================================================================== ---- libvirt-1.0.1.orig/src/Makefile.am -+++ libvirt-1.0.1/src/Makefile.am -@@ -617,6 +617,10 @@ if WITH_NETCF +--- libvirt-1.0.2.orig/src/Makefile.am ++++ libvirt-1.0.2/src/Makefile.am +@@ -633,6 +633,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif @@ -89,10 +46,10 @@ +INTERFACE_DRIVER_SOURCES += \ + interface/interface_backend_netcf.c +endif - if HAVE_UDEV + if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1105,11 +1109,16 @@ if WITH_NETCF +@@ -1121,11 +1125,16 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) else @@ -100,7 +57,7 @@ +libvirt_driver_interface_la_CFLAGS += $(NETCONTROL_CFLAGS) +libvirt_driver_interface_la_LIBADD += $(NETCONTROL_LIBS) +else - if HAVE_UDEV + if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) endif @@ -109,23 +66,23 @@ if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LDFLAGS += -module -avoid-version -Index: libvirt-1.0.1/tools/virsh.c +Index: libvirt-1.0.2/tools/virsh.c =================================================================== ---- libvirt-1.0.1.orig/tools/virsh.c -+++ libvirt-1.0.1/tools/virsh.c -@@ -2730,6 +2730,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-1.0.2.orig/tools/virsh.c ++++ libvirt-1.0.2/tools/virsh.c +@@ -2741,6 +2741,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE + vshPrint(ctl, " Interface"); + # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); - # elif defined(HAVE_UDEV) - vshPrint(ctl, " udev"); +# elif defined(WITH_NETCONTROL) + vshPrint(ctl, " netcontrol"); + # elif defined(WITH_UDEV) + vshPrint(ctl, " udev"); # endif - #endif - #ifdef WITH_NWFILTER -Index: libvirt-1.0.1/src/interface/interface_backend_netcf.c +Index: libvirt-1.0.2/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.0.1.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.0.1/src/interface/interface_backend_netcf.c +--- libvirt-1.0.2.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.0.2/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -138,7 +95,7 @@ +# include <netcf.h> +#endif - #include "virterror_internal.h" + #include "virerror.h" #include "datatypes.h" @@ -52,6 +57,37 @@ static void interfaceDriverUnlock(struct virMutexUnlock(&driver->lock); @@ -189,11 +146,11 @@ /* open netcf */ if (ncf_init(&driverState->netcf, NULL) != 0) { -Index: libvirt-1.0.1/src/interface/interface_driver.c +Index: libvirt-1.0.2/src/interface/interface_driver.c =================================================================== ---- libvirt-1.0.1.orig/src/interface/interface_driver.c -+++ libvirt-1.0.1/src/interface/interface_driver.c -@@ -28,8 +28,14 @@ interfaceRegister(void) { +--- libvirt-1.0.2.orig/src/interface/interface_driver.c ++++ libvirt-1.0.2/src/interface/interface_driver.c +@@ -28,8 +28,15 @@ interfaceRegister(void) { if (netcfIfaceRegister() == 0) return 0; #endif /* WITH_NETCF */ @@ -203,9 +160,50 @@ + if (netcfIfaceRegister() == 0) + return 0; +#endif /* WITH_NETCONTROL */ - #if HAVE_UDEV + #if WITH_UDEV - /* If there's no netcf or it failed to load, register the udev backend */ -+ /* If there's no netcf or netcontrol, or it failed to load, register the udev backend */ ++ /* If there's no netcf or netcontrol, or it failed to load, register the ++ udev backend */ if (udevIfaceRegister() == 0) return 0; - #endif /* HAVE_UDEV */ + #endif /* WITH_UDEV */ +Index: libvirt-1.0.2/m4/virt-netcontrol.m4 +=================================================================== +--- /dev/null ++++ libvirt-1.0.2/m4/virt-netcontrol.m4 +@@ -0,0 +1,35 @@ ++dnl The libnetcontrol library ++dnl ++dnl Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. ++dnl ++dnl This library is free software; you can redistribute it and/or ++dnl modify it under the terms of the GNU Lesser General Public ++dnl License as published by the Free Software Foundation; either ++dnl version 2.1 of the License, or (at your option) any later version. ++dnl ++dnl This library is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl Lesser General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU Lesser General Public ++dnl License along with this library. If not, see ++dnl <http://www.gnu.org/licenses/>. ++dnl ++ ++AC_DEFUN([LIBVIRT_CHECK_NETCONTROL],[ ++ LIBVIRT_CHECK_PKG([NETCONTROL], [netcontrol], [0.2.0]) ++ ++ if test "$with_netcontrol" = "yes" ; then ++ old_CFLAGS="$CFLAGS" ++ old_LIBS="$CFLAGS" ++ CFLAGS="$CFLAGS $NETCONTROL_CFLAGS" ++ LIBS="$LIBS $NETCONTROL_LIBS" ++ CFLAGS="$old_CFLAGS" ++ LIBS="$old_LIBS" ++ fi ++]) ++ ++AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ ++ LIBVIRT_RESULT_LIB([NETCONTROL]) ++]) ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.0.1/daemon/libvirtd.conf +Index: libvirt-1.0.2/daemon/libvirtd.conf =================================================================== ---- libvirt-1.0.1.orig/daemon/libvirtd.conf -+++ libvirt-1.0.1/daemon/libvirtd.conf +--- libvirt-1.0.2.orig/daemon/libvirtd.conf ++++ libvirt-1.0.2/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.0.1/daemon/libvirtd-config.c +Index: libvirt-1.0.2/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.0.1.orig/daemon/libvirtd-config.c -+++ libvirt-1.0.1/daemon/libvirtd-config.c +--- libvirt-1.0.2.orig/daemon/libvirtd-config.c ++++ libvirt-1.0.2/daemon/libvirtd-config.c @@ -233,7 +233,7 @@ daemonConfigNew(bool privileged ATTRIBUT return NULL; } ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.0.1/daemon/libvirtd.sysconf +Index: libvirt-1.0.2/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.0.1.orig/daemon/libvirtd.sysconf -+++ libvirt-1.0.1/daemon/libvirtd.sysconf +--- libvirt-1.0.2.orig/daemon/libvirtd.sysconf ++++ libvirt-1.0.2/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ relax-qemu-usergroup-check.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -7,11 +7,11 @@ daemon. Then the qemu driver would only be loaded when needed, which would never be the case on a xen-only configuration. -Index: libvirt-1.0.1/src/qemu/qemu_conf.c +Index: libvirt-1.0.2/src/qemu/qemu_conf.c =================================================================== ---- libvirt-1.0.1.orig/src/qemu/qemu_conf.c -+++ libvirt-1.0.1/src/qemu/qemu_conf.c -@@ -252,7 +252,7 @@ int qemuLoadDriverConfig(virQEMUDriverPt +--- libvirt-1.0.2.orig/src/qemu/qemu_conf.c ++++ libvirt-1.0.2/src/qemu/qemu_conf.c +@@ -247,7 +247,7 @@ int qemuLoadDriverConfig(virQEMUDriverPt goto no_memory; if (virGetUserID(user, &driver->user) < 0) @@ -20,7 +20,7 @@ p = virConfGetValue(conf, "group"); CHECK_TYPE("group", VIR_CONF_STRING); -@@ -260,7 +260,7 @@ int qemuLoadDriverConfig(virQEMUDriverPt +@@ -255,7 +255,7 @@ int qemuLoadDriverConfig(virQEMUDriverPt goto no_memory; if (virGetGroupID(group, &driver->group) < 0) ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.0.1/src/qemu/qemu.conf +Index: libvirt-1.0.2/src/qemu/qemu.conf =================================================================== ---- libvirt-1.0.1.orig/src/qemu/qemu.conf -+++ libvirt-1.0.1/src/qemu/qemu.conf +--- libvirt-1.0.2.orig/src/qemu/qemu.conf ++++ libvirt-1.0.2/src/qemu/qemu.conf @@ -169,7 +169,16 @@ # a special value; security_driver can be set to that value in # isolation, but it cannot appear in a list of drivers. ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.0.1/src/locking/virtlockd.sysconf +Index: libvirt-1.0.2/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.0.1.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.0.1/src/locking/virtlockd.sysconf +--- libvirt-1.0.2.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.0.2/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.0.1/src/locking/virtlockd.init.in +Index: libvirt-1.0.2/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.0.1.orig/src/locking/virtlockd.init.in -+++ libvirt-1.0.1/src/locking/virtlockd.init.in +--- libvirt-1.0.2.orig/src/locking/virtlockd.init.in ++++ libvirt-1.0.2/src/locking/virtlockd.init.in @@ -4,11 +4,13 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -13,10 +13,10 @@ This approach allows removing a disk when domain is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-1.0.1/src/xen/xend_internal.c +Index: libvirt-1.0.2/src/xen/xend_internal.c =================================================================== ---- libvirt-1.0.1.orig/src/xen/xend_internal.c -+++ libvirt-1.0.1/src/xen/xend_internal.c +--- libvirt-1.0.2.orig/src/xen/xend_internal.c ++++ libvirt-1.0.2/src/xen/xend_internal.c @@ -61,6 +61,7 @@ static int @@ -25,7 +25,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -2764,7 +2765,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr +@@ -2760,7 +2761,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -34,7 +34,7 @@ /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); -@@ -2885,7 +2886,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr +@@ -2881,7 +2882,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -43,7 +43,7 @@ virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("requested device does not exist")); goto cleanup; -@@ -2980,7 +2981,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr +@@ -2976,7 +2977,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; @@ -52,7 +52,7 @@ goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -3926,6 +3927,7 @@ struct xenUnifiedDriver xenDaemonDriver +@@ -3924,6 +3925,7 @@ struct xenUnifiedDriver xenDaemonDriver */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,7 +60,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -3934,8 +3936,12 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3932,8 +3934,12 @@ virDomainXMLDevID(virDomainPtr domain, xenUnifiedPrivatePtr priv = domain->conn->privateData; char *xref; char *tmp; @@ -73,7 +73,7 @@ if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); -@@ -3945,19 +3951,21 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3943,19 +3949,21 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd"); ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.1eFJ8u/_old 2013-02-04 18:00:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1eFJ8u/_new 2013-02-04 18:00:19.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.0.1/src/xenxs/xen_sxpr.c +Index: libvirt-1.0.2/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.0.1.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.0.1/src/xenxs/xen_sxpr.c +--- libvirt-1.0.2.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.0.2/src/xenxs/xen_sxpr.c @@ -341,7 +341,7 @@ error: static int xenParseSxprDisks(virDomainDefPtr def, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
