Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2014-07-04 17:18:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-25 21:20:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-07-04 17:18:50.000000000 +0200
@@ -1,0 +2,22 @@
+Wed Jul 2 12:49:36 MDT 2014 - jfehlig@suse.com
+
+- Move 'Requires' of qemu from libvirt-daemon-qemu subpackage to
+ libvirt-daemon-driver-qemu
+ bnc#885267
+
+-------------------------------------------------------------------
+Wed Jul 2 12:42:35 MDT 2014 - jfehlig@suse.com
+
+- Temporarily disable virt-aa-helper-test, which fails in Factory
+
+-------------------------------------------------------------------
+Wed Jul 2 11:31:22 MDT 2014 - jfehlig@suse.com
+
+- Update to libvirt 1.2.6
+ - libxl: add migration support and fixes
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Drop upstream patch libxl-migration-support.patch
+ - Drop ia64-clone.patch since libvirt is not built for IA64
+
+-------------------------------------------------------------------
Old:
----
ia64-clone.patch
libvirt-1.2.5.tar.bz2
libxl-migration-support.patch
New:
----
libvirt-1.2.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -235,7 +235,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 1.2.5
+Version: 1.2.6
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@@ -430,14 +430,12 @@
# Upstream patches
# Need to go upstream
Patch100: xen-name-for-devid.patch
-Patch101: ia64-clone.patch
-Patch102: xen-pv-cdrom.patch
-Patch103: add-nocow-to-vol-xml.patch
+Patch101: xen-pv-cdrom.patch
+Patch102: add-nocow-to-vol-xml.patch
# pending review upstream patches
-Patch150: libxl-migration-support.patch
-Patch151: lxc-keep-caps-feature.patch
-Patch152: lxc-keep-caps-feature-conversion.patch
-Patch153: lxc-keep-caps-feature-doc.patch
+Patch150: lxc-keep-caps-feature.patch
+Patch151: lxc-keep-caps-feature-conversion.patch
+Patch152: lxc-keep-caps-feature-doc.patch
# Our patches
Patch200: libvirtd-defaults.patch
Patch201: libvirtd-init-script.patch
@@ -685,6 +683,7 @@
%if 0%{?suse_version} > 1210
Requires: lzop
%endif
+Requires: qemu
%description daemon-driver-qemu
The qemu driver plugin for the libvirtd daemon, providing
@@ -775,7 +774,6 @@
Requires: libvirt-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release}
%endif
-Requires: qemu
%description daemon-qemu
Server side daemon and driver required to manage the virtualization
@@ -952,11 +950,9 @@
%patch100 -p1
%patch101 -p1
%patch102 -p1
-%patch103 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1
-%patch153 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1
@@ -1333,6 +1329,8 @@
%ifarch aarch64
EXTRA="$EXTRA virportallocatortest"
%endif
+# temporarily disable failing virt-aa-helper-test
+EXTRA="$EXTRA virt-aa-helper-test"
for i in nodeinfotest seclabeltest $EXTRA
do
rm -f $i
@@ -1504,6 +1502,7 @@
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
+%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper
%dir %{_datadir}/libvirt/networks/
%{_datadir}/libvirt/networks/default.xml
%endif
@@ -1579,6 +1578,7 @@
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
+%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper
%dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
%endif
@@ -1736,7 +1736,9 @@
%{_bindir}/virt-pki-validate
%{_bindir}/virt-host-validate
%dir %{_libdir}/%{name}
-%{_libdir}/lib*.so.*
+%{_libdir}/libvirt.so.*
+%{_libdir}/libvirt-qemu.so.*
+%{_libdir}/libvirt-lxc.so.*
%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
%if %{with_systemd}
@@ -1772,9 +1774,17 @@
%files devel
%defattr(-, root, root)
+%{_libdir}/libvirt.so
+%{_libdir}/libvirt-qemu.so
+%{_libdir}/libvirt-lxc.so
%{_includedir}/libvirt
-%{_libdir}/*.so
+%{_includedir}/libvirt/virterror.h
+%{_includedir}/libvirt/libvirt.h
+%{_includedir}/libvirt/libvirt-qemu.h
+%{_includedir}/libvirt/libvirt-lxc.h
%{_libdir}/pkgconfig/libvirt.pc
+%{_libdir}/pkgconfig/libvirt-qemu.pc
+%{_libdir}/pkgconfig/libvirt-lxc.pc
%dir %{_datadir}/libvirt/api/
%{_datadir}/libvirt/api/libvirt-api.xml
%{_datadir}/libvirt/api/libvirt-qemu-api.xml
++++++ add-nocow-to-vol-xml.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -8,10 +8,10 @@
Signed-off-by: Chunyan Liu
-Index: libvirt-1.2.5/docs/schemas/storagevol.rng
+Index: libvirt-1.2.6/docs/schemas/storagevol.rng
===================================================================
---- libvirt-1.2.5.orig/docs/schemas/storagevol.rng
-+++ libvirt-1.2.5/docs/schemas/storagevol.rng
+--- libvirt-1.2.6.orig/docs/schemas/storagevol.rng
++++ libvirt-1.2.6/docs/schemas/storagevol.rng
@@ -138,6 +138,11 @@
<ref name='compat'/>
</optional>
@@ -24,11 +24,11 @@
<ref name='fileFormatFeatures'/>
</optional>
</interleave>
-Index: libvirt-1.2.5/src/conf/storage_conf.c
+Index: libvirt-1.2.6/src/conf/storage_conf.c
===================================================================
---- libvirt-1.2.5.orig/src/conf/storage_conf.c
-+++ libvirt-1.2.5/src/conf/storage_conf.c
-@@ -1395,6 +1395,9 @@ virStorageVolDefParseXML(virStoragePoolD
+--- libvirt-1.2.6.orig/src/conf/storage_conf.c
++++ libvirt-1.2.6/src/conf/storage_conf.c
+@@ -1397,6 +1397,9 @@ virStorageVolDefParseXML(virStoragePoolD
virStringFreeList(version);
}
@@ -38,10 +38,10 @@
if (options->featureFromString && virXPathNode("./target/features", ctxt)) {
if ((n = virXPathNodeSet("./target/features/*", ctxt, &nodes)) < 0)
goto error;
-Index: libvirt-1.2.5/src/storage/storage_backend.c
+Index: libvirt-1.2.6/src/storage/storage_backend.c
===================================================================
---- libvirt-1.2.5.orig/src/storage/storage_backend.c
-+++ libvirt-1.2.5/src/storage/storage_backend.c
+--- libvirt-1.2.6.orig/src/storage/storage_backend.c
++++ libvirt-1.2.6/src/storage/storage_backend.c
@@ -37,6 +37,9 @@
#ifdef __linux__
# include
@@ -99,10 +99,10 @@
vol->target.features) < 0) {
virCommandFree(cmd);
return NULL;
-Index: libvirt-1.2.5/src/util/virstoragefile.h
+Index: libvirt-1.2.6/src/util/virstoragefile.h
===================================================================
---- libvirt-1.2.5.orig/src/util/virstoragefile.h
-+++ libvirt-1.2.5/src/util/virstoragefile.h
+--- libvirt-1.2.6.orig/src/util/virstoragefile.h
++++ libvirt-1.2.6/src/util/virstoragefile.h
@@ -232,6 +232,7 @@ struct _virStorageSource {
* pool-specific enum for storage volumes */
virBitmapPtr features;
++++++ disable-virCgroupGetPercpuStats-test.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.5/tests/vircgrouptest.c
+Index: libvirt-1.2.6/tests/vircgrouptest.c
===================================================================
---- libvirt-1.2.5.orig/tests/vircgrouptest.c
-+++ libvirt-1.2.5/tests/vircgrouptest.c
+--- libvirt-1.2.6.orig/tests/vircgrouptest.c
++++ libvirt-1.2.6/tests/vircgrouptest.c
@@ -33,7 +33,6 @@
# include "virlog.h"
# include "virfile.h"
++++++ fix-pci-attach-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -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.5/src/xen/xend_internal.c
+Index: libvirt-1.2.6/src/xen/xend_internal.c
===================================================================
---- libvirt-1.2.5.orig/src/xen/xend_internal.c
-+++ libvirt-1.2.5/src/xen/xend_internal.c
-@@ -2219,6 +2219,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
+--- libvirt-1.2.6.orig/src/xen/xend_internal.c
++++ libvirt-1.2.6/src/xen/xend_internal.c
+@@ -2222,6 +2222,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);
-@@ -2317,8 +2318,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr
+@@ -2320,8 +2321,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr
}
sexpr = virBufferContentAndReset(&buf);
++++++ install-apparmor-profiles.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.5/examples/apparmor/Makefile.am
+Index: libvirt-1.2.6/examples/apparmor/Makefile.am
===================================================================
---- libvirt-1.2.5.orig/examples/apparmor/Makefile.am
-+++ libvirt-1.2.5/examples/apparmor/Makefile.am
+--- libvirt-1.2.6.orig/examples/apparmor/Makefile.am
++++ libvirt-1.2.6/examples/apparmor/Makefile.am
@@ -18,10 +18,22 @@ EXTRA_DIST= \
TEMPLATE \
libvirt-qemu \
@@ -27,10 +27,10 @@
apparmordir = $(sysconfdir)/apparmor.d/
apparmor_DATA = \
usr.lib.libvirt.virt-aa-helper \
-Index: libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
-+++ libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,48 @@
+# Last Modified: Mon Apr 5 15:10:27 2010
+#include
@@ -80,10 +80,10 @@
+ /**.[iI][sS][oO] r,
+ /**/disk{,.*} r,
+}
-Index: libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd.in
+Index: libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
-+++ libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd.in
++++ libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,67 @@
+# Last Modified: Mon Apr 5 15:03:58 2010
+#include
@@ -152,9 +152,9 @@
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
-Index: libvirt-1.2.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
---- libvirt-1.2.5.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-1.2.6.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,48 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@@ -205,9 +205,9 @@
- /**.[iI][sS][oO] r,
- /**/disk{,.*} r,
-}
-Index: libvirt-1.2.5/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd
===================================================================
---- libvirt-1.2.5.orig/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-1.2.6.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,63 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
++++++ libvirt-1.2.5.tar.bz2 -> libvirt-1.2.6.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-1.2.5.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.2.6.tar.bz2 differ: char 11, line 1
++++++ libvirt-guests-init-script.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
-Index: libvirt-1.2.5/tools/libvirt-guests.init.in
+Index: libvirt-1.2.6/tools/libvirt-guests.init.in
===================================================================
---- libvirt-1.2.5.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.2.5/tools/libvirt-guests.init.in
+--- libvirt-1.2.6.orig/tools/libvirt-guests.init.in
++++ libvirt-1.2.6/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.5/tools/libvirt-guests.sh.in
+Index: libvirt-1.2.6/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-1.2.5.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.2.5/tools/libvirt-guests.sh.in
+--- libvirt-1.2.6.orig/tools/libvirt-guests.sh.in
++++ libvirt-1.2.6/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.5/tools/libvirt-guests.sysconf
+Index: libvirt-1.2.6/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-1.2.5.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.2.5/tools/libvirt-guests.sysconf
+--- libvirt-1.2.6.orig/tools/libvirt-guests.sysconf
++++ libvirt-1.2.6/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.5/configure.ac
+Index: libvirt-1.2.6/configure.ac
===================================================================
---- libvirt-1.2.5.orig/configure.ac
-+++ libvirt-1.2.5/configure.ac
+--- libvirt-1.2.6.orig/configure.ac
++++ libvirt-1.2.6/configure.ac
@@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL
@@ -26,7 +26,7 @@
esac
if test "$with_interface" = "yes" ; then
-@@ -2815,6 +2817,7 @@ LIBVIRT_RESULT_FUSE
+@@ -2822,6 +2824,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.5/src/Makefile.am
+Index: libvirt-1.2.6/src/Makefile.am
===================================================================
---- libvirt-1.2.5.orig/src/Makefile.am
-+++ libvirt-1.2.5/src/Makefile.am
-@@ -813,6 +813,10 @@ if WITH_NETCF
+--- libvirt-1.2.6.orig/src/Makefile.am
++++ libvirt-1.2.6/src/Makefile.am
+@@ -818,6 +818,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
-@@ -1403,10 +1407,15 @@ if WITH_NETCF
+@@ -1414,10 +1418,15 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else ! WITH_NETCF
@@ -65,11 +65,11 @@
endif ! WITH_NETCF
if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
-Index: libvirt-1.2.5/tools/virsh.c
+Index: libvirt-1.2.6/tools/virsh.c
===================================================================
---- libvirt-1.2.5.orig/tools/virsh.c
-+++ libvirt-1.2.5/tools/virsh.c
-@@ -3252,6 +3252,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+--- libvirt-1.2.6.orig/tools/virsh.c
++++ libvirt-1.2.6/tools/virsh.c
+@@ -3320,6 +3320,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
@@ -78,10 +78,10 @@
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
-Index: libvirt-1.2.5/src/interface/interface_backend_netcf.c
+Index: libvirt-1.2.6/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-1.2.5.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.2.5/src/interface/interface_backend_netcf.c
+--- libvirt-1.2.6.orig/src/interface/interface_backend_netcf.c
++++ libvirt-1.2.6/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include
@@ -165,10 +165,10 @@
return 0;
}
-Index: libvirt-1.2.5/src/interface/interface_driver.c
+Index: libvirt-1.2.6/src/interface/interface_driver.c
===================================================================
---- libvirt-1.2.5.orig/src/interface/interface_driver.c
-+++ libvirt-1.2.5/src/interface/interface_driver.c
+--- libvirt-1.2.6.orig/src/interface/interface_driver.c
++++ libvirt-1.2.6/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0)
return 0;
@@ -186,10 +186,10 @@
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
-Index: libvirt-1.2.5/m4/virt-netcontrol.m4
+Index: libvirt-1.2.6/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
-+++ libvirt-1.2.5/m4/virt-netcontrol.m4
++++ libvirt-1.2.6/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.5/daemon/libvirtd.conf
+Index: libvirt-1.2.6/daemon/libvirtd.conf
===================================================================
---- libvirt-1.2.5.orig/daemon/libvirtd.conf
-+++ libvirt-1.2.5/daemon/libvirtd.conf
+--- libvirt-1.2.6.orig/daemon/libvirtd.conf
++++ libvirt-1.2.6/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.5/daemon/libvirtd-config.c
+Index: libvirt-1.2.6/daemon/libvirtd-config.c
===================================================================
---- libvirt-1.2.5.orig/daemon/libvirtd-config.c
-+++ libvirt-1.2.5/daemon/libvirtd-config.c
+--- libvirt-1.2.6.orig/daemon/libvirtd-config.c
++++ libvirt-1.2.6/daemon/libvirtd-config.c
@@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0)
return NULL;
@@ -26,10 +26,10 @@
data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
-Index: libvirt-1.2.5/daemon/test_libvirtd.aug.in
+Index: libvirt-1.2.6/daemon/test_libvirtd.aug.in
===================================================================
---- libvirt-1.2.5.orig/daemon/test_libvirtd.aug.in
-+++ libvirt-1.2.5/daemon/test_libvirtd.aug.in
+--- libvirt-1.2.6.orig/daemon/test_libvirtd.aug.in
++++ libvirt-1.2.6/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG::
++++++ libvirtd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
-Index: libvirt-1.2.5/daemon/libvirtd.sysconf
+Index: libvirt-1.2.6/daemon/libvirtd.sysconf
===================================================================
---- libvirt-1.2.5.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.2.5/daemon/libvirtd.sysconf
+--- libvirt-1.2.6.orig/daemon/libvirtd.sysconf
++++ libvirt-1.2.6/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
++++++ lxc-keep-caps-feature-conversion.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -18,11 +18,11 @@
tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 4 ++++
12 files changed, 61 insertions(+)
-diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
-index f4c4556..29ec188 100644
---- a/src/lxc/lxc_native.c
-+++ b/src/lxc/lxc_native.c
-@@ -838,6 +838,28 @@ lxcSetBlkioTune(virDomainDefPtr def, virConfPtr properties)
+Index: libvirt-1.2.6/src/lxc/lxc_native.c
+===================================================================
+--- libvirt-1.2.6.orig/src/lxc/lxc_native.c
++++ libvirt-1.2.6/src/lxc/lxc_native.c
+@@ -838,6 +838,28 @@ lxcSetBlkioTune(virDomainDefPtr def, vir
return 0;
}
@@ -61,10 +61,10 @@
goto cleanup;
error:
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
-index 36b8e52..c9c0469 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml
@@ -25,6 +25,8 @@
</os>
<features>
@@ -74,10 +74,10 @@
</features>
<clock offset='utc'/>
destroy
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
-index 932ab61..e7863fa 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml
@@ -13,6 +13,8 @@
</os>
<features>
@@ -87,10 +87,10 @@
</features>
<clock offset='utc'/>
destroy
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
-index 1bab1c6..50c5358 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-cputune.xml
@@ -15,6 +15,8 @@
</os>
<features>
@@ -100,10 +100,10 @@
</features>
<clock offset='utc'/>
destroy
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
-index 050ccd6..80a83ff 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-idmap.xml
@@ -14,6 +14,8 @@
</idmap>
<features>
@@ -113,10 +113,10 @@
</features>
<clock offset='utc'/>
destroy
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
-index 996c0f7..3105b8c 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml
@@ -8,6 +8,10 @@
<type>exe</type>
<init>/sbin/init</init>
@@ -128,10 +128,10 @@
<clock offset='utc'/>
destroy
restart
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
-index b7c919e..7df1ef0 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-memtune.xml
@@ -15,6 +15,8 @@
</os>
<features>
@@ -141,10 +141,10 @@
</features>
<clock offset='utc'/>
destroy
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
-index 6d9e16d..e002b99 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml
@@ -8,6 +8,10 @@
<type>exe</type>
<init>/sbin/init</init>
@@ -156,10 +156,10 @@
<clock offset='utc'/>
destroy
restart
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
-index 101324a..dc9d635 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml
@@ -10,6 +10,8 @@
</os>
<features>
@@ -169,10 +169,10 @@
</features>
<clock offset='utc'/>
destroy
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
-index 5fe1b03..cfaceb5 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
@@ -8,6 +8,10 @@
<type>exe</type>
<init>/sbin/init</init>
@@ -184,10 +184,10 @@
<clock offset='utc'/>
destroy
restart
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
-index b3c3659..549fc39 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-simple.xml
@@ -8,6 +8,14 @@
<type arch='i686'>exe</type>
<init>/sbin/init</init>
@@ -203,10 +203,10 @@
<clock offset='utc'/>
destroy
restart
-diff --git a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
-index 45348ed..712be3e 100644
---- a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
-+++ b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
+Index: libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
+===================================================================
+--- libvirt-1.2.6.orig/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
++++ libvirt-1.2.6/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml
@@ -8,6 +8,10 @@
<type>exe</type>
<init>/sbin/init</init>
@@ -218,6 +218,3 @@
<clock offset='utc'/>
destroy
restart
---
-1.8.4.5
-
++++++ lxc-keep-caps-feature-doc.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -8,11 +8,11 @@
docs/drvlxc.html.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
-diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in
-index fc4bc20..403ce24 100644
---- a/docs/drvlxc.html.in
-+++ b/docs/drvlxc.html.in
-@@ -540,6 +540,53 @@ debootstrap, whatever) under /opt/vm-1-root:
+Index: libvirt-1.2.6/docs/drvlxc.html.in
+===================================================================
+--- libvirt-1.2.6.orig/docs/drvlxc.html.in
++++ libvirt-1.2.6/docs/drvlxc.html.in
+@@ -540,6 +540,53 @@ debootstrap, whatever) under /opt/vm-1-r
</domain>
</pre>
@@ -66,6 +66,3 @@
<h2><a name="usage">Container usage / management</a></h2>
---
-1.8.4.5
-
++++++ lxc-keep-caps-feature.patch ++++++
--- /var/tmp/diff_new_pack.oI6Wsn/_old 2014-07-04 17:18:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oI6Wsn/_new 2014-07-04 17:18:51.000000000 +0200
@@ -25,10 +25,10 @@
9 files changed, 602 insertions(+), 25 deletions(-)
create mode 100644 tests/domainschemadata/domain-caps-features.xml
-Index: libvirt-1.2.5/docs/schemas/domaincommon.rng
+Index: libvirt-1.2.6/docs/schemas/domaincommon.rng
===================================================================
---- libvirt-1.2.5.orig/docs/schemas/domaincommon.rng
-+++ libvirt-1.2.5/docs/schemas/domaincommon.rng
+--- libvirt-1.2.6.orig/docs/schemas/domaincommon.rng
++++ libvirt-1.2.6/docs/schemas/domaincommon.rng
@@ -3744,6 +3744,9 @@
<empty/>
</element>
@@ -39,7 +39,7 @@
</interleave>
</element>
</optional>
-@@ -4290,6 +4293,200 @@
+@@ -4311,6 +4314,200 @@
</element>
</define>
@@ -240,7 +240,7 @@
<define name="featurestate">
<attribute name="state">
<choice>
-@@ -4298,6 +4495,16 @@
+@@ -4319,6 +4516,16 @@
</choice>
</attribute>
</define>
@@ -257,10 +257,10 @@
Reply