Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2012-08-22 14:36:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt", Maintainer is "JFEHLIG@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2012-08-04 13:22:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2012-08-22 14:36:39.000000000 +0200
@@ -1,0 +2,25 @@
+Wed Aug 8 11:42:28 MDT 2012 - jfehlig@suse.com
+
+- Update to libvirt 0.9.13
+ - S390: support for s390(x)
+ - snapshot: implement new APIs for esx and vbox
+ - snapshot: new query APIs and many improvements
+ - virsh: Allow users to reedit rejected XML
+ - nwfilter: add DHCP snooping
+ - storage backend: Add RBD (RADOS Block Device) support
+ - sVirt support for LXC domains inprovement
+ - Drop upstream patches
+ 0dda594d-libvirtd-shutdown-deadlock.patch
+ 9c77bf04-fix-virnetserver-refcnt.patch
+ 57349ffc-lxc-ctrl.patch
+ revert-d8978c90.patch
+
+-------------------------------------------------------------------
+Mon Aug 6 18:02:14 MDT 2012 - jfehlig@suse.com
+
+_ Update to libvirt 0.9.12
+ - qemu: allow snapshotting of sheepdog and rbd disks
+ - blockjob: add new AP
+ - many bug fixes and improvements
+
+-------------------------------------------------------------------
Old:
----
0dda594d-libvirtd-shutdown-deadlock.patch
57349ffc-lxc-ctrl.patch
9c77bf04-fix-virnetserver-refcnt.patch
libvirt-0.9.11.4.tar.bz2
revert-d8978c90.patch
New:
----
libvirt-0.9.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -26,6 +26,9 @@
%define server_drivers 1
%endif
+# Do not build with dlopen'd modules for now
+%define with_driver_modules 0
+
# Now set the defaults for all the important features, independent
# of any particular OS
@@ -327,7 +330,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 0.9.11.4
+Version: 0.9.13
Release: 0
Summary: A C toolkit to interact with the virtualization capabilities of Linux
License: LGPL-2.1+
@@ -410,13 +413,8 @@
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
-# Revert v0.9.11-maint branch commit d8978c90
-Patch0: revert-d8978c90.patch
-Patch1: 57349ffc-lxc-ctrl.patch
-Patch2: 0dda594d-libvirtd-shutdown-deadlock.patch
-Patch3: 9c77bf04-fix-virnetserver-refcnt.patch
-Patch4: 4036aa91-systemd.patch
-Patch5: 6039a2cb-CVE-2012-3445.patch
+Patch0: 4036aa91-systemd.patch
+Patch1: 6039a2cb-CVE-2012-3445.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@@ -554,10 +552,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%patch100 -p1
%patch101
%patch102 -p1
@@ -696,6 +690,9 @@
%else
%define init_scripts --with-init_script=redhat
%endif
+%if ! %{with_driver_modules}
+%define _without_driver_modules --without-driver-modules
+%endif
autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS"
@@ -738,6 +735,7 @@
%{?_without_python} \
%{?_without_libpcap} \
%{?_without_sanlock} \
+ %{?_without_driver_modules} \
--libexecdir=%{_libdir}/%{name} \
--with-qemu-user=%{qemu_user} \
--with-qemu-group=%{qemu_group} \
++++++ 4036aa91-systemd.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -12,10 +12,10 @@
qemuAutostartDomain:177 : Failed to autostart VM 'test': Cannot get
interface MTU on 'br0': No such device
-Index: libvirt-0.9.11.4/daemon/libvirtd.service.in
+Index: libvirt-0.9.13/daemon/libvirtd.service.in
===================================================================
---- libvirt-0.9.11.4.orig/daemon/libvirtd.service.in
-+++ libvirt-0.9.11.4/daemon/libvirtd.service.in
+--- libvirt-0.9.13.orig/daemon/libvirtd.service.in
++++ libvirt-0.9.13/daemon/libvirtd.service.in
@@ -6,6 +6,7 @@
[Unit]
Description=Virtualization daemon
++++++ 6039a2cb-CVE-2012-3445.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -21,10 +21,10 @@
Let's make sure params stays NULL when nparams is 0.
-Index: libvirt-0.9.11.4/daemon/remote.c
+Index: libvirt-0.9.13/daemon/remote.c
===================================================================
---- libvirt-0.9.11.4.orig/daemon/remote.c
-+++ libvirt-0.9.11.4/daemon/remote.c
+--- libvirt-0.9.13.orig/daemon/remote.c
++++ libvirt-0.9.13/daemon/remote.c
@@ -964,7 +964,7 @@ remoteDispatchDomainGetSchedulerParamete
virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup;
@@ -34,7 +34,7 @@
goto no_memory;
if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
-@@ -1019,7 +1019,7 @@ remoteDispatchDomainGetSchedulerParamete
+@@ -1073,7 +1073,7 @@ remoteDispatchDomainGetSchedulerParamete
virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup;
}
@@ -43,7 +43,7 @@
goto no_memory;
if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
-@@ -1200,7 +1200,7 @@ remoteDispatchDomainBlockStatsFlags(virN
+@@ -1254,7 +1254,7 @@ remoteDispatchDomainBlockStatsFlags(virN
virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup;
}
@@ -52,7 +52,7 @@
virReportOOMError();
goto cleanup;
}
-@@ -1674,7 +1674,7 @@ remoteDispatchDomainGetMemoryParameters(
+@@ -1728,7 +1728,7 @@ remoteDispatchDomainGetMemoryParameters(
virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup;
}
@@ -61,7 +61,7 @@
virReportOOMError();
goto cleanup;
}
-@@ -1739,7 +1739,7 @@ remoteDispatchDomainGetNumaParameters(vi
+@@ -1793,7 +1793,7 @@ remoteDispatchDomainGetNumaParameters(vi
virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup;
}
@@ -70,7 +70,7 @@
virReportOOMError();
goto cleanup;
}
-@@ -1804,7 +1804,7 @@ remoteDispatchDomainGetBlkioParameters(v
+@@ -1858,7 +1858,7 @@ remoteDispatchDomainGetBlkioParameters(v
virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup;
}
@@ -79,7 +79,7 @@
virReportOOMError();
goto cleanup;
}
-@@ -2064,7 +2064,7 @@ remoteDispatchDomainGetBlockIoTune(virNe
+@@ -2118,7 +2118,7 @@ remoteDispatchDomainGetBlockIoTune(virNe
goto cleanup;
}
@@ -88,7 +88,7 @@
virReportOOMError();
goto cleanup;
}
-@@ -3563,7 +3563,7 @@ remoteDispatchDomainGetInterfaceParamete
+@@ -3621,7 +3621,7 @@ remoteDispatchDomainGetInterfaceParamete
virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
goto cleanup;
}
++++++ AF_PACKET.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-0.9.11.4/src/util/virnetdev.c
+Index: libvirt-0.9.13/src/util/virnetdev.c
===================================================================
---- libvirt-0.9.11.4.orig/src/util/virnetdev.c
-+++ libvirt-0.9.11.4/src/util/virnetdev.c
+--- libvirt-0.9.13.orig/src/util/virnetdev.c
++++ libvirt-0.9.13/src/util/virnetdev.c
@@ -85,7 +85,7 @@ static int virNetDevSetupControlFull(con
static int virNetDevSetupControl(const char *ifname,
struct ifreq *ifr)
@@ -11,10 +11,10 @@
}
#endif
-Index: libvirt-0.9.11.4/src/util/virnetdevbridge.c
+Index: libvirt-0.9.13/src/util/virnetdevbridge.c
===================================================================
---- libvirt-0.9.11.4.orig/src/util/virnetdevbridge.c
-+++ libvirt-0.9.11.4/src/util/virnetdevbridge.c
+--- libvirt-0.9.13.orig/src/util/virnetdevbridge.c
++++ libvirt-0.9.13/src/util/virnetdevbridge.c
@@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con
static int virNetDevSetupControl(const char *ifname,
struct ifreq *ifr)
++++++ clone.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- src/lxc/lxc_container.c.orig
+++ src/lxc/lxc_container.c
-@@ -1454,6 +1454,9 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -1791,6 +1791,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;
-@@ -1473,7 +1476,11 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -1810,7 +1813,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);
-@@ -1499,6 +1506,7 @@ int lxcContainerAvailable(int features)
+@@ -1836,6 +1843,7 @@ int lxcContainerAvailable(int features)
int cpid;
char *childStack;
char *stack;
@@ -32,7 +32,7 @@
if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER;
-@@ -1506,14 +1514,21 @@ int lxcContainerAvailable(int features)
+@@ -1843,14 +1851,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;
++++++ install-apparmor-profiles.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-0.9.11.4/examples/apparmor/Makefile.am
+Index: libvirt-0.9.13/examples/apparmor/Makefile.am
===================================================================
---- libvirt-0.9.11.4.orig/examples/apparmor/Makefile.am
-+++ libvirt-0.9.11.4/examples/apparmor/Makefile.am
+--- libvirt-0.9.13.orig/examples/apparmor/Makefile.am
++++ libvirt-0.9.13/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-0.9.11.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-0.9.13/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
-+++ libvirt-0.9.11.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ libvirt-0.9.13/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,40 @@
+# Last Modified: Fri Aug 19 11:21:48 2011
+#include
@@ -92,9 +92,9 @@
+ /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r,
+}
-Index: libvirt-0.9.11.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-0.9.13/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
---- libvirt-0.9.11.4.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-0.9.13.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-0.9.11.4/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-0.9.13/examples/apparmor/usr.sbin.libvirtd
===================================================================
---- libvirt-0.9.11.4.orig/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-0.9.13.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
@@ -192,11 +192,11 @@
- change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
-
-}
-Index: libvirt-0.9.11.4/examples/apparmor/usr.sbin.libvirtd.in
+Index: libvirt-0.9.13/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
-+++ libvirt-0.9.11.4/examples/apparmor/usr.sbin.libvirtd.in
-@@ -0,0 +1,58 @@
++++ libvirt-0.9.13/examples/apparmor/usr.sbin.libvirtd.in
+@@ -0,0 +1,57 @@
+# Last Modified: Fri Aug 19 11:20:36 2011
+#include
+@{LIBVIRT}="libvirt"
@@ -222,7 +222,6 @@
+ capability mknod,
+ capability fsetid,
+ capability ipc_lock,
-+ capability audit_write,
+
+ network inet stream,
+ network inet dgram,
@@ -255,10 +254,10 @@
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
-Index: libvirt-0.9.11.4/examples/apparmor/libvirt-qemu
+Index: libvirt-0.9.13/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-0.9.11.4.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-0.9.11.4/examples/apparmor/libvirt-qemu
+--- libvirt-0.9.13.orig/examples/apparmor/libvirt-qemu
++++ libvirt-0.9.13/examples/apparmor/libvirt-qemu
@@ -52,6 +52,7 @@
# access to firmware's etc
/usr/share/kvm/** r,
++++++ libvirt-0.9.11.4.tar.bz2 -> libvirt-0.9.13.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-0.9.11.4.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-0.9.13.tar.bz2 differ: char 11, line 1
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-0.9.11.4/configure.ac
+Index: libvirt-0.9.13/configure.ac
===================================================================
---- libvirt-0.9.11.4.orig/configure.ac
-+++ libvirt-0.9.11.4/configure.ac
+--- libvirt-0.9.13.orig/configure.ac
++++ libvirt-0.9.13/configure.ac
@@ -63,6 +63,7 @@ AVAHI_REQUIRED="0.6.0"
POLKIT_REQUIRED="0.6"
PARTED_REQUIRED="1.8.0"
@@ -10,7 +10,7 @@
UDEV_REQUIRED=145
PCIACCESS_REQUIRED=0.10.0
XMLRPC_REQUIRED=1.14.0
-@@ -1756,6 +1757,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
+@@ -1796,6 +1797,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
AC_SUBST([NETCF_CFLAGS])
AC_SUBST([NETCF_LIBS])
@@ -49,7 +49,7 @@
AC_ARG_WITH([secrets],
AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes])
-@@ -2701,6 +2734,7 @@ AC_MSG_NOTICE([ Remote: $with_remote])
+@@ -2810,6 +2843,7 @@ AC_MSG_NOTICE([ Remote: $with_remote])
AC_MSG_NOTICE([ Network: $with_network])
AC_MSG_NOTICE([Libvirtd: $with_libvirtd])
AC_MSG_NOTICE([ netcf: $with_netcf])
@@ -57,7 +57,7 @@
AC_MSG_NOTICE([ macvtap: $with_macvtap])
AC_MSG_NOTICE([virtport: $with_virtualport])
AC_MSG_NOTICE([])
-@@ -2832,6 +2866,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
+@@ -2942,6 +2976,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
else
AC_MSG_NOTICE([ netcf: no])
fi
@@ -69,11 +69,11 @@
if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then
AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS])
else
-Index: libvirt-0.9.11.4/daemon/Makefile.am
+Index: libvirt-0.9.13/daemon/Makefile.am
===================================================================
---- libvirt-0.9.11.4.orig/daemon/Makefile.am
-+++ libvirt-0.9.11.4/daemon/Makefile.am
-@@ -143,6 +143,10 @@ endif
+--- libvirt-0.9.13.orig/daemon/Makefile.am
++++ libvirt-0.9.13/daemon/Makefile.am
+@@ -150,6 +150,10 @@ endif
if WITH_NETCF
libvirtd_LDADD += ../src/libvirt_driver_interface.la
@@ -84,10 +84,10 @@
endif
if WITH_NODE_DEVICES
-Index: libvirt-0.9.11.4/daemon/libvirtd.c
+Index: libvirt-0.9.13/daemon/libvirtd.c
===================================================================
---- libvirt-0.9.11.4.orig/daemon/libvirtd.c
-+++ libvirt-0.9.11.4/daemon/libvirtd.c
+--- libvirt-0.9.13.orig/daemon/libvirtd.c
++++ libvirt-0.9.13/daemon/libvirtd.c
@@ -76,6 +76,10 @@
# endif
# ifdef WITH_NETCF
@@ -97,9 +97,9 @@
+# include "interface/netcf_driver.h"
+# endif
# endif
- # ifdef WITH_STORAGE_DIR
+ # ifdef WITH_STORAGE
# include "storage/storage_driver.h"
-@@ -415,6 +419,10 @@ static void daemonInitialize(void)
+@@ -402,6 +406,10 @@ static void daemonInitialize(void)
# endif
# ifdef WITH_NETCF
interfaceRegister();
@@ -108,13 +108,13 @@
+ interfaceRegister();
+# endif
# endif
- # ifdef WITH_STORAGE_DIR
+ # ifdef WITH_STORAGE
storageRegister();
-Index: libvirt-0.9.11.4/src/Makefile.am
+Index: libvirt-0.9.13/src/Makefile.am
===================================================================
---- libvirt-0.9.11.4.orig/src/Makefile.am
-+++ libvirt-0.9.11.4/src/Makefile.am
-@@ -970,6 +970,24 @@ libvirt_driver_interface_la_LIBADD += ..
+--- libvirt-0.9.13.orig/src/Makefile.am
++++ libvirt-0.9.13/src/Makefile.am
+@@ -941,6 +941,24 @@ libvirt_driver_interface_la_LIBADD += ..
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
endif
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
@@ -139,10 +139,10 @@
endif
if WITH_SECRETS
-Index: libvirt-0.9.11.4/src/interface/netcf_driver.c
+Index: libvirt-0.9.13/src/interface/netcf_driver.c
===================================================================
---- libvirt-0.9.11.4.orig/src/interface/netcf_driver.c
-+++ libvirt-0.9.11.4/src/interface/netcf_driver.c
+--- libvirt-0.9.13.orig/src/interface/netcf_driver.c
++++ libvirt-0.9.13/src/interface/netcf_driver.c
@@ -23,7 +23,13 @@
#include
@@ -208,18 +208,18 @@
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
-Index: libvirt-0.9.11.4/tools/virsh.c
+Index: libvirt-0.9.13/tools/virsh.c
===================================================================
---- libvirt-0.9.11.4.orig/tools/virsh.c
-+++ libvirt-0.9.11.4/tools/virsh.c
-@@ -19827,6 +19827,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+--- libvirt-0.9.13.orig/tools/virsh.c
++++ libvirt-0.9.13/tools/virsh.c
+@@ -20837,6 +20837,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
#endif
#ifdef WITH_NETCF
- vshPrint(ctl, " Netcf");
+ vshPrint(ctl, " Interface");
+#else
-+#ifdef WITH_NETCONTROL
-+ vshPrint(ctl, " NetControl");
-+#endif
++# ifdef WITH_NETCONTROL
++ vshPrint(ctl, " Interface");
++# endif
#endif
#ifdef WITH_NWFILTER
vshPrint(ctl, " Nwfilter");
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-0.9.11.4/daemon/libvirtd.conf
+Index: libvirt-0.9.13/daemon/libvirtd.conf
===================================================================
---- libvirt-0.9.11.4.orig/daemon/libvirtd.conf
-+++ libvirt-0.9.11.4/daemon/libvirtd.conf
+--- libvirt-0.9.13.orig/daemon/libvirtd.conf
++++ libvirt-0.9.13/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@@ -13,11 +13,11 @@
# 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-0.9.11.4/daemon/libvirtd.c
+Index: libvirt-0.9.13/daemon/libvirtd-config.c
===================================================================
---- libvirt-0.9.11.4.orig/daemon/libvirtd.c
-+++ libvirt-0.9.11.4/daemon/libvirtd.c
-@@ -872,7 +872,7 @@ daemonConfigNew(bool privileged ATTRIBUT
+--- libvirt-0.9.13.orig/daemon/libvirtd-config.c
++++ libvirt-0.9.13/daemon/libvirtd-config.c
+@@ -237,7 +237,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL;
}
++++++ relax-qemu-usergroup-check.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -7,10 +7,10 @@
daemon. Then the qemu driver would only be loaded when needed,
which would never be the case on a xen-only configuration.
-Index: libvirt-0.9.11.4/src/qemu/qemu_conf.c
+Index: libvirt-0.9.13/src/qemu/qemu_conf.c
===================================================================
---- libvirt-0.9.11.4.orig/src/qemu/qemu_conf.c
-+++ libvirt-0.9.11.4/src/qemu/qemu_conf.c
+--- libvirt-0.9.13.orig/src/qemu/qemu_conf.c
++++ libvirt-0.9.13/src/qemu/qemu_conf.c
@@ -271,9 +271,7 @@ int qemudLoadDriverConfig(struct qemud_d
return -1;
}
++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-0.9.11.4/src/qemu/qemu.conf
+Index: libvirt-0.9.13/src/qemu/qemu.conf
===================================================================
---- libvirt-0.9.11.4.orig/src/qemu/qemu.conf
-+++ libvirt-0.9.11.4/src/qemu/qemu.conf
+--- libvirt-0.9.13.orig/src/qemu/qemu.conf
++++ libvirt-0.9.13/src/qemu/qemu.conf
@@ -146,7 +146,16 @@
# leaving SELinux enabled for the host in general, then set this
# to 'none' instead.
++++++ use-init-script-redhat.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -1,8 +1,8 @@
-Index: libvirt-0.9.11.4/tools/Makefile.am
+Index: libvirt-0.9.13/tools/Makefile.am
===================================================================
---- libvirt-0.9.11.4.orig/tools/Makefile.am
-+++ libvirt-0.9.11.4/tools/Makefile.am
-@@ -182,24 +182,22 @@ install-data-local: install-init install
+--- libvirt-0.9.13.orig/tools/Makefile.am
++++ libvirt-0.9.13/tools/Makefile.am
+@@ -148,24 +148,22 @@ install-data-local: install-init install
uninstall-local: uninstall-init uninstall-systemd
install-sysconfig:
@@ -33,10 +33,10 @@
if LIBVIRT_INIT_SCRIPT_RED_HAT
-Index: libvirt-0.9.11.4/tools/libvirt-guests.sysconf
+Index: libvirt-0.9.13/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-0.9.11.4.orig/tools/libvirt-guests.sysconf
-+++ libvirt-0.9.11.4/tools/libvirt-guests.sysconf
+--- libvirt-0.9.13.orig/tools/libvirt-guests.sysconf
++++ libvirt-0.9.13/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt
+
@@ -101,10 +101,10 @@
# some file systems.
-#BYPASS_CACHE=0
+BYPASS_CACHE=0
-Index: libvirt-0.9.11.4/tools/libvirt-guests.init.sh
+Index: libvirt-0.9.13/tools/libvirt-guests.init.sh
===================================================================
---- libvirt-0.9.11.4.orig/tools/libvirt-guests.init.sh
-+++ libvirt-0.9.11.4/tools/libvirt-guests.init.sh
+--- libvirt-0.9.13.orig/tools/libvirt-guests.init.sh
++++ libvirt-0.9.13/tools/libvirt-guests.init.sh
@@ -4,10 +4,10 @@
#
### BEGIN INIT INFO
@@ -252,11 +252,11 @@
esac
-exit $RETVAL
+rc_exit
-Index: libvirt-0.9.11.4/daemon/Makefile.am
+Index: libvirt-0.9.13/daemon/Makefile.am
===================================================================
---- libvirt-0.9.11.4.orig/daemon/Makefile.am
-+++ libvirt-0.9.11.4/daemon/Makefile.am
-@@ -249,22 +249,16 @@ uninstall-logrotate:
+--- libvirt-0.9.13.orig/daemon/Makefile.am
++++ libvirt-0.9.13/daemon/Makefile.am
+@@ -256,39 +256,23 @@ uninstall-logrotate:
rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
install-sysconfig:
@@ -264,43 +264,46 @@
+ $(MKDIR_P) $(DESTDIR)$(localstatedir)/adm/fillup-templates
$(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
-+ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
-+
- uninstall-sysconfig:
+-uninstall-sysconfig:
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
-+ rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
++ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
- if WITH_SYSCTL
- install-sysctl:
+-if WITH_SYSCTL
+-install-sysctl:
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d
- $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
- $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
--
- uninstall-sysctl:
++uninstall-sysconfig:
++ rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
+
+-uninstall-sysctl:
- rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
- rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || :
- else
+-else
install-sysctl:
uninstall-sysctl:
-@@ -275,13 +269,7 @@ if LIBVIRT_INIT_SCRIPT_RED_HAT
+-endif
+
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+
BUILT_SOURCES += libvirtd.init
install-init-redhat: install-sysconfig libvirtd.init
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
- $(INSTALL_SCRIPT) libvirtd.init \
- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
--
+
uninstall-init-redhat: uninstall-sysconfig
- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
- rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
else
install-init-redhat:
uninstall-init-redhat:
-Index: libvirt-0.9.11.4/daemon/libvirtd.sysconf
+Index: libvirt-0.9.13/daemon/libvirtd.sysconf
===================================================================
---- libvirt-0.9.11.4.orig/daemon/libvirtd.sysconf
-+++ libvirt-0.9.11.4/daemon/libvirtd.sysconf
+--- libvirt-0.9.13.orig/daemon/libvirtd.sysconf
++++ libvirt-0.9.13/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
++++++ xen-name-for-devid.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -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-0.9.11.4/src/xen/xend_internal.c
+Index: libvirt-0.9.13/src/xen/xend_internal.c
===================================================================
---- libvirt-0.9.11.4.orig/src/xen/xend_internal.c
-+++ libvirt-0.9.11.4/src/xen/xend_internal.c
+--- libvirt-0.9.13.orig/src/xen/xend_internal.c
++++ libvirt-0.9.13/src/xen/xend_internal.c
@@ -60,6 +60,7 @@
static int
++++++ xen-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.79iYAK/_old 2012-08-22 14:36:42.000000000 +0200
+++ /var/tmp/diff_new_pack.79iYAK/_new 2012-08-22 14:36:42.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-0.9.11.4/src/xenxs/xen_sxpr.c
+Index: libvirt-0.9.13/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-0.9.11.4.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-0.9.11.4/src/xenxs/xen_sxpr.c
+--- libvirt-0.9.13.orig/src/xenxs/xen_sxpr.c
++++ libvirt-0.9.13/src/xenxs/xen_sxpr.c
@@ -340,7 +340,7 @@ error:
static int
xenParseSxprDisks(virDomainDefPtr def,
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org