Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2013-07-15 09:48:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-07-02 07:39:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2013-07-15 09:48:09.000000000 +0200
@@ -1,0 +2,38 @@
+Wed Jul 10 15:38:44 MDT 2013 - jfehlig@suse.com
+
+- CVE-2013-2230: Fix crash when multiple event callbacks were
+ registered
+ f38c8185-CVE-2013-2230.patch
+ bnc#827801
+
+-------------------------------------------------------------------
+Mon Jul 10 13:53:08 MDT 2013 - jfehlig@suse.com
+
+- Update to libvirt 1.1.0
+ - Extensible migration APIs
+ - Add a policy kit access control driver
+ - various improvements in the Xen and libxl drivers
+ - improve networking support on BSD
+ - agent based vCPU hotplug support
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Drop upstream patches: 244e0b8c-CVE-2013-2218.patch
+
+-------------------------------------------------------------------
+Mon Jul 8 12:43:45 MDT 2013 - jfehlig@suse.com
+
+- Only require lzop if suse_version > 1210
+
+-------------------------------------------------------------------
+Wed Jul 3 11:14:11 MDT 2013 - jfehlig@suse.com
+
+- Fix typo in spec file
+
+-------------------------------------------------------------------
+Wed Jul 3 10:20:05 MDT 2013 - jfehlig@suse.com
+
+- Enable support for netcontrol by default
+- Only require libvirt-daemon-driver-interface when building the
+ interface driver
+
+-------------------------------------------------------------------
Old:
----
244e0b8c-CVE-2013-2218.patch
libvirt-1.0.6.tar.bz2
New:
----
f38c8185-CVE-2013-2230.patch
libvirt-1.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:10.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:10.000000000 +0200
@@ -73,12 +73,12 @@
%define with_audit 0%{!?_without_audit:1}
%define with_yajl 0%{!?_without_yajl:%{server_drivers}}
%define with_sanlock 0%{!?_without_sanlock:%{server_drivers}}
+%define with_netcontrol 0%{!?_without_netcontrol:%{server_drivers}}
# A few optional bits off by default, we enable later
%define with_capng 0%{!?_without_capng:0}
%define with_fuse 0%{!?_without_fuse:0}
%define with_netcf 0%{!?_without_netcf:0}
-%define with_netcontrol 0%{!?_without_netcontrol:0}
%define with_nwfilter 0%{!?_without_nwfilter:0}
%define with_libpcap 0%{!?_without_libpcap:0}
%define with_macvtap 0%{!?_without_macvtap:0}
@@ -156,11 +156,6 @@
%define with_fuse 0%{!?_without_fuse:1}
%endif
-# netcontrol is used to manage network interfaces on openSUSE >= 12.1
-%if 0%{?suse_version} >= 1210
-%define with_netcontrol 0%{!?_without_netcontrol:%{server_drivers}}
-%endif
-
# interface requires netcontrol
%if ! 0%{?with_netcontrol}
%define with_interface 0
@@ -230,7 +225,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 1.0.6
+Version: 1.1.0
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@@ -263,7 +258,9 @@
%if %{with_nwfilter}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
%endif
+%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release}
@@ -407,7 +404,7 @@
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
-Patch0: 244e0b8c-CVE-2013-2218.patch
+Patch0: f38c8185-CVE-2013-2230.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@@ -503,8 +500,10 @@
# For image compression
Requires: bzip2
Requires: gzip
-Requires: lzop
Requires: xz
+%if 0%{?suse_version} > 1210
+Requires: lzop
+%endif
%endif
%if %{with_storage_lvm}
# For LVM drivers
@@ -703,7 +702,9 @@
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_driver_modules}
+%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
@@ -725,7 +726,9 @@
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_driver_modules}
+%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+%endif
Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
@@ -746,7 +749,9 @@
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_driver_modules}
+%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
@@ -773,7 +778,9 @@
%if %{with_libxl}
Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
%endif
+%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
@@ -793,7 +800,9 @@
Group: Development/Libraries/C and C++
Requires: libvirt-daemon = %{version}-%{release}
%if %{with_driver_modules}
+%if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+%endif
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
@@ -1117,13 +1126,15 @@
%if 0%{?suse_version} < 1130
rm -rf $RPM_BUILD_ROOT/usr/share/locale/vi_VN
%endif
+# temporarily remove polkit ACL policiy configuration - bnc#827644
+rm -f $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions/org.libvirt.api.policy
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
%find_lang %{name}
# Add a README to the libvirt package with a note about the empty
# file list
cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt.README << 'EOF'
The libvirt package no longer contains any files. It exists now
-only to fulfill it's 'Provides' contract.
+only to fulfill its 'Provides' contract.
EOF
%if %{with_network}
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/dnsmasq/
@@ -1560,6 +1571,7 @@
%{_datadir}/libvirt/schemas/nwfilter.rng
%{_datadir}/libvirt/schemas/secret.rng
%{_datadir}/libvirt/schemas/storageencryption.rng
+%{_datadir}/libvirt/schemas/storagefilefeatures.rng
%{_datadir}/libvirt/schemas/storagepool.rng
%{_datadir}/libvirt/schemas/storagevol.rng
%{_datadir}/libvirt/cpu_map.xml
++++++ clone.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:10.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:10.000000000 +0200
@@ -34,7 +34,7 @@
VIR_FREE(stack);
if (cpid < 0) {
virReportSystemError(errno, "%s",
-@@ -2108,6 +2116,9 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -2097,6 +2105,9 @@ int lxcContainerStart(virDomainDefPtr de
ttyPaths, nttyPaths, handshakefd};
/* allocate a stack for the container */
@@ -44,7 +44,7 @@
if (VIR_ALLOC_N(stack, stacksize) < 0) {
virReportOOMError();
return -1;
-@@ -2126,7 +2137,11 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -2115,7 +2126,11 @@ int lxcContainerStart(virDomainDefPtr de
cflags |= CLONE_NEWNET;
}
@@ -56,7 +56,7 @@
VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid);
-@@ -2152,6 +2167,7 @@ int lxcContainerAvailable(int features)
+@@ -2141,6 +2156,7 @@ int lxcContainerAvailable(int features)
int cpid;
char *childStack;
char *stack;
@@ -64,7 +64,7 @@
if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER;
-@@ -2159,14 +2175,21 @@ int lxcContainerAvailable(int features)
+@@ -2148,14 +2164,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;
++++++ f38c8185-CVE-2013-2230.patch ++++++
commit f38c8185f97720ecae7ef2291fbaa5d6b0209e17
Author: Ján Tomko
Date: Tue Jul 2 15:17:09 2013 +0200
Fix crash when multiple event callbacks were registered
CVE-2013-2230
Don't overwrite the callback ID returned by
virDomainEventStateRegisterID in ret by 0.
Introduced by abf75aea.
Index: libvirt-1.1.0/src/qemu/qemu_driver.c
===================================================================
--- libvirt-1.1.0.orig/src/qemu/qemu_driver.c
+++ libvirt-1.1.0/src/qemu/qemu_driver.c
@@ -9914,9 +9914,7 @@ qemuConnectDomainEventRegisterAny(virCon
driver->domainEventState,
dom, eventID,
callback, opaque, freecb, &ret) < 0)
- goto cleanup;
-
- ret = 0;
+ ret = -1;
cleanup:
return ret;
++++++ fix-pci-attach-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:10.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:10.000000000 +0200
@@ -8,10 +8,10 @@
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.0.6/src/xen/xend_internal.c
+Index: libvirt-1.1.0/src/xen/xend_internal.c
===================================================================
---- libvirt-1.0.6.orig/src/xen/xend_internal.c
-+++ libvirt-1.0.6/src/xen/xend_internal.c
+--- libvirt-1.1.0.orig/src/xen/xend_internal.c
++++ libvirt-1.1.0/src/xen/xend_internal.c
@@ -2220,6 +2220,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80];
++++++ install-apparmor-profiles.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:10.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:10.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.0.6/examples/apparmor/Makefile.am
+Index: libvirt-1.1.0/examples/apparmor/Makefile.am
===================================================================
---- libvirt-1.0.6.orig/examples/apparmor/Makefile.am
-+++ libvirt-1.0.6/examples/apparmor/Makefile.am
+--- libvirt-1.1.0.orig/examples/apparmor/Makefile.am
++++ libvirt-1.1.0/examples/apparmor/Makefile.am
@@ -14,8 +14,45 @@
## License along with this library. If not, see
## http://www.gnu.org/licenses/.
@@ -53,10 +53,10 @@
+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
+
+endif
-Index: libvirt-1.0.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-1.1.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
-+++ libvirt-1.0.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ libvirt-1.1.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,40 @@
+# Last Modified: Fri Aug 19 11:21:48 2011
+#include
@@ -98,9 +98,9 @@
+ /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r,
+}
-Index: libvirt-1.0.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-1.1.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
---- libvirt-1.0.6.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-1.1.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,38 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@@ -141,9 +141,9 @@
- /var/lib/libvirt/images/ r,
- /var/lib/libvirt/images/** r,
-}
-Index: libvirt-1.0.6/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-1.1.0/examples/apparmor/usr.sbin.libvirtd
===================================================================
---- libvirt-1.0.6.orig/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-1.1.0.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
@@ -198,10 +198,10 @@
- change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
-
-}
-Index: libvirt-1.0.6/examples/apparmor/usr.sbin.libvirtd.in
+Index: libvirt-1.1.0/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
-+++ libvirt-1.0.6/examples/apparmor/usr.sbin.libvirtd.in
++++ libvirt-1.1.0/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,58 @@
+# Last Modified: Fri Aug 19 11:20:36 2011
+#include
@@ -261,9 +261,9 @@
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
-Index: libvirt-1.0.6/examples/apparmor/libvirt-qemu
+Index: libvirt-1.1.0/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-1.0.6.orig/examples/apparmor/libvirt-qemu
+--- libvirt-1.1.0.orig/examples/apparmor/libvirt-qemu
+++ /dev/null
@@ -1,129 +0,0 @@
-# Last Modified: Fri Mar 9 14:43:22 2012
@@ -395,10 +395,10 @@
-
- /usr/libexec/qemu-bridge-helper rmix,
- }
-Index: libvirt-1.0.6/examples/apparmor/libvirt-qemu.in
+Index: libvirt-1.1.0/examples/apparmor/libvirt-qemu.in
===================================================================
--- /dev/null
-+++ libvirt-1.0.6/examples/apparmor/libvirt-qemu.in
++++ libvirt-1.1.0/examples/apparmor/libvirt-qemu.in
@@ -0,0 +1,132 @@
+# Last Modified: Fri Mar 9 14:43:22 2012
+
++++++ libvirt-1.0.6.tar.bz2 -> libvirt-1.1.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-1.0.6.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.1.0.tar.bz2 differ: char 11, line 1
++++++ libvirt-guests-init-script.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
-Index: libvirt-1.0.6/tools/libvirt-guests.init.in
+Index: libvirt-1.1.0/tools/libvirt-guests.init.in
===================================================================
---- libvirt-1.0.6.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.0.6/tools/libvirt-guests.init.in
+--- libvirt-1.1.0.orig/tools/libvirt-guests.init.in
++++ libvirt-1.1.0/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.6/tools/libvirt-guests.sh.in
+Index: libvirt-1.1.0/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-1.0.6.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.0.6/tools/libvirt-guests.sh.in
+--- libvirt-1.1.0.orig/tools/libvirt-guests.sh.in
++++ libvirt-1.1.0/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.0.6/tools/libvirt-guests.sysconf
+Index: libvirt-1.1.0/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-1.0.6.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.0.6/tools/libvirt-guests.sysconf
+--- libvirt-1.1.0.orig/tools/libvirt-guests.sysconf
++++ libvirt-1.1.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.0.6/configure.ac
+Index: libvirt-1.1.0/configure.ac
===================================================================
---- libvirt-1.0.6.orig/configure.ac
-+++ libvirt-1.0.6/configure.ac
+--- libvirt-1.1.0.orig/configure.ac
++++ libvirt-1.1.0/configure.ac
@@ -172,6 +172,7 @@ LIBVIRT_CHECK_DBUS
LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_HAL
@@ -10,7 +10,7 @@
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS
-@@ -2227,11 +2228,12 @@ if test "$with_libvirtd" = "no" ; then
+@@ -2225,11 +2226,12 @@ if test "$with_libvirtd" = "no" ; then
with_interface=no
fi
@@ -26,7 +26,7 @@
esac
if test "$with_interface" = "yes" ; then
-@@ -2510,6 +2512,7 @@ LIBVIRT_RESULT_DBUS
+@@ -2519,6 +2521,7 @@ LIBVIRT_RESULT_DBUS
LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF
@@ -34,11 +34,11 @@
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
-Index: libvirt-1.0.6/src/Makefile.am
+Index: libvirt-1.1.0/src/Makefile.am
===================================================================
---- libvirt-1.0.6.orig/src/Makefile.am
-+++ libvirt-1.0.6/src/Makefile.am
-@@ -716,6 +716,10 @@ if WITH_NETCF
+--- libvirt-1.1.0.orig/src/Makefile.am
++++ libvirt-1.1.0/src/Makefile.am
+@@ -735,6 +735,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c
endif
@@ -49,7 +49,7 @@
if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c
-@@ -1215,11 +1219,16 @@ if WITH_NETCF
+@@ -1276,11 +1280,16 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else
@@ -66,11 +66,11 @@
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.6/tools/virsh.c
+Index: libvirt-1.1.0/tools/virsh.c
===================================================================
---- libvirt-1.0.6.orig/tools/virsh.c
-+++ libvirt-1.0.6/tools/virsh.c
-@@ -2886,6 +2886,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+--- libvirt-1.1.0.orig/tools/virsh.c
++++ libvirt-1.1.0/tools/virsh.c
+@@ -2883,6 +2883,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
@@ -79,10 +79,10 @@
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
-Index: libvirt-1.0.6/src/interface/interface_backend_netcf.c
+Index: libvirt-1.1.0/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-1.0.6.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.0.6/src/interface/interface_backend_netcf.c
+--- libvirt-1.1.0.orig/src/interface/interface_backend_netcf.c
++++ libvirt-1.1.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include
@@ -97,45 +97,46 @@
#include "virerror.h"
#include "datatypes.h"
-@@ -52,6 +57,37 @@ static void interfaceDriverUnlock(struct
+@@ -54,6 +59,38 @@ static void interfaceDriverUnlock(struct
virMutexUnlock(&driver->lock);
}
+#ifdef WITH_NETCONTROL
-+static void interface_nc_log_driver(const char *category,
-+ int priority,
-+ const char *func,
-+ const char *file,
-+ long long line,
-+ const char *msg,
-+ size_t len ATTRIBUTE_UNUSED)
++static void
++interface_nc_log_driver(const char *category,
++ int priority,
++ const char *func,
++ const char *file,
++ long long line,
++ const char *msg,
++ size_t len ATTRIBUTE_UNUSED)
+{
-+ int vp;
++ int vp;
+
+ switch(priority) {
+ case NC_LOG_FATAL:
+ case NC_LOG_ERROR:
+ vp = VIR_LOG_ERROR;
-+ break;
++ break;
+ case NC_LOG_WARN:
+ vp = VIR_LOG_WARN;
-+ break;
++ break;
+ case NC_LOG_INFO:
+ vp = VIR_LOG_INFO;
-+ break;
++ break;
+ case NC_LOG_DEBUG:
+ default:
+ vp = VIR_LOG_DEBUG;
-+ break;
++ break;
+ }
+ virLogMessage(VIR_LOG_FROM_FILE, vp, file, line, func, 0, "%s", msg);
+}
+#endif
+
- static int netcf_to_vir_err(int netcf_errcode)
- {
- switch (netcf_errcode)
-@@ -137,6 +173,10 @@ static virDrvOpenStatus netcfInterfaceOp
+ /*
+ * Get a minimal virInterfaceDef containing enough metadata
+ * for access control checks to be performed. Currently
+@@ -169,6 +206,10 @@ static virDrvOpenStatus netcfInterfaceOp
goto mutex_error;
}
@@ -146,10 +147,10 @@
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
-Index: libvirt-1.0.6/src/interface/interface_driver.c
+Index: libvirt-1.1.0/src/interface/interface_driver.c
===================================================================
---- libvirt-1.0.6.orig/src/interface/interface_driver.c
-+++ libvirt-1.0.6/src/interface/interface_driver.c
+--- libvirt-1.1.0.orig/src/interface/interface_driver.c
++++ libvirt-1.1.0/src/interface/interface_driver.c
@@ -28,8 +28,15 @@ interfaceRegister(void) {
if (netcfIfaceRegister() == 0)
return 0;
@@ -167,10 +168,10 @@
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
-Index: libvirt-1.0.6/m4/virt-netcontrol.m4
+Index: libvirt-1.1.0/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
-+++ libvirt-1.0.6/m4/virt-netcontrol.m4
++++ libvirt-1.1.0/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.0.6/daemon/libvirtd.conf
+Index: libvirt-1.1.0/daemon/libvirtd.conf
===================================================================
---- libvirt-1.0.6.orig/daemon/libvirtd.conf
-+++ libvirt-1.0.6/daemon/libvirtd.conf
+--- libvirt-1.1.0.orig/daemon/libvirtd.conf
++++ libvirt-1.1.0/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.6/daemon/libvirtd-config.c
+Index: libvirt-1.1.0/daemon/libvirtd-config.c
===================================================================
---- libvirt-1.0.6.orig/daemon/libvirtd-config.c
-+++ libvirt-1.0.6/daemon/libvirtd-config.c
+--- libvirt-1.1.0.orig/daemon/libvirtd-config.c
++++ libvirt-1.1.0/daemon/libvirtd-config.c
@@ -225,7 +225,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL;
}
++++++ libvirtd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
-Index: libvirt-1.0.6/daemon/libvirtd.sysconf
+Index: libvirt-1.1.0/daemon/libvirtd.sysconf
===================================================================
---- libvirt-1.0.6.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.0.6/daemon/libvirtd.sysconf
+--- libvirt-1.1.0.orig/daemon/libvirtd.sysconf
++++ libvirt-1.1.0/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
++++++ relax-qemu-usergroup-check.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.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-1.0.6/src/qemu/qemu_conf.c
+Index: libvirt-1.1.0/src/qemu/qemu_conf.c
===================================================================
---- libvirt-1.0.6.orig/src/qemu/qemu_conf.c
-+++ libvirt-1.0.6/src/qemu/qemu_conf.c
+--- libvirt-1.1.0.orig/src/qemu/qemu_conf.c
++++ libvirt-1.1.0/src/qemu/qemu_conf.c
@@ -465,15 +465,15 @@ int virQEMUDriverConfigLoadFile(virQEMUD
p = virConfGetValue(conf, "user");
++++++ support-managed-pci-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -8,10 +8,10 @@
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
-Index: libvirt-1.0.6/src/xenxs/xen_sxpr.c
+Index: libvirt-1.1.0/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-1.0.6.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.0.6/src/xenxs/xen_sxpr.c
+--- libvirt-1.1.0.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.1.0/src/xenxs/xen_sxpr.c
@@ -1006,6 +1006,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
@@ -78,10 +78,10 @@
xenFormatSxprPCI(def->hostdevs[i], buf);
}
}
-Index: libvirt-1.0.6/src/xenxs/xen_xm.c
+Index: libvirt-1.1.0/src/xenxs/xen_xm.c
===================================================================
---- libvirt-1.0.6.orig/src/xenxs/xen_xm.c
-+++ libvirt-1.0.6/src/xenxs/xen_xm.c
+--- libvirt-1.1.0.orig/src/xenxs/xen_xm.c
++++ libvirt-1.1.0/src/xenxs/xen_xm.c
@@ -806,6 +806,8 @@ xenParseXM(virConfPtr conf, int xendConf
int busID;
int slotID;
++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.0.6/src/qemu/qemu.conf
+Index: libvirt-1.1.0/src/qemu/qemu.conf
===================================================================
---- libvirt-1.0.6.orig/src/qemu/qemu.conf
-+++ libvirt-1.0.6/src/qemu/qemu.conf
+--- libvirt-1.1.0.orig/src/qemu/qemu.conf
++++ libvirt-1.1.0/src/qemu/qemu.conf
@@ -175,7 +175,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.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.0.6/daemon/libvirtd.service.in
+Index: libvirt-1.1.0/daemon/libvirtd.service.in
===================================================================
---- libvirt-1.0.6.orig/daemon/libvirtd.service.in
-+++ libvirt-1.0.6/daemon/libvirtd.service.in
+--- libvirt-1.1.0.orig/daemon/libvirtd.service.in
++++ libvirt-1.1.0/daemon/libvirtd.service.in
@@ -9,6 +9,8 @@ Before=libvirt-guests.service
After=network.target
After=dbus.service
++++++ virtlockd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards
-Index: libvirt-1.0.6/src/locking/virtlockd.sysconf
+Index: libvirt-1.1.0/src/locking/virtlockd.sysconf
===================================================================
---- libvirt-1.0.6.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.0.6/src/locking/virtlockd.sysconf
+--- libvirt-1.1.0.orig/src/locking/virtlockd.sysconf
++++ libvirt-1.1.0/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.6/src/locking/virtlockd.init.in
+Index: libvirt-1.1.0/src/locking/virtlockd.init.in
===================================================================
---- libvirt-1.0.6.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.0.6/src/locking/virtlockd.init.in
+--- libvirt-1.1.0.orig/src/locking/virtlockd.init.in
++++ libvirt-1.1.0/src/locking/virtlockd.init.in
@@ -4,11 +4,13 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-gen...
#
++++++ xen-name-for-devid.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is
inactive.
-Index: libvirt-1.0.6/src/xen/xend_internal.c
+Index: libvirt-1.1.0/src/xen/xend_internal.c
===================================================================
---- libvirt-1.0.6.orig/src/xen/xend_internal.c
-+++ libvirt-1.0.6/src/xen/xend_internal.c
+--- libvirt-1.1.0.orig/src/xen/xend_internal.c
++++ libvirt-1.1.0/src/xen/xend_internal.c
@@ -70,7 +70,7 @@
#define XEND_RCV_BUF_MAX_LEN (256 * 1024)
++++++ xen-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.CJNdL9/_old 2013-07-15 09:48:11.000000000 +0200
+++ /var/tmp/diff_new_pack.CJNdL9/_new 2013-07-15 09:48:11.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.0.6/src/xenxs/xen_sxpr.c
+Index: libvirt-1.1.0/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-1.0.6.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.0.6/src/xenxs/xen_sxpr.c
+--- libvirt-1.1.0.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.1.0/src/xenxs/xen_sxpr.c
@@ -328,7 +328,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