From 0813eec6fe0b4a421390567096071fc95bcf36267ac0a8c558bdcbb656bd2388 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Mon, 1 Jun 2015 17:48:26 +0000 Subject: [PATCH 1/4] Accepting request 309688 from home:jfehlig:branches:Virtualization - Update to libvirt 1.2.16 - Introduce pci-serial - Introduce virDomainSetUserPassword API - Introduce protected key mgmt ops - Add domain vmport feature - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Drop upstream patches c0d3f608-libxl-soundhw.patch and 8910e063-arch-caps.patch - Drop polkit-10-virt.rules in favor of upstream 50-libvirt.rules OBS-URL: https://build.opensuse.org/request/show/309688 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=463 --- 8910e063-arch-caps.patch | 260 --------------------- apparmor-fixes.patch | 6 +- apparmor-no-mount.patch | 6 +- blockcopy-check-dst-identical-device.patch | 8 +- c0d3f608-libxl-soundhw.patch | 33 --- disable-virCgroupGetPercpuStats-test.patch | 6 +- libvirt-1.2.15.tar.gz | 3 - libvirt-1.2.15.tar.gz.asc | 7 - libvirt-1.2.16.tar.gz | 3 + libvirt-1.2.16.tar.gz.asc | 7 + libvirt-guests-init-script.patch | 40 ++-- libvirt-power8-models.patch | 6 +- libvirt-suse-netcontrol.patch | 36 +-- libvirt.changes | 14 ++ libvirt.spec | 18 +- libvirtd-defaults.patch | 18 +- libvirtd-init-script.patch | 6 +- polkit-10-virt.rules | 8 - ppc64le-canonical-name.patch | 6 +- qemu-apparmor-screenshot.patch | 6 +- support-managed-pci-xen-driver.patch | 12 +- suse-qemu-conf.patch | 6 +- systemd-service-xen.patch | 6 +- virtlockd-init-script.patch | 12 +- xen-pv-cdrom.patch | 6 +- 25 files changed, 123 insertions(+), 416 deletions(-) delete mode 100644 8910e063-arch-caps.patch delete mode 100644 c0d3f608-libxl-soundhw.patch delete mode 100644 libvirt-1.2.15.tar.gz delete mode 100644 libvirt-1.2.15.tar.gz.asc create mode 100644 libvirt-1.2.16.tar.gz create mode 100644 libvirt-1.2.16.tar.gz.asc delete mode 100644 polkit-10-virt.rules diff --git a/8910e063-arch-caps.patch b/8910e063-arch-caps.patch deleted file mode 100644 index 48dd06a..0000000 --- a/8910e063-arch-caps.patch +++ /dev/null @@ -1,260 +0,0 @@ -commit 8910e063dbafc09695b2100c80213be569abb7ef -Author: Cole Robinson -Date: Wed May 6 18:32:05 2015 -0400 - - caps: Fix regression defaulting to host arch - - My commit 747761a79 (v1.2.15 only) dropped this bit of logic when filling - in a default arch in the XML: - - - /* First try to find one matching host arch */ - - for (i = 0; i < caps->nguests; i++) { - - if (caps->guests[i]->ostype == ostype) { - - for (j = 0; j < caps->guests[i]->arch.ndomains; j++) { - - if (caps->guests[i]->arch.domains[j]->type == domain && - - caps->guests[i]->arch.id == caps->host.arch) - - return caps->guests[i]->arch.id; - - } - - } - - } - - That attempt to match host.arch is important, otherwise we end up - defaulting to i686 on x86_64 host for KVM, which is not intended. - Duplicate it in the centralized CapsLookup function. - - Additionally add some testcases that would have caught this. - - https://bugzilla.redhat.com/show_bug.cgi?id=1219191 - -Index: libvirt-1.2.15/src/conf/capabilities.c -=================================================================== ---- libvirt-1.2.15.orig/src/conf/capabilities.c -+++ libvirt-1.2.15/src/conf/capabilities.c -@@ -607,25 +607,13 @@ virCapsDomainDataCompare(virCapsGuestPtr - return true; - } - --/** -- * virCapabilitiesDomainDataLookup: -- * @caps: capabilities to query -- * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE -- * @arch: Architecture to search for -- * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT -- * @emulator: Emulator path to search for -- * @machinetype: Machine type to search for -- * -- * Search capabilities for the passed values, and if found return -- * virCapabilitiesDomainDataLookup filled in with the default values -- */ --virCapsDomainDataPtr --virCapabilitiesDomainDataLookup(virCapsPtr caps, -- int ostype, -- virArch arch, -- int domaintype, -- const char *emulator, -- const char *machinetype) -+static virCapsDomainDataPtr -+virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, -+ int ostype, -+ virArch arch, -+ int domaintype, -+ const char *emulator, -+ const char *machinetype) - { - virCapsGuestPtr foundguest = NULL; - virCapsGuestDomainPtr founddomain = NULL; -@@ -730,6 +718,43 @@ virCapabilitiesDomainDataLookup(virCapsP - return ret; - } - -+/** -+ * virCapabilitiesDomainDataLookup: -+ * @caps: capabilities to query -+ * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE -+ * @arch: Architecture to search for -+ * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT -+ * @emulator: Emulator path to search for -+ * @machinetype: Machine type to search for -+ * -+ * Search capabilities for the passed values, and if found return -+ * virCapabilitiesDomainDataLookup filled in with the default values -+ */ -+virCapsDomainDataPtr -+virCapabilitiesDomainDataLookup(virCapsPtr caps, -+ int ostype, -+ virArch arch, -+ int domaintype, -+ const char *emulator, -+ const char *machinetype) -+{ -+ virCapsDomainDataPtr ret; -+ -+ if (arch == VIR_ARCH_NONE) { -+ /* Prefer host arch if its available */ -+ ret = virCapabilitiesDomainDataLookupInternal(caps, ostype, -+ caps->host.arch, -+ domaintype, -+ emulator, machinetype); -+ if (ret) -+ return ret; -+ } -+ -+ return virCapabilitiesDomainDataLookupInternal(caps, ostype, -+ arch, domaintype, -+ emulator, machinetype); -+} -+ - static int - virCapabilitiesFormatNUMATopology(virBufferPtr buf, - size_t ncells, -Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args -=================================================================== ---- /dev/null -+++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args -@@ -0,0 +1,4 @@ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/kvm -S -machine pc,accel=kvm -m 4096 -smp 4 -nographic \ -+-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -net none \ -+-serial none -parallel none -Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml -=================================================================== ---- /dev/null -+++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml -@@ -0,0 +1,11 @@ -+ -+ kvm -+ d091ea82-29e6-2e34-3005-f02617b36e87 -+ 4194304 -+ 4194304 -+ 4 -+ -+ hvm -+ -+ -+ -Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args -=================================================================== ---- /dev/null -+++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args -@@ -0,0 +1,4 @@ -+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -+/usr/bin/qemu-system-x86_64 -S -machine pc-0.11,accel=tcg -m 4096 -smp 4 \ -+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -+-usb -net none -serial none -parallel none -Index: libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml -=================================================================== ---- /dev/null -+++ libvirt-1.2.15/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml -@@ -0,0 +1,11 @@ -+ -+ qemu-host -+ d091ea82-29e6-2e34-3005-f02617b36e87 -+ 4194304 -+ 4194304 -+ 4 -+ -+ hvm -+ -+ -+ -Index: libvirt-1.2.15/tests/qemuxml2argvtest.c -=================================================================== ---- libvirt-1.2.15.orig/tests/qemuxml2argvtest.c -+++ libvirt-1.2.15/tests/qemuxml2argvtest.c -@@ -595,6 +595,8 @@ mymain(void) - DO_TEST("machine-usb-opt", QEMU_CAPS_MACHINE_OPT, - QEMU_CAPS_MACHINE_USB_OPT); - DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT); -+ DO_TEST("default-kvm-host-arch", QEMU_CAPS_MACHINE_OPT); -+ DO_TEST("default-qemu-host-arch", QEMU_CAPS_MACHINE_OPT); - DO_TEST("boot-cdrom", NONE); - DO_TEST("boot-network", NONE); - DO_TEST("boot-floppy", NONE); -Index: libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml -=================================================================== ---- /dev/null -+++ libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml -@@ -0,0 +1,21 @@ -+ -+ kvm -+ d091ea82-29e6-2e34-3005-f02617b36e87 -+ 4194304 -+ 4194304 -+ 4 -+ -+ hvm -+ -+ -+ -+ destroy -+ restart -+ destroy -+ -+ /usr/bin/kvm -+ -+ -+ -+ -+ -Index: libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml -=================================================================== ---- /dev/null -+++ libvirt-1.2.15/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml -@@ -0,0 +1,21 @@ -+ -+ qemu-host -+ d091ea82-29e6-2e34-3005-f02617b36e87 -+ 4194304 -+ 4194304 -+ 4 -+ -+ hvm -+ -+ -+ -+ destroy -+ restart -+ destroy -+ -+ /usr/bin/qemu-system-x86_64 -+ -+ -+ -+ -+ -Index: libvirt-1.2.15/tests/qemuxml2xmltest.c -=================================================================== ---- libvirt-1.2.15.orig/tests/qemuxml2xmltest.c -+++ libvirt-1.2.15/tests/qemuxml2xmltest.c -@@ -346,6 +346,8 @@ mymain(void) - DO_TEST("minimal"); - DO_TEST("machine-core-on"); - DO_TEST("machine-core-off"); -+ DO_TEST_DIFFERENT("default-kvm-host-arch"); -+ DO_TEST_DIFFERENT("default-qemu-host-arch"); - DO_TEST("boot-cdrom"); - DO_TEST("boot-network"); - DO_TEST("boot-floppy"); -Index: libvirt-1.2.15/tests/testutilsqemu.c -=================================================================== ---- libvirt-1.2.15.orig/tests/testutilsqemu.c -+++ libvirt-1.2.15/tests/testutilsqemu.c -@@ -354,6 +354,18 @@ virCapsPtr testQemuCapsInit(void) - NULL) == NULL) - goto cleanup; - -+ if ((machines = testQemuAllocMachines(&nmachines)) == NULL) -+ goto cleanup; -+ -+ if (virCapabilitiesAddGuestDomain(guest, -+ VIR_DOMAIN_VIRT_KVM, -+ "/usr/bin/qemu-kvm", -+ NULL, -+ nmachines, -+ machines) == NULL) -+ goto cleanup; -+ machines = NULL; -+ - if ((machines = testQemuAllocNewerMachines(&nmachines)) == NULL) - goto cleanup; - diff --git a/apparmor-fixes.patch b/apparmor-fixes.patch index d35d634..710c511 100644 --- a/apparmor-fixes.patch +++ b/apparmor-fixes.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu +Index: libvirt-1.2.16/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.2.15/examples/apparmor/libvirt-qemu +--- libvirt-1.2.16.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.2.16/examples/apparmor/libvirt-qemu @@ -124,6 +124,9 @@ # for restore /bin/bash rmix, diff --git a/apparmor-no-mount.patch b/apparmor-no-mount.patch index b5f043e..9feba98 100644 --- a/apparmor-no-mount.patch +++ b/apparmor-no-mount.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/examples/apparmor/libvirt-lxc +Index: libvirt-1.2.16/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.2.15.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.2.15/examples/apparmor/libvirt-lxc +--- libvirt-1.2.16.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.2.16/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include diff --git a/blockcopy-check-dst-identical-device.patch b/blockcopy-check-dst-identical-device.patch index cec0652..8b5cb4b 100644 --- a/blockcopy-check-dst-identical-device.patch +++ b/blockcopy-check-dst-identical-device.patch @@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-1.2.15/src/qemu/qemu_driver.c +Index: libvirt-1.2.16/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.2.15.orig/src/qemu/qemu_driver.c -+++ libvirt-1.2.15/src/qemu/qemu_driver.c -@@ -17019,6 +17019,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-1.2.16.orig/src/qemu/qemu_driver.c ++++ libvirt-1.2.16/src/qemu/qemu_driver.c +@@ -16993,6 +16993,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } diff --git a/c0d3f608-libxl-soundhw.patch b/c0d3f608-libxl-soundhw.patch deleted file mode 100644 index 1f53c4f..0000000 --- a/c0d3f608-libxl-soundhw.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit c0d3f608d6981c69f03d19252308a09545d1ab84 -Author: Jim Fehlig -Date: Mon May 4 13:50:10 2015 -0600 - - libxl: support soundhw for hvm domains - - The xend driver and the parsing/formating code in src/xenconfig - have long supported soundhw. Add support in the libxl driver too. - -Index: libvirt-1.2.15/src/libxl/libxl_conf.c -=================================================================== ---- libvirt-1.2.15.orig/src/libxl/libxl_conf.c -+++ libvirt-1.2.15/src/libxl/libxl_conf.c -@@ -678,6 +678,19 @@ libxlMakeDomBuildInfo(virDomainDefPtr de - libxl_defbool_set(&b_info->u.hvm.hpet, 1); - } - } -+ -+ if (def->nsounds > 0) { -+ /* -+ * Use first sound device. man xl.cfg(5) describes soundhw as -+ * a single device. From the man page: soundhw=DEVICE -+ */ -+ virDomainSoundDefPtr snd = def->sounds[0]; -+ -+ if (VIR_STRDUP(b_info->u.hvm.soundhw, -+ virDomainSoundModelTypeToString(snd->model)) < 0) -+ return -1; -+ } -+ - for (i = 0; i < def->os.nBootDevs; i++) { - switch (def->os.bootDevs[i]) { - case VIR_DOMAIN_BOOT_FLOPPY: diff --git a/disable-virCgroupGetPercpuStats-test.patch b/disable-virCgroupGetPercpuStats-test.patch index e80a821..682f72e 100644 --- a/disable-virCgroupGetPercpuStats-test.patch +++ b/disable-virCgroupGetPercpuStats-test.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/tests/vircgrouptest.c +Index: libvirt-1.2.16/tests/vircgrouptest.c =================================================================== ---- libvirt-1.2.15.orig/tests/vircgrouptest.c -+++ libvirt-1.2.15/tests/vircgrouptest.c +--- libvirt-1.2.16.orig/tests/vircgrouptest.c ++++ libvirt-1.2.16/tests/vircgrouptest.c @@ -34,7 +34,6 @@ # include "virfile.h" # include "virbuffer.h" diff --git a/libvirt-1.2.15.tar.gz b/libvirt-1.2.15.tar.gz deleted file mode 100644 index bcd2c05..0000000 --- a/libvirt-1.2.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6 -size 29094868 diff --git a/libvirt-1.2.15.tar.gz.asc b/libvirt-1.2.15.tar.gz.asc deleted file mode 100644 index 868d495..0000000 --- a/libvirt-1.2.15.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlVG6IgACgkQRga4pd6VvB8pUACfe0uCYnQVlAKIZz0R4ImEO37J -3zgAoImjy0DQTneMNMp3saPUc+NwONYH -=kDa/ ------END PGP SIGNATURE----- diff --git a/libvirt-1.2.16.tar.gz b/libvirt-1.2.16.tar.gz new file mode 100644 index 0000000..3bd8dce --- /dev/null +++ b/libvirt-1.2.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:419bee553442024b9ee8a1fa94023b1189bb52b7c3021fa37d8e4c108490060d +size 29157627 diff --git a/libvirt-1.2.16.tar.gz.asc b/libvirt-1.2.16.tar.gz.asc new file mode 100644 index 0000000..3c731e5 --- /dev/null +++ b/libvirt-1.2.16.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlVrxCsACgkQRga4pd6VvB9/SACfTRAvdCSH06+3RROrlKSNz7+P +2mgAnjcvia90gZinoVxUER/hA4v/fkND +=KdhP +-----END PGP SIGNATURE----- diff --git a/libvirt-guests-init-script.patch b/libvirt-guests-init-script.patch index ee4e3c1..09490e8 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.2.15/tools/libvirt-guests.init.in +Index: libvirt-1.2.16/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.2.15.orig/tools/libvirt-guests.init.in -+++ libvirt-1.2.15/tools/libvirt-guests.init.in +--- libvirt-1.2.16.orig/tools/libvirt-guests.init.in ++++ libvirt-1.2.16/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,10 +28,10 @@ Index: libvirt-1.2.15/tools/libvirt-guests.init.in ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.2.15/tools/libvirt-guests.sh.in +Index: libvirt-1.2.16/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.2.15.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.2.15/tools/libvirt-guests.sh.in +--- libvirt-1.2.16.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.2.16/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # . @@ -50,7 +50,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in # Source gettext library. # Make sure this file is recognized as having translations: _("dummy") . "@bindir@"/gettext.sh -@@ -44,9 +43,11 @@ test -f "$sysconfdir"/sysconfig/libvirt- +@@ -45,9 +44,11 @@ test -f "$sysconfdir"/sysconfig/libvirt- . "$sysconfdir"/sysconfig/libvirt-guests LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests @@ -65,7 +65,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in # retval COMMAND ARGUMENTS... # run command with arguments and convert non-zero return value to 1 and set -@@ -54,7 +55,7 @@ RETVAL=0 +@@ -55,7 +56,7 @@ RETVAL=0 retval() { "$@" if [ $? -ne 0 ]; then @@ -74,7 +74,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in return 1 else return 0 -@@ -83,6 +84,26 @@ run_virsh_c() { +@@ -84,6 +85,26 @@ run_virsh_c() { ( export LC_ALL=C; run_virsh "$@" ) } @@ -101,7 +101,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in # test_connect URI # check if URI is reachable test_connect() -@@ -116,7 +137,7 @@ list_guests() { +@@ -117,7 +138,7 @@ list_guests() { list=$(run_virsh_c "$uri" list --uuid $persistent) if [ $? -ne 0 ]; then @@ -110,7 +110,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in return 1 fi -@@ -142,7 +163,7 @@ guest_is_on() { +@@ -143,7 +164,7 @@ guest_is_on() { guest_running=false id=$(run_virsh "$uri" domid "$uuid") if [ $? -ne 0 ]; then @@ -119,7 +119,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in return 1 fi -@@ -192,6 +213,13 @@ start() { +@@ -193,6 +214,13 @@ start() { test_connect "$uri" || continue @@ -133,7 +133,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do name=$(guest_name "$uri" "$guest") -@@ -408,7 +436,7 @@ shutdown_guests_parallel() +@@ -409,7 +437,7 @@ shutdown_guests_parallel() timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then eval_gettext "Timeout expired while shutting down domains"; echo @@ -142,7 +142,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in return fi else -@@ -436,7 +464,7 @@ stop() { +@@ -437,7 +465,7 @@ stop() { if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -151,7 +151,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in return fi fi -@@ -484,14 +512,14 @@ stop() { +@@ -485,14 +513,14 @@ stop() { if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -168,7 +168,7 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in set +f return fi -@@ -550,14 +578,13 @@ gueststatus() { +@@ -551,14 +579,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo @@ -185,16 +185,16 @@ Index: libvirt-1.2.15/tools/libvirt-guests.sh.in fi fi } -@@ -602,4 +629,4 @@ case "$1" in +@@ -603,4 +630,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit -Index: libvirt-1.2.15/tools/libvirt-guests.sysconf +Index: libvirt-1.2.16/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.2.15.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.2.15/tools/libvirt-guests.sysconf +--- libvirt-1.2.16.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.2.16/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + diff --git a/libvirt-power8-models.patch b/libvirt-power8-models.patch index 72c3f85..5cba0dc 100644 --- a/libvirt-power8-models.patch +++ b/libvirt-power8-models.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/src/cpu/cpu_map.xml +Index: libvirt-1.2.16/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.2.15.orig/src/cpu/cpu_map.xml -+++ libvirt-1.2.15/src/cpu/cpu_map.xml +--- libvirt-1.2.16.orig/src/cpu/cpu_map.xml ++++ libvirt-1.2.16/src/cpu/cpu_map.xml @@ -668,6 +668,16 @@ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index 82618b5..3eafe09 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/configure.ac +Index: libvirt-1.2.16/configure.ac =================================================================== ---- libvirt-1.2.15.orig/configure.ac -+++ libvirt-1.2.15/configure.ac +--- libvirt-1.2.16.orig/configure.ac ++++ libvirt-1.2.16/configure.ac @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -34,10 +34,10 @@ Index: libvirt-1.2.15/configure.ac LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.2.15/src/Makefile.am +Index: libvirt-1.2.16/src/Makefile.am =================================================================== ---- libvirt-1.2.15.orig/src/Makefile.am -+++ libvirt-1.2.15/src/Makefile.am +--- libvirt-1.2.16.orig/src/Makefile.am ++++ libvirt-1.2.16/src/Makefile.am @@ -848,6 +848,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c @@ -49,7 +49,7 @@ Index: libvirt-1.2.15/src/Makefile.am if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1464,6 +1468,10 @@ if WITH_NETCF +@@ -1466,6 +1470,10 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) endif WITH_NETCF @@ -60,10 +60,10 @@ Index: libvirt-1.2.15/src/Makefile.am if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-1.2.15/tools/virsh.c +Index: libvirt-1.2.16/tools/virsh.c =================================================================== ---- libvirt-1.2.15.orig/tools/virsh.c -+++ libvirt-1.2.15/tools/virsh.c +--- libvirt-1.2.16.orig/tools/virsh.c ++++ libvirt-1.2.16/tools/virsh.c @@ -3327,6 +3327,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -73,10 +73,10 @@ Index: libvirt-1.2.15/tools/virsh.c # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.2.15/src/interface/interface_backend_netcf.c +Index: libvirt-1.2.16/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.2.15.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.2.15/src/interface/interface_backend_netcf.c +--- libvirt-1.2.16.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.2.16/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include @@ -160,10 +160,10 @@ Index: libvirt-1.2.15/src/interface/interface_backend_netcf.c if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-1.2.15/src/interface/interface_driver.c +Index: libvirt-1.2.16/src/interface/interface_driver.c =================================================================== ---- libvirt-1.2.15.orig/src/interface/interface_driver.c -+++ libvirt-1.2.15/src/interface/interface_driver.c +--- libvirt-1.2.16.orig/src/interface/interface_driver.c ++++ libvirt-1.2.16/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -181,10 +181,10 @@ Index: libvirt-1.2.15/src/interface/interface_driver.c if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.2.15/m4/virt-netcontrol.m4 +Index: libvirt-1.2.16/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.2.15/m4/virt-netcontrol.m4 ++++ libvirt-1.2.16/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl diff --git a/libvirt.changes b/libvirt.changes index cb23576..b6db3ea 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jun 1 09:31:11 MDT 2015 - jfehlig@suse.com + +- Update to libvirt 1.2.16 + - Introduce pci-serial + - Introduce virDomainSetUserPassword API + - Introduce protected key mgmt ops + - Add domain vmport feature + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Drop upstream patches c0d3f608-libxl-soundhw.patch and + 8910e063-arch-caps.patch + - Drop polkit-10-virt.rules in favor of upstream 50-libvirt.rules + ------------------------------------------------------------------- Wed May 20 08:29:00 UTC 2015 - dmacvicar@suse.de diff --git a/libvirt.spec b/libvirt.spec index 1b9373d..e37030c 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -240,7 +240,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.2.15 +Version: 1.2.16 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -441,11 +441,8 @@ Source1: %{name}-%{version}.tar.gz.asc Source2: %{name}.keyring Source3: libvirtd.init Source4: libvirtd-relocation-server.fw -Source5: polkit-10-virt.rules Source99: baselibs.conf # Upstream patches -Patch0: c0d3f608-libxl-soundhw.patch -Patch1: 8910e063-arch-caps.patch # Patches pending upstream review # Need to go upstream Patch150: xen-pv-cdrom.patch @@ -975,8 +972,6 @@ Provides a dissector for the libvirt RPC protocol to help debugging it. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -1304,7 +1299,8 @@ of managing Xen. EOF %endif %if ! %{with_libxl} -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %endif @@ -1350,10 +1346,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir} ln -s %{_sysconfdir}/init.d/libvirt-guests $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests %endif mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirt-guests $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests -%if %{with_polkit_rules} -install -d $RPM_BUILD_ROOT%{_sysconfdir}/polkit-1/rules.d/ -install %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/polkit-1/rules.d/10-virt.rules -%endif %fdupes -s $RPM_BUILD_ROOT %clean @@ -1519,7 +1511,7 @@ fi %attr(0755, root, root) %{_libdir}/%{name}/lock-driver/lockd.so %if %{with_polkit} %if %{with_polkit_rules} -%{_sysconfdir}/polkit-1/rules.d/10-virt.rules +%{_datadir}/polkit-1/rules.d/50-libvirt.rules %endif %if 0%{?suse_version} > 1110 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy @@ -1585,6 +1577,7 @@ fi %endif %if %{with_libxl} %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ @@ -1725,6 +1718,7 @@ fi %files daemon-driver-libxl %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf %{_datadir}/augeas/lenses/libvirtd_libxl.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index 5badfe5..026f729 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/daemon/libvirtd.conf +Index: libvirt-1.2.16/daemon/libvirtd.conf =================================================================== ---- libvirt-1.2.15.orig/daemon/libvirtd.conf -+++ libvirt-1.2.15/daemon/libvirtd.conf +--- libvirt-1.2.16.orig/daemon/libvirtd.conf ++++ libvirt-1.2.16/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.2.15/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.2.15/daemon/libvirtd-config.c +Index: libvirt-1.2.16/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.2.15.orig/daemon/libvirtd-config.c -+++ libvirt-1.2.15/daemon/libvirtd-config.c +--- libvirt-1.2.16.orig/daemon/libvirtd-config.c ++++ libvirt-1.2.16/daemon/libvirtd-config.c @@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ Index: libvirt-1.2.15/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-1.2.15/daemon/test_libvirtd.aug.in +Index: libvirt-1.2.16/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.2.15.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.2.15/daemon/test_libvirtd.aug.in +--- libvirt-1.2.16.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.2.16/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: diff --git a/libvirtd-init-script.patch b/libvirtd-init-script.patch index 2cdf5a4..170c316 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.2.15/daemon/libvirtd.sysconf +Index: libvirt-1.2.16/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.2.15.orig/daemon/libvirtd.sysconf -+++ libvirt-1.2.15/daemon/libvirtd.sysconf +--- libvirt-1.2.16.orig/daemon/libvirtd.sysconf ++++ libvirt-1.2.16/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + diff --git a/polkit-10-virt.rules b/polkit-10-virt.rules deleted file mode 100644 index 0fcb521..0000000 --- a/polkit-10-virt.rules +++ /dev/null @@ -1,8 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id == "org.libvirt.unix.manage" - && subject.local - && subject.active - && subject.isInGroup("libvirt")) { - return polkit.Result.YES; - } -}); diff --git a/ppc64le-canonical-name.patch b/ppc64le-canonical-name.patch index 8edc2d5..e1b8f00 100644 --- a/ppc64le-canonical-name.patch +++ b/ppc64le-canonical-name.patch @@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64 See bnc#894956 -Index: libvirt-1.2.15/src/util/virarch.c +Index: libvirt-1.2.16/src/util/virarch.c =================================================================== ---- libvirt-1.2.15.orig/src/util/virarch.c -+++ libvirt-1.2.15/src/util/virarch.c +--- libvirt-1.2.16.orig/src/util/virarch.c ++++ libvirt-1.2.16/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { diff --git a/qemu-apparmor-screenshot.patch b/qemu-apparmor-screenshot.patch index cb3929b..906e62b 100644 --- a/qemu-apparmor-screenshot.patch +++ b/qemu-apparmor-screenshot.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu +Index: libvirt-1.2.16/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.2.15/examples/apparmor/libvirt-qemu +--- libvirt-1.2.16.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.2.16/examples/apparmor/libvirt-qemu @@ -133,6 +133,9 @@ /sys/bus/ r, /sys/class/ r, diff --git a/support-managed-pci-xen-driver.patch b/support-managed-pci-xen-driver.patch index 7609d63..c410171 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.2.15/src/xenconfig/xen_common.c +Index: libvirt-1.2.16/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.2.15.orig/src/xenconfig/xen_common.c -+++ libvirt-1.2.15/src/xenconfig/xen_common.c +--- libvirt-1.2.16.orig/src/xenconfig/xen_common.c ++++ libvirt-1.2.16/src/xenconfig/xen_common.c @@ -403,6 +403,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ Index: libvirt-1.2.15/src/xenconfig/xen_common.c hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.16/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.15/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.16.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.16/src/xenconfig/xen_sxpr.c @@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 28365e8..6a5e2dd 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/src/qemu/qemu.conf +Index: libvirt-1.2.16/src/qemu/qemu.conf =================================================================== ---- libvirt-1.2.15.orig/src/qemu/qemu.conf -+++ libvirt-1.2.15/src/qemu/qemu.conf +--- libvirt-1.2.16.orig/src/qemu/qemu.conf ++++ libvirt-1.2.16/src/qemu/qemu.conf @@ -201,11 +201,20 @@ # isolation, but it cannot appear in a list of drivers. # diff --git a/systemd-service-xen.patch b/systemd-service-xen.patch index 09e4654..e770105 100644 --- a/systemd-service-xen.patch +++ b/systemd-service-xen.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/daemon/libvirtd.service.in +Index: libvirt-1.2.16/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.2.15.orig/daemon/libvirtd.service.in -+++ libvirt-1.2.15/daemon/libvirtd.service.in +--- libvirt-1.2.16.orig/daemon/libvirtd.service.in ++++ libvirt-1.2.16/daemon/libvirtd.service.in @@ -5,6 +5,8 @@ After=network.target After=dbus.service After=iscsid.service diff --git a/virtlockd-init-script.patch b/virtlockd-init-script.patch index 7957fef..9c4ebaf 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.2.15/src/locking/virtlockd.sysconf +Index: libvirt-1.2.16/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.15.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.15/src/locking/virtlockd.sysconf +--- libvirt-1.2.16.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.16/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ Index: libvirt-1.2.15/src/locking/virtlockd.sysconf # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.2.15/src/locking/virtlockd.init.in +Index: libvirt-1.2.16/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.15.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.15/src/locking/virtlockd.init.in +--- libvirt-1.2.16.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.16/src/locking/virtlockd.init.in @@ -4,12 +4,14 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # diff --git a/xen-pv-cdrom.patch b/xen-pv-cdrom.patch index bd44536..6592c1b 100644 --- a/xen-pv-cdrom.patch +++ b/xen-pv-cdrom.patch @@ -1,7 +1,7 @@ -Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.16/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.15/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.16.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.16/src/xenconfig/xen_sxpr.c @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, static int xenParseSxprDisks(virDomainDefPtr def, From 55164a402dbbf382efd82c4facfc502c4f3bbdb074288fd0e35ed3ea979a6d3c Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 2 Jun 2015 15:30:34 +0000 Subject: [PATCH 2/4] - spec: Add libvirtd.socket unit file to service_add_pre and service_del_postun macros OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=464 --- libvirt.changes | 6 ++++++ libvirt.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libvirt.changes b/libvirt.changes index b6db3ea..6a53c25 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 2 09:27:22 MDT 2015 - jfehlig@suse.com + +- spec: Add libvirtd.socket unit file to service_add_pre and + service_del_postun macros + ------------------------------------------------------------------- Mon Jun 1 09:31:11 MDT 2015 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index e37030c..67400fc 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -1387,7 +1387,7 @@ fi %pre daemon %if %{with_systemd} -%service_add_pre libvirtd.service +%service_add_pre libvirtd.service libvirtd.socket %service_add_pre virtlockd.service virtlockd.socket %endif %{_bindir}/getent group libvirt >/dev/null || \ @@ -1414,7 +1414,7 @@ fi %postun daemon /sbin/ldconfig %if %{with_systemd} -%service_del_postun libvirtd.service +%service_del_postun libvirtd.service libvirtd.socket %service_del_postun virtlockd.service virtlockd.socket %else %restart_on_update libvirtd From 4e3feede944295d2fb5e7090e738b234a5b76a944f58c0321bcaba4fd5eb46a5 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 3 Jun 2015 17:34:40 +0000 Subject: [PATCH 3/4] - Remove unsupported settings in libvirtd.socket unit file when systemd version < 214 libvirtd-systemd-socket.patch bsc#933043 - spec: always apply Apparmor and netcontrol patches OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=465 --- libvirt.changes | 9 +++++++++ libvirt.spec | 24 +++++++++++++----------- libvirtd-systemd-socket.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 libvirtd-systemd-socket.patch diff --git a/libvirt.changes b/libvirt.changes index 6a53c25..f43edeb 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 3 11:29:32 MDT 2015 - jfehlig@suse.com + +- Remove unsupported settings in libvirtd.socket unit file when + systemd version < 214 + libvirtd-systemd-socket.patch + bsc#933043 +- spec: always apply Apparmor and netcontrol patches + ------------------------------------------------------------------- Tue Jun 2 09:27:22 MDT 2015 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 67400fc..0835a5d 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -436,6 +436,8 @@ BuildRequires: numad BuildRequires: wireshark-devel %endif +%global systemd_version %(pkg-config --modversion systemd) + Source0: %{name}-%{version}.tar.gz Source1: %{name}-%{version}.tar.gz.asc Source2: %{name}.keyring @@ -460,12 +462,13 @@ Patch205: support-managed-pci-xen-driver.patch Patch206: systemd-service-xen.patch # Disable failing virCgroupGetPercpuStats unit test Patch207: disable-virCgroupGetPercpuStats-test.patch -%if %{with_apparmor} -Patch250: apparmor-no-mount.patch -Patch251: qemu-apparmor-screenshot.patch -%endif -%if %{with_netcontrol} -Patch300: libvirt-suse-netcontrol.patch +Patch208: apparmor-no-mount.patch +Patch209: qemu-apparmor-screenshot.patch +Patch210: libvirt-suse-netcontrol.patch +# SocketUser and SocketGroup settings were added to systemd.socket in +# version 214. Patch the setting away in earlier systemd +%if 0%{systemd_version} < 214 +Patch300: libvirtd-systemd-socket.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -985,11 +988,10 @@ Provides a dissector for the libvirt RPC protocol to help debugging it. %patch205 -p1 %patch206 -p1 %patch207 -p1 -%if %{with_apparmor} -%patch250 -p1 -%patch251 -p1 -%endif -%if %{with_netcontrol} +%patch208 -p1 +%patch209 -p1 +%patch210 -p1 +%if 0%{systemd_version} < 214 %patch300 -p1 %endif diff --git a/libvirtd-systemd-socket.patch b/libvirtd-systemd-socket.patch new file mode 100644 index 0000000..9b5586e --- /dev/null +++ b/libvirtd-systemd-socket.patch @@ -0,0 +1,28 @@ +Remove unsupported systemd.socket settings + +The libvirtd.socket unit file contains SocketUser and SocketGroup +settings that were introduced in systemd version 214. Remove the +setting to prevent unnecessary and confusing journal entries such +as + + Unknown lvalue 'SocketGroup' in section 'Socket' + +See bsc#933043 + +Index: libvirt-1.2.16/daemon/libvirtd.socket.in +=================================================================== +--- libvirt-1.2.16.orig/daemon/libvirtd.socket.in ++++ libvirt-1.2.16/daemon/libvirtd.socket.in +@@ -2,10 +2,8 @@ + ListenStream=@runstatedir@/libvirt/libvirt-sock + ListenStream=@runstatedir@/libvirt/libvirt-sock-ro + +-; The following settings must match libvirtd.conf file in order to +-; work as expected because libvirtd can't change them later. ++; The following setting must match libvirtd.conf file in order to ++; work as expected because libvirtd can't change it later. + ; SocketMode=0777 is safe only if authentication on the socket is set + ; up. For further information, please see the libvirtd.conf file. + SocketMode=0777 +-SocketUser=root +-SocketGroup=root From 8720257f584895d49f8669841d7615f223270f0b120bb7dc74109afb6a391230 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 3 Jun 2015 17:36:37 +0000 Subject: [PATCH 4/4] add missing BuildRequires for systemd pkgconfig file OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=466 --- libvirt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec b/libvirt.spec index 0835a5d..2470b65 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -297,6 +297,7 @@ BuildRequires: libtool BuildRequires: modutils %if %{with_systemd} BuildRequires: systemd +BuildRequires: pkgconfig(systemd) %endif %if %{with_systemd_daemon} BuildRequires: systemd-devel