diff --git a/ce4557c3-apparmor-tapfd-label.patch b/ce4557c3-apparmor-tapfd-label.patch deleted file mode 100644 index 0626f21..0000000 --- a/ce4557c3-apparmor-tapfd-label.patch +++ /dev/null @@ -1,68 +0,0 @@ -commit ce4557c3ab3702639db73615dd144ddf036321ed -Author: Guannan Ren -Date: Fri Mar 8 00:16:59 2013 +0800 - - apparmor: use AppArmorSetFDLabel for both imageFD and tapFD - - Rename AppArmorSetImageFDLabel to AppArmorSetFDLabel which could - be used as a common function for *ALL* fd relabelling in Linux. - - In apparmor profile for specific vm with uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 - Path: /etc/apparmor.d/libvirt/libvirt-cdbebdfa-1d6d-65c3-be0f-fd74b978a773.files - The last line is for the tapfd relabelling. - - # DO NOT EDIT THIS FILE DIRECTLY. IT IS MANAGED BY LIBVIRT. - "/var/log/libvirt/**/rhel6qcow2.log" w, - "/var/lib/libvirt/**/rhel6qcow2.monitor" rw, - "/var/run/libvirt/**/rhel6qcow2.pid" rwk, - "/run/libvirt/**/rhel6qcow2.pid" rwk, - "/var/run/libvirt/**/*.tunnelmigrate.dest.rhel6qcow2" rw, - "/run/libvirt/**/*.tunnelmigrate.dest.rhel6qcow2" rw, - "/var/lib/libvirt/images/rhel6u3qcow2.img" rw, - "/dev/tap45" rw, - -Index: libvirt-1.0.3/src/security/security_apparmor.c -=================================================================== ---- libvirt-1.0.3.orig/src/security/security_apparmor.c -+++ libvirt-1.0.3/src/security/security_apparmor.c -@@ -884,9 +884,9 @@ AppArmorRestoreSavedStateLabel(virSecuri - } - - static int --AppArmorSetImageFDLabel(virSecurityManagerPtr mgr, -- virDomainDefPtr def, -- int fd) -+AppArmorSetFDLabel(virSecurityManagerPtr mgr, -+ virDomainDefPtr def, -+ int fd) - { - int rc = -1; - char *proc = NULL; -@@ -915,16 +915,6 @@ AppArmorSetImageFDLabel(virSecurityManag - return reload_profile(mgr, def, fd_path, true); - } - --/* TODO need code here */ --static int --AppArmorSetTapFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, -- virDomainDefPtr def ATTRIBUTE_UNUSED, -- int fd ATTRIBUTE_UNUSED) --{ -- return 0; --} -- -- - static char * - AppArmorGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) -@@ -975,8 +965,8 @@ virSecurityDriver virAppArmorSecurityDri - .domainSetSavedStateLabel = AppArmorSetSavedStateLabel, - .domainRestoreSavedStateLabel = AppArmorRestoreSavedStateLabel, - -- .domainSetSecurityImageFDLabel = AppArmorSetImageFDLabel, -- .domainSetSecurityTapFDLabel = AppArmorSetTapFDLabel, -+ .domainSetSecurityImageFDLabel = AppArmorSetFDLabel, -+ .domainSetSecurityTapFDLabel = AppArmorSetFDLabel, - - .domainGetSecurityMountOptions = AppArmorGetMountOptions, - }; diff --git a/clone.patch b/clone.patch index 35d1cf9..41e4a4a 100644 --- a/clone.patch +++ b/clone.patch @@ -2,7 +2,7 @@ Index: src/lxc/lxc_container.c =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -136,6 +136,7 @@ int lxcContainerHasReboot(void) +@@ -139,6 +139,7 @@ int lxcContainerHasReboot(void) int cmd, v; int status; char *tmp; @@ -10,7 +10,7 @@ Index: src/lxc/lxc_container.c if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf) < 0) return -1; -@@ -152,14 +153,21 @@ int lxcContainerHasReboot(void) +@@ -155,14 +156,21 @@ int lxcContainerHasReboot(void) VIR_FREE(buf); cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; @@ -34,7 +34,7 @@ Index: src/lxc/lxc_container.c VIR_FREE(stack); if (cpid < 0) { virReportSystemError(errno, "%s", -@@ -2358,6 +2366,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2417,6 +2425,9 @@ int lxcContainerStart(virDomainDefPtr de ttyPaths, nttyPaths, handshakefd}; /* allocate a stack for the container */ @@ -44,7 +44,7 @@ Index: src/lxc/lxc_container.c if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -2377,7 +2388,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2436,7 +2447,11 @@ int lxcContainerStart(virDomainDefPtr de cflags |= CLONE_NEWNET; } @@ -56,7 +56,7 @@ Index: src/lxc/lxc_container.c VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -2403,6 +2418,7 @@ int lxcContainerAvailable(int features) +@@ -2462,6 +2477,7 @@ int lxcContainerAvailable(int features) int cpid; char *childStack; char *stack; @@ -64,7 +64,7 @@ Index: src/lxc/lxc_container.c if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -2410,14 +2426,21 @@ int lxcContainerAvailable(int features) +@@ -2469,14 +2485,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; diff --git a/fix-pci-attach-xen-driver.patch b/fix-pci-attach-xen-driver.patch index 8d7710c..6fa8fcd 100644 --- a/fix-pci-attach-xen-driver.patch +++ b/fix-pci-attach-xen-driver.patch @@ -8,10 +8,10 @@ uses the 'device_configure' RPC. 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.3/src/xen/xend_internal.c +Index: libvirt-1.0.4/src/xen/xend_internal.c =================================================================== ---- libvirt-1.0.3.orig/src/xen/xend_internal.c -+++ libvirt-1.0.3/src/xen/xend_internal.c +--- libvirt-1.0.4.orig/src/xen/xend_internal.c ++++ libvirt-1.0.4/src/xen/xend_internal.c @@ -2473,6 +2473,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; diff --git a/install-apparmor-profiles.patch b/install-apparmor-profiles.patch index f3aacd7..d10d9a1 100644 --- a/install-apparmor-profiles.patch +++ b/install-apparmor-profiles.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.0.3/examples/apparmor/Makefile.am +Index: libvirt-1.0.4/examples/apparmor/Makefile.am =================================================================== ---- libvirt-1.0.3.orig/examples/apparmor/Makefile.am -+++ libvirt-1.0.3/examples/apparmor/Makefile.am +--- libvirt-1.0.4.orig/examples/apparmor/Makefile.am ++++ libvirt-1.0.4/examples/apparmor/Makefile.am @@ -1,8 +1,45 @@ ## Copyright (C) 2005-2011 Red Hat, Inc. ## See COPYING.LIB for the License of this software @@ -53,10 +53,10 @@ Index: libvirt-1.0.3/examples/apparmor/Makefile.am + rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE + +endif -Index: libvirt-1.0.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-1.0.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-1.0.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-1.0.4/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 @@ Index: libvirt-1.0.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in + /var/lib/kvm/images/ r, + /var/lib/kvm/images/** r, +} -Index: libvirt-1.0.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-1.0.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-1.0.3.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-1.0.4.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 @@ Index: libvirt-1.0.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper - /var/lib/libvirt/images/ r, - /var/lib/libvirt/images/** r, -} -Index: libvirt-1.0.3/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-1.0.4/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-1.0.3.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-1.0.4.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 @@ Index: libvirt-1.0.3/examples/apparmor/usr.sbin.libvirtd - change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, - -} -Index: libvirt-1.0.3/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-1.0.4/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-1.0.3/examples/apparmor/usr.sbin.libvirtd.in ++++ libvirt-1.0.4/examples/apparmor/usr.sbin.libvirtd.in @@ -0,0 +1,58 @@ +# Last Modified: Fri Aug 19 11:20:36 2011 +#include @@ -261,9 +261,9 @@ Index: libvirt-1.0.3/examples/apparmor/usr.sbin.libvirtd.in + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-1.0.3/examples/apparmor/libvirt-qemu +Index: libvirt-1.0.4/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.0.3.orig/examples/apparmor/libvirt-qemu +--- libvirt-1.0.4.orig/examples/apparmor/libvirt-qemu +++ /dev/null @@ -1,129 +0,0 @@ -# Last Modified: Fri Mar 9 14:43:22 2012 @@ -395,10 +395,10 @@ Index: libvirt-1.0.3/examples/apparmor/libvirt-qemu - - /usr/libexec/qemu-bridge-helper rmix, - } -Index: libvirt-1.0.3/examples/apparmor/libvirt-qemu.in +Index: libvirt-1.0.4/examples/apparmor/libvirt-qemu.in =================================================================== --- /dev/null -+++ libvirt-1.0.3/examples/apparmor/libvirt-qemu.in ++++ libvirt-1.0.4/examples/apparmor/libvirt-qemu.in @@ -0,0 +1,132 @@ +# Last Modified: Fri Mar 9 14:43:22 2012 + diff --git a/libvirt-1.0.3.tar.bz2 b/libvirt-1.0.3.tar.bz2 deleted file mode 100644 index 01dcd0b..0000000 --- a/libvirt-1.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d085259072879ba1c9956dcfb4f016a7a6c938e0a06becf2a5817db4abe215a -size 16567568 diff --git a/libvirt-1.0.4.tar.bz2 b/libvirt-1.0.4.tar.bz2 new file mode 100644 index 0000000..9f5245e --- /dev/null +++ b/libvirt-1.0.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b31e8a54faeeedad89b3328c08293150c0f12372c30c3ba8cf66aaa4730a926 +size 16764645 diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index c313363..14f9a57 100644 --- a/libvirt-guests-init-script.patch +++ b/libvirt-guests-init-script.patch @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.0.3/tools/libvirt-guests.init.in +Index: libvirt-1.0.4/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.0.3.orig/tools/libvirt-guests.init.in -+++ libvirt-1.0.3/tools/libvirt-guests.init.in +--- libvirt-1.0.4.orig/tools/libvirt-guests.init.in ++++ libvirt-1.0.4/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ Index: libvirt-1.0.3/tools/libvirt-guests.init.in ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.0.3/tools/libvirt-guests.sh.in +Index: libvirt-1.0.4/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.0.3.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.0.3/tools/libvirt-guests.sh.in +--- libvirt-1.0.4.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.0.4/tools/libvirt-guests.sh.in @@ -1,13 +1,12 @@ #!/bin/sh @@ -130,7 +130,7 @@ Index: libvirt-1.0.3/tools/libvirt-guests.sh.in eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do name=$(guest_name "$uri" "$guest") -@@ -377,7 +403,7 @@ shutdown_guests_parallel() +@@ -378,7 +404,7 @@ shutdown_guests_parallel() timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then eval_gettext "Timeout expired while shutting down domains"; echo @@ -139,7 +139,7 @@ Index: libvirt-1.0.3/tools/libvirt-guests.sh.in return fi else -@@ -405,7 +431,7 @@ stop() { +@@ -406,7 +432,7 @@ stop() { if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -148,7 +148,7 @@ Index: libvirt-1.0.3/tools/libvirt-guests.sh.in return fi fi -@@ -453,14 +479,14 @@ stop() { +@@ -454,14 +480,14 @@ stop() { if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -165,7 +165,7 @@ Index: libvirt-1.0.3/tools/libvirt-guests.sh.in set +f return fi -@@ -519,14 +545,13 @@ gueststatus() { +@@ -520,14 +546,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo @@ -181,16 +181,16 @@ Index: libvirt-1.0.3/tools/libvirt-guests.sh.in fi } -@@ -570,4 +595,4 @@ case "$1" in +@@ -571,4 +596,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit -Index: libvirt-1.0.3/tools/libvirt-guests.sysconf +Index: libvirt-1.0.4/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.0.3.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.0.3/tools/libvirt-guests.sysconf +--- libvirt-1.0.4.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.0.4/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + diff --git a/libvirt-iptables-1.4.18.diff b/libvirt-iptables-1.4.18.diff deleted file mode 100644 index a9158f7..0000000 --- a/libvirt-iptables-1.4.18.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: b/src/util/viriptables.c -=================================================================== ---- a/src/util/viriptables.c -+++ b/src/util/viriptables.c -@@ -478,22 +478,22 @@ iptablesForwardAllowRelatedIn(iptablesCo - VIR_SOCKET_ADDR_FAMILY(netaddr), - action, - "--destination", networkstr, - "--in-interface", physdev, - "--out-interface", iface, -- "--match", "state", -- "--state", "ESTABLISHED,RELATED", -+ "--match", "conntrack", -+ "--ctstate", "ESTABLISHED,RELATED", - "--jump", "ACCEPT", - NULL); - } else { - ret = iptablesAddRemoveRule(ctx->forward_filter, - VIR_SOCKET_ADDR_FAMILY(netaddr), - action, - "--destination", networkstr, - "--out-interface", iface, -- "--match", "state", -- "--state", "ESTABLISHED,RELATED", -+ "--match", "conntrack", -+ "--ctstate", "ESTABLISHED,RELATED", - "--jump", "ACCEPT", - NULL); - } - VIR_FREE(networkstr); - return ret; diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 4296abf..2d57cf2 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.0.3/configure.ac +Index: libvirt-1.0.4/configure.ac =================================================================== ---- libvirt-1.0.3.orig/configure.ac -+++ libvirt-1.0.3/configure.ac +--- libvirt-1.0.4.orig/configure.ac ++++ libvirt-1.0.4/configure.ac @@ -153,6 +153,7 @@ LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_HAL @@ -34,11 +34,11 @@ Index: libvirt-1.0.3/configure.ac LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.0.3/src/Makefile.am +Index: libvirt-1.0.4/src/Makefile.am =================================================================== ---- libvirt-1.0.3.orig/src/Makefile.am -+++ libvirt-1.0.3/src/Makefile.am -@@ -643,6 +643,10 @@ if WITH_NETCF +--- libvirt-1.0.4.orig/src/Makefile.am ++++ libvirt-1.0.4/src/Makefile.am +@@ -648,6 +648,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif @@ -49,7 +49,7 @@ Index: libvirt-1.0.3/src/Makefile.am if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1130,11 +1134,16 @@ if WITH_NETCF +@@ -1133,11 +1137,16 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) else @@ -66,11 +66,11 @@ Index: libvirt-1.0.3/src/Makefile.am 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.3/tools/virsh.c +Index: libvirt-1.0.4/tools/virsh.c =================================================================== ---- libvirt-1.0.3.orig/tools/virsh.c -+++ libvirt-1.0.3/tools/virsh.c -@@ -2812,6 +2812,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-1.0.4.orig/tools/virsh.c ++++ libvirt-1.0.4/tools/virsh.c +@@ -2800,6 +2800,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -79,10 +79,10 @@ Index: libvirt-1.0.3/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.0.3/src/interface/interface_backend_netcf.c +Index: libvirt-1.0.4/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.0.3.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.0.3/src/interface/interface_backend_netcf.c +--- libvirt-1.0.4.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.0.4/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -146,10 +146,10 @@ Index: libvirt-1.0.3/src/interface/interface_backend_netcf.c /* open netcf */ if (ncf_init(&driverState->netcf, NULL) != 0) { -Index: libvirt-1.0.3/src/interface/interface_driver.c +Index: libvirt-1.0.4/src/interface/interface_driver.c =================================================================== ---- libvirt-1.0.3.orig/src/interface/interface_driver.c -+++ libvirt-1.0.3/src/interface/interface_driver.c +--- libvirt-1.0.4.orig/src/interface/interface_driver.c ++++ libvirt-1.0.4/src/interface/interface_driver.c @@ -28,8 +28,15 @@ interfaceRegister(void) { if (netcfIfaceRegister() == 0) return 0; @@ -167,10 +167,10 @@ Index: libvirt-1.0.3/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.0.3/m4/virt-netcontrol.m4 +Index: libvirt-1.0.4/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.0.3/m4/virt-netcontrol.m4 ++++ libvirt-1.0.4/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index 7e63a1d..9a06439 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 2 15:26:18 MDT 2013 - jfehlig@suse.com + +- Update to libvirt 1.0.4 + - qemu: support passthrough for iscsi disks + - various S390 improvements + - various LXC bugs fixes and improvements + - add API for thread cancellation + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Drop upstream patches: ce4557c3-apparmor-tapfd-label.patch + libvirt-iptables-1.4.18.diff + ------------------------------------------------------------------- Sun Mar 24 20:05:28 UTC 2013 - seife+obs@b1-systems.com diff --git a/libvirt.spec b/libvirt.spec index b2d4f32..b2e8a86 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -139,7 +139,7 @@ %if 0%{?suse_version} >= 1210 %define with_netcontrol 0%{!?_without_netcontrol:%{server_drivers}} %endif - +%define with_netcontrol 1 # libcapng is used to manage capabilities in 11.3 or newer. # It is also used by lxc and needs to be enabled if lxc is enabled. %if 0%{?suse_version} >= 1130 || %{with_lxc} @@ -337,7 +337,7 @@ BuildRequires: systemd Name: libvirt Url: http://libvirt.org/ -Version: 1.0.3 +Version: 1.0.4 Release: 0 Summary: A C toolkit to interact with the virtualization capabilities of Linux License: LGPL-2.1+ @@ -417,12 +417,10 @@ Source1: libvirtd.init Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: ce4557c3-apparmor-tapfd-label.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch Patch102: xen-pv-cdrom.patch -Patch103: libvirt-iptables-1.4.18.diff # Our patches Patch200: libvirtd-defaults.patch Patch201: libvirtd-init-script.patch @@ -559,11 +557,9 @@ Authors: %prep %setup -q -%patch0 -p1 %patch100 -p1 %patch101 %patch102 -p1 -%patch103 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index 65b3bf6..3b8dbc4 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.0.3/daemon/libvirtd.conf +Index: libvirt-1.0.4/daemon/libvirtd.conf =================================================================== ---- libvirt-1.0.3.orig/daemon/libvirtd.conf -+++ libvirt-1.0.3/daemon/libvirtd.conf +--- libvirt-1.0.4.orig/daemon/libvirtd.conf ++++ libvirt-1.0.4/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 @@ Index: libvirt-1.0.3/daemon/libvirtd.conf # 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.3/daemon/libvirtd-config.c +Index: libvirt-1.0.4/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.0.3.orig/daemon/libvirtd-config.c -+++ libvirt-1.0.3/daemon/libvirtd-config.c +--- libvirt-1.0.4.orig/daemon/libvirtd-config.c ++++ libvirt-1.0.4/daemon/libvirtd-config.c @@ -233,7 +233,7 @@ daemonConfigNew(bool privileged ATTRIBUT return NULL; } diff --git a/libvirtd-init-script.patch b/libvirtd-init-script.patch index 9423108..9e21880 100644 --- a/libvirtd-init-script.patch +++ b/libvirtd-init-script.patch @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.0.3/daemon/libvirtd.sysconf +Index: libvirt-1.0.4/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.0.3.orig/daemon/libvirtd.sysconf -+++ libvirt-1.0.3/daemon/libvirtd.sysconf +--- libvirt-1.0.4.orig/daemon/libvirtd.sysconf ++++ libvirt-1.0.4/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/relax-qemu-usergroup-check.patch b/relax-qemu-usergroup-check.patch index 8f14a05..92d5af1 100644 --- a/relax-qemu-usergroup-check.patch +++ b/relax-qemu-usergroup-check.patch @@ -7,10 +7,10 @@ drivers as loadable modules instead of built-in to the 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.3/src/qemu/qemu_conf.c +Index: libvirt-1.0.4/src/qemu/qemu_conf.c =================================================================== ---- libvirt-1.0.3.orig/src/qemu/qemu_conf.c -+++ libvirt-1.0.3/src/qemu/qemu_conf.c +--- libvirt-1.0.4.orig/src/qemu/qemu_conf.c ++++ libvirt-1.0.4/src/qemu/qemu_conf.c @@ -439,15 +439,15 @@ int virQEMUDriverConfigLoadFile(virQEMUD p = virConfGetValue(conf, "user"); diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index 55a7338..a745271 100644 --- a/support-managed-pci-xen-driver.patch +++ b/support-managed-pci-xen-driver.patch @@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.0.3/src/xenxs/xen_sxpr.c +Index: libvirt-1.0.4/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.0.3.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.0.3/src/xenxs/xen_sxpr.c +--- libvirt-1.0.4.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.0.4/src/xenxs/xen_sxpr.c @@ -1035,6 +1035,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; @@ -77,10 +77,10 @@ Index: libvirt-1.0.3/src/xenxs/xen_sxpr.c xenFormatSxprPCI(def->hostdevs[i], buf); } } -Index: libvirt-1.0.3/src/xenxs/xen_xm.c +Index: libvirt-1.0.4/src/xenxs/xen_xm.c =================================================================== ---- libvirt-1.0.3.orig/src/xenxs/xen_xm.c -+++ libvirt-1.0.3/src/xenxs/xen_xm.c +--- libvirt-1.0.4.orig/src/xenxs/xen_xm.c ++++ libvirt-1.0.4/src/xenxs/xen_xm.c @@ -815,6 +815,8 @@ xenParseXM(virConfPtr conf, int xendConf int busID; int slotID; diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 19c7cd7..88204c5 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.0.3/src/qemu/qemu.conf +Index: libvirt-1.0.4/src/qemu/qemu.conf =================================================================== ---- libvirt-1.0.3.orig/src/qemu/qemu.conf -+++ libvirt-1.0.3/src/qemu/qemu.conf +--- libvirt-1.0.4.orig/src/qemu/qemu.conf ++++ libvirt-1.0.4/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. diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch index fdaecba..7aba627 100644 --- a/virtlockd-init-script.patch +++ b/virtlockd-init-script.patch @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.0.3/src/locking/virtlockd.sysconf +Index: libvirt-1.0.4/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.0.3.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.0.3/src/locking/virtlockd.sysconf +--- libvirt-1.0.4.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.0.4/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-1.0.3/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.0.3/src/locking/virtlockd.init.in +Index: libvirt-1.0.4/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.0.3.orig/src/locking/virtlockd.init.in -+++ libvirt-1.0.3/src/locking/virtlockd.init.in +--- libvirt-1.0.4.orig/src/locking/virtlockd.init.in ++++ libvirt-1.0.4/src/locking/virtlockd.init.in @@ -4,11 +4,13 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # diff --git a/xen-name-for-devid.patch b/xen-name-for-devid.patch index 2d67583..dda081e 100644 --- a/xen-name-for-devid.patch +++ b/xen-name-for-devid.patch @@ -14,10 +14,10 @@ is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-1.0.3/src/xen/xend_internal.c +Index: libvirt-1.0.4/src/xen/xend_internal.c =================================================================== ---- libvirt-1.0.3.orig/src/xen/xend_internal.c -+++ libvirt-1.0.3/src/xen/xend_internal.c +--- libvirt-1.0.4.orig/src/xen/xend_internal.c ++++ libvirt-1.0.4/src/xen/xend_internal.c @@ -60,8 +60,8 @@ #define XEND_RCV_BUF_MAX_LEN (256 * 1024) diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index d766497..ddf6203 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.0.3/src/xenxs/xen_sxpr.c +Index: libvirt-1.0.4/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.0.3.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.0.3/src/xenxs/xen_sxpr.c +--- libvirt-1.0.4.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.0.4/src/xenxs/xen_sxpr.c @@ -341,7 +341,7 @@ error: static int xenParseSxprDisks(virDomainDefPtr def,