From dd619b7ec6ce3f6e0ccaaf63698d61d39a66398f Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 18 Mar 2016 13:26:08 +0000 Subject: [PATCH] - updated for 1.3.2 --- bashisms.patch | 16 ++- libvirt-guests.init.patch | 7 +- libvirt-qemu-acl.patch | 64 ++++----- libvirt-sasl.patch | 248 +++++++++++++++++++++++++---------- libvirt-sysctl-dir.patch | 8 +- libvirt-udevadm-settle.patch | 8 +- libvirt-xend.patch | 40 +++--- 7 files changed, 255 insertions(+), 136 deletions(-) diff --git a/bashisms.patch b/bashisms.patch index 9d7dfc4..6956bdc 100644 --- a/bashisms.patch +++ b/bashisms.patch @@ -1,8 +1,18 @@ ---- libvirt-1.2.3/tools/libvirt-guests.sh.in~ 2014-02-26 05:09:50.000000000 +0200 -+++ libvirt-1.2.3/tools/libvirt-guests.sh.in 2014-04-05 02:52:16.187741175 +0300 +diff -urp libvirt-1.3.2.orig/tools/libvirt-guests.sh.in libvirt-1.3.2/tools/libvirt-guests.sh.in +--- libvirt-1.3.2.orig/tools/libvirt-guests.sh.in 2015-05-23 12:56:12.000000000 +0000 ++++ libvirt-1.3.2/tools/libvirt-guests.sh.in 2016-03-18 12:43:31.898768000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash - # Copyright (C) 2011-2013 Red Hat, Inc. + # Copyright (C) 2011-2014 Red Hat, Inc. # +diff -urp libvirt-1.3.2.orig/src/locking/virtlockd.init.in libvirt-1.3.2/src/locking/virtlockd.init.in +--- libvirt-1.3.2.orig/src/locking/virtlockd.init.in 2016-01-12 00:12:06.000000000 +0000 ++++ libvirt-1.3.2/src/locking/virtlockd.init.in 2016-03-18 12:35:57.135768000 +0000 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # the following is the LSB init header see + # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html diff --git a/libvirt-guests.init.patch b/libvirt-guests.init.patch index da84255..1ed5514 100644 --- a/libvirt-guests.init.patch +++ b/libvirt-guests.init.patch @@ -1,6 +1,7 @@ ---- libvirt-1.2.3/./tools/libvirt-guests.init.in~ 2012-12-12 04:29:55.000000000 +0200 -+++ libvirt-1.2.3/./tools/libvirt-guests.init.in 2014-04-06 12:13:29.091387594 +0300 -@@ -25,3 +25,6 @@ +diff -urp libvirt-1.3.2.orig/tools/libvirt-guests.init.in libvirt-1.3.2/tools/libvirt-guests.init.in +--- libvirt-1.3.2.orig/tools/libvirt-guests.init.in 2016-01-12 00:12:07.000000000 +0000 ++++ libvirt-1.3.2/tools/libvirt-guests.init.in 2016-03-18 12:49:39.288768000 +0000 +@@ -28,3 +28,6 @@ # exec @libexecdir@/libvirt-guests.sh "$@" diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index 13fa7ee..fda5d65 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,21 +1,22 @@ -From: Neil Wilson -To: libvir-list@redhat.com -Date: Mon, 10 Jan 2011 09:52:56 +0000 -Message-ID: <1294653176.3013.16.camel@lenovo-3000-n100> - -Hi, - -Here's the patch to add basic ACL support to QEMU within libvirt. Like -SASL it's ignored by RHEL5's default qemu. Newer qemu picks it up as -expected and you can manipulate the acls using 'virsh'. - - -diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf -index ba41f80..7ab5eee 100644 ---- a/src/qemu/qemu.conf -+++ b/src/qemu/qemu.conf -@@ -71,6 +71,15 @@ - # vnc_sasl = 1 +diff -urp libvirt-1.3.2.orig/src/qemu/qemu_command.c libvirt-1.3.2/src/qemu/qemu_command.c +--- libvirt-1.3.2.orig/src/qemu/qemu_command.c 2016-02-24 01:55:16.000000000 +0000 ++++ libvirt-1.3.2/src/qemu/qemu_command.c 2016-03-18 12:33:26.562768000 +0000 +@@ -6047,6 +6047,10 @@ qemuBuildGraphicsSPICECommandLine(virQEM + } else { + virBufferAddLit(&opt, ",disable-agent-file-xfer"); + } ++ ++ if (cfg->vncACL) ++ virBufferAddLit(&opt, ",acl"); ++ + } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) { +diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf +--- libvirt-1.3.2.orig/src/qemu/qemu.conf 2016-03-18 12:16:11.000000000 +0000 ++++ libvirt-1.3.2/src/qemu/qemu.conf 2016-03-18 12:33:26.556768000 +0000 +@@ -80,6 +80,15 @@ + #vnc_sasl = 1 +# Enable the VNC access control lists. When switched on this will @@ -30,22 +31,10 @@ index ba41f80..7ab5eee 100644 # The default SASL configuration file is located in /etc/sasl/ # When running libvirtd unprivileged, it may be desirable to # override the configs in this location. Set this parameter to ---- libvirt-1.0.6/src/qemu/qemu_command.c.orig 2013-06-16 15:45:37.115181922 +0200 -+++ libvirt-1.0.6/src/qemu/qemu_command.c 2013-06-16 15:47:49.335179175 +0200 -@@ -6178,6 +6178,10 @@ - - /* TODO: Support ACLs later */ - } -+ -+ if (cfg->vncACL) -+ virBufferAddLit(&opt, ",acl"); -+ - } - - virCommandAddArg(cmd, "-vnc"); ---- libvirt-1.1.3/src/qemu/qemu_conf.c.orig 2013-10-22 20:38:43.522043292 +0200 -+++ libvirt-1.1.3/src/qemu/qemu_conf.c 2013-10-22 20:45:19.515360007 +0200 -@@ -357,6 +357,7 @@ +diff -urp libvirt-1.3.2.orig/src/qemu/qemu_conf.c libvirt-1.3.2/src/qemu/qemu_conf.c +--- libvirt-1.3.2.orig/src/qemu/qemu_conf.c 2016-02-24 01:55:16.000000000 +0000 ++++ libvirt-1.3.2/src/qemu/qemu_conf.c 2016-03-18 12:33:26.563768000 +0000 +@@ -536,6 +536,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir); GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio); GET_VALUE_BOOL("nographics_allow_host_audio", cfg->nogfxAllowHostAudio); @@ -53,9 +42,10 @@ index ba41f80..7ab5eee 100644 p = virConfGetValue(conf, "security_driver"); if (p && p->type == VIR_CONF_LIST) { ---- libvirt-1.0.3/src/qemu/qemu_conf.h.orig 2013-03-09 13:10:30.059751685 +0100 -+++ libvirt-1.0.3/src/qemu/qemu_conf.h 2013-03-09 13:54:17.296308093 +0100 -@@ -102,6 +102,7 @@ +diff -urp libvirt-1.3.2.orig/src/qemu/qemu_conf.h libvirt-1.3.2/src/qemu/qemu_conf.h +--- libvirt-1.3.2.orig/src/qemu/qemu_conf.h 2016-01-10 01:57:37.000000000 +0000 ++++ libvirt-1.3.2/src/qemu/qemu_conf.h 2016-03-18 12:33:26.563768000 +0000 +@@ -112,6 +112,7 @@ struct _virQEMUDriverConfig { bool vncTLS; bool vncTLSx509verify; bool vncSASL; diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 3e19ce6..d9f1675 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,16 +1,16 @@ -diff -ru libvirt-0.8.8/daemon/libvirtd.conf libvirt-0.8.8-sasl/daemon/libvirtd.conf ---- libvirt-0.8.8/daemon/libvirtd.conf 2010-12-20 14:35:22.000000000 +0100 -+++ libvirt-0.8.8-sasl/daemon/libvirtd.conf 2011-04-28 11:45:47.727741165 +0200 -@@ -111,7 +111,7 @@ +diff -urp libvirt-1.3.2.orig/daemon/libvirtd.conf libvirt-1.3.2/daemon/libvirtd.conf +--- libvirt-1.3.2.orig/daemon/libvirtd.conf 2016-01-10 01:57:37.000000000 +0000 ++++ libvirt-1.3.2/daemon/libvirtd.conf 2016-03-18 06:57:24.113768000 +0000 +@@ -128,7 +128,7 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then -# controlled from /etc/sasl2/libvirt.conf. For the TCP +# controlled from /etc/sasl/libvirt.conf. For the TCP # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. - # For non-TCP or TLS sockets, any scheme is allowed. + # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -142,7 +142,7 @@ +@@ -159,7 +159,7 @@ # If you don't enable SASL, then all TCP traffic is cleartext. # Don't do this outside of a dev/test scenario. For real world # use, always enable SASL and use the GSSAPI or DIGEST-MD5 @@ -19,9 +19,10 @@ diff -ru libvirt-0.8.8/daemon/libvirtd.conf libvirt-0.8.8-sasl/daemon/libvirtd.c #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. ---- libvirt-1.1.3/daemon/Makefile.am.orig 2013-10-22 16:46:45.409294047 +0200 -+++ libvirt-1.1.3/daemon/Makefile.am 2013-10-22 20:09:12.185450964 +0200 -@@ -453,13 +453,13 @@ +diff -urp libvirt-1.3.2.orig/daemon/Makefile.am libvirt-1.3.2/daemon/Makefile.am +--- libvirt-1.3.2.orig/daemon/Makefile.am 2016-02-24 01:55:16.000000000 +0000 ++++ libvirt-1.3.2/daemon/Makefile.am 2016-03-18 06:57:24.114768000 +0000 +@@ -521,13 +521,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in # the WITH_LIBVIRTD conditional if WITH_SASL install-data-sasl: @@ -39,35 +40,55 @@ diff -ru libvirt-0.8.8/daemon/libvirtd.conf libvirt-0.8.8-sasl/daemon/libvirtd.c else ! WITH_SASL install-data-sasl: uninstall-data-sasl: -diff -ru libvirt-0.8.8/daemon/test_libvirtd.aug libvirt-0.8.8-sasl/daemon/test_libvirtd.aug -diff -ru libvirt-0.8.8/docs/auth.html libvirt-0.8.8-sasl/docs/auth.html ---- libvirt-0.8.8/docs/auth.html 2011-02-17 05:13:12.000000000 +0100 -+++ libvirt-0.8.8-sasl/docs/auth.html 2011-04-28 11:45:43.429741167 +0200 -@@ -273,7 +273,7 @@ +diff -urp libvirt-1.3.2.orig/daemon/Makefile.in libvirt-1.3.2/daemon/Makefile.in +--- libvirt-1.3.2.orig/daemon/Makefile.in 2016-03-01 03:19:22.000000000 +0000 ++++ libvirt-1.3.2/daemon/Makefile.in 2016-03-18 12:16:33.415768000 +0000 +@@ -2832,13 +2832,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in + # This is needed for clients too, so can't wrap in + # the WITH_LIBVIRTD conditional + @WITH_SASL_TRUE@install-data-sasl: +-@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ ++@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/ + @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \ +-@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf ++@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf + + @WITH_SASL_TRUE@uninstall-data-sasl: +-@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf +-@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || : ++@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf ++@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || : + @WITH_SASL_FALSE@install-data-sasl: + @WITH_SASL_FALSE@uninstall-data-sasl: + +diff -urp libvirt-1.3.2.orig/docs/auth.html libvirt-1.3.2/docs/auth.html +--- libvirt-1.3.2.orig/docs/auth.html 2016-02-24 01:58:13.000000000 +0000 ++++ libvirt-1.3.2/docs/auth.html 2016-03-18 06:57:24.115768000 +0000 +@@ -400,7 +400,7 @@ again: The plain TCP socket of the libvirt daemon defaults to using SASL for authentication. The SASL mechanism configured by default is DIGEST-MD5, which provides a basic username+password style authentication. To enable Kerberos single-sign-on instead, -the libvirt SASL configuration file must be changed. This is /etc/sasl2/libvirt.conf. +the libvirt SASL configuration file must be changed. This is /etc/sasl/libvirt.conf. The mech_list parameter must first be changed to gssapi - instead of the default digest-md5. If SASL is enabled on the UNIX - and/or TLS sockets, Kerberos will also be used for them. Like DIGEST-MD5, the Kerberos -diff -ru libvirt-0.8.8/docs/auth.html.in libvirt-0.8.8-sasl/docs/auth.html.in ---- libvirt-0.8.8/docs/auth.html.in 2010-12-20 14:35:22.000000000 +0100 -+++ libvirt-0.8.8-sasl/docs/auth.html.in 2011-04-28 11:45:43.586741167 +0200 -@@ -115,7 +115,7 @@ + instead of the default digest-md5, and keytab should be set to + /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX +diff -urp libvirt-1.3.2.orig/docs/auth.html.in libvirt-1.3.2/docs/auth.html.in +--- libvirt-1.3.2.orig/docs/auth.html.in 2015-01-23 11:44:53.000000000 +0000 ++++ libvirt-1.3.2/docs/auth.html.in 2016-03-18 06:57:24.116768000 +0000 +@@ -234,7 +234,7 @@ again: The plain TCP socket of the libvirt daemon defaults to using SASL for authentication. The SASL mechanism configured by default is DIGEST-MD5, which provides a basic username+password style authentication. To enable Kerberos single-sign-on instead, -the libvirt SASL configuration file must be changed. This is /etc/sasl2/libvirt.conf. +the libvirt SASL configuration file must be changed. This is /etc/sasl/libvirt.conf. The mech_list parameter must first be changed to gssapi - instead of the default digest-md5. If SASL is enabled on the UNIX - and/or TLS sockets, Kerberos will also be used for them. Like DIGEST-MD5, the Kerberos -diff -ru libvirt-0.8.8/libvirt.spec libvirt-0.8.8-sasl/libvirt.spec ---- libvirt-0.8.8/libvirt.spec 2011-02-17 05:13:09.000000000 +0100 -+++ libvirt-0.8.8-sasl/libvirt.spec 2011-04-28 11:45:43.675741167 +0200 -@@ -933,7 +933,7 @@ + instead of the default digest-md5, and keytab should be set to + /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX +diff -urp libvirt-1.3.2.orig/libvirt.spec libvirt-1.3.2/libvirt.spec +--- libvirt-1.3.2.orig/libvirt.spec 2016-03-01 03:20:27.000000000 +0000 ++++ libvirt-1.3.2/libvirt.spec 2016-03-18 06:57:24.118768000 +0000 +@@ -2316,7 +2316,7 @@ exit 0 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %if %{with_sasl} @@ -75,11 +96,11 @@ diff -ru libvirt-0.8.8/libvirt.spec libvirt-0.8.8-sasl/libvirt.spec +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf %endif - %files devel -diff -ru libvirt-0.8.8/libvirt.spec.in libvirt-0.8.8-sasl/libvirt.spec.in ---- libvirt-0.8.8/libvirt.spec.in 2011-02-17 05:10:58.000000000 +0100 -+++ libvirt-0.8.8-sasl/libvirt.spec.in 2011-04-28 11:45:43.672741167 +0200 -@@ -933,7 +933,7 @@ + %if %{with_wireshark} +diff -urp libvirt-1.3.2.orig/libvirt.spec.in libvirt-1.3.2/libvirt.spec.in +--- libvirt-1.3.2.orig/libvirt.spec.in 2016-03-01 03:18:39.000000000 +0000 ++++ libvirt-1.3.2/libvirt.spec.in 2016-03-18 06:57:24.119768000 +0000 +@@ -2316,7 +2316,7 @@ exit 0 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %if %{with_sasl} @@ -87,9 +108,10 @@ diff -ru libvirt-0.8.8/libvirt.spec.in libvirt-0.8.8-sasl/libvirt.spec.in +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf %endif - %files devel ---- libvirt-0.9.13/src/qemu/qemu.conf.orig 2012-05-31 16:23:22.000000000 +0200 -+++ libvirt-0.9.13/src/qemu/qemu.conf 2012-07-08 11:37:16.366378718 +0200 + %if %{with_wireshark} +diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf +--- libvirt-1.3.2.orig/src/qemu/qemu.conf 2015-11-27 12:43:23.000000000 +0000 ++++ libvirt-1.3.2/src/qemu/qemu.conf 2016-03-18 12:16:11.751768000 +0000 @@ -74,18 +74,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -112,11 +134,51 @@ diff -ru libvirt-0.8.8/libvirt.spec.in libvirt-0.8.8-sasl/libvirt.spec.in # QEMU implements an extension for providing audio over a VNC connection, -diff -ru libvirt-0.8.8/src/qemu/test_libvirtd_qemu.aug libvirt-0.8.8-sasl/src/qemu/test_libvirtd_qemu.aug -diff -ru libvirt-0.8.8/tests/confdata/libvirtd.conf libvirt-0.8.8-sasl/tests/confdata/libvirtd.conf ---- libvirt-0.8.8/tests/confdata/libvirtd.conf 2010-05-27 14:03:22.000000000 +0200 -+++ libvirt-0.8.8-sasl/tests/confdata/libvirtd.conf 2011-04-28 11:45:46.878741165 +0200 -@@ -102,7 +102,7 @@ +@@ -143,17 +143,17 @@ + # Enable use of SASL encryption on the SPICE server. This requires + # a SPICE client which supports the SASL protocol extension. + # +-# It is necessary to configure /etc/sasl2/qemu.conf to choose ++# It is necessary to configure /etc/sasl/qemu.conf to choose + # the desired SASL plugin (eg, GSSPI for Kerberos) + # + #spice_sasl = 1 + +-# The default SASL configuration file is located in /etc/sasl2/ ++# The default SASL configuration file is located in /etc/sasl/ + # When running libvirtd unprivileged, it may be desirable to + # override the configs in this location. Set this parameter to + # point to the directory, and create a qemu.conf in that location + # +-#spice_sasl_dir = "/some/directory/sasl2" ++#spice_sasl_dir = "/some/directory/sasl" + + + # By default, if no graphical front end is configured, libvirt will disable +diff -urp libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.2/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in 2015-11-27 12:43:23.000000000 +0000 ++++ libvirt-1.3.2/src/qemu/test_libvirtd_qemu.aug.in 2016-03-18 12:16:00.319768000 +0000 +@@ -9,14 +9,14 @@ module Test_libvirtd_qemu = + { "vnc_tls_x509_verify" = "1" } + { "vnc_password" = "XYZ12345" } + { "vnc_sasl" = "1" } +-{ "vnc_sasl_dir" = "/some/directory/sasl2" } ++{ "vnc_sasl_dir" = "/some/directory/sasl" } + { "vnc_allow_host_audio" = "0" } + { "spice_listen" = "0.0.0.0" } + { "spice_tls" = "1" } + { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } + { "spice_password" = "XYZ12345" } + { "spice_sasl" = "1" } +-{ "spice_sasl_dir" = "/some/directory/sasl2" } ++{ "spice_sasl_dir" = "/some/directory/sasl" } + { "nographics_allow_host_audio" = "1" } + { "remote_display_port_min" = "5900" } + { "remote_display_port_max" = "65535" } +diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.conf libvirt-1.3.2/tests/confdata/libvirtd.conf +--- libvirt-1.3.2.orig/tests/confdata/libvirtd.conf 2015-06-28 03:29:13.000000000 +0000 ++++ libvirt-1.3.2/tests/confdata/libvirtd.conf 2016-03-18 06:57:24.120768000 +0000 +@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -125,7 +187,7 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.conf libvirt-0.8.8-sasl/tests/con # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -133,7 +133,7 @@ +@@ -139,7 +139,7 @@ auth_unix_rw = "none" # If you don't enable SASL, then all TCP traffic is cleartext. # Don't do this outside of a dev/test scenario. For real world # use, always enable SASL and use the GSSAPI or DIGEST-MD5 @@ -134,10 +196,10 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.conf libvirt-0.8.8-sasl/tests/con auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/confdata/libvirtd.out ---- libvirt-0.8.8/tests/confdata/libvirtd.out 2010-05-27 14:03:22.000000000 +0200 -+++ libvirt-0.8.8-sasl/tests/confdata/libvirtd.out 2011-04-28 11:45:46.875741165 +0200 -@@ -82,7 +82,7 @@ +diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.out libvirt-1.3.2/tests/confdata/libvirtd.out +--- libvirt-1.3.2.orig/tests/confdata/libvirtd.out 2015-06-28 03:29:13.000000000 +0000 ++++ libvirt-1.3.2/tests/confdata/libvirtd.out 2016-03-18 06:57:24.121768000 +0000 +@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -146,7 +208,7 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/conf # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -111,7 +111,7 @@ +@@ -116,7 +116,7 @@ auth_unix_rw = "none" # If you don't enable SASL, then all TCP traffic is cleartext. # Don't do this outside of a dev/test scenario. For real world # use, always enable SASL and use the GSSAPI or DIGEST-MD5 @@ -155,32 +217,84 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/conf auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. # ---- libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args.orig 2014-07-03 20:04:05.132591762 +0200 -+++ libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2014-07-03 20:42:03.205829499 +0200 -@@ -1,5 +1,5 @@ - LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \ -+SASL_CONF_PATH=/root/.sasl QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc -m 214 \ - -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ ---- libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args.orig 2014-07-03 20:04:05.132591762 +0200 -+++ libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2014-07-03 20:42:29.659161721 +0200 -@@ -1,5 +1,5 @@ - LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \ -+SASL_CONF_PATH=/root/.sasl QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc -m 214 \ - -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ ---- libvirt-1.0.6/tests/qemuxml2argvtest.c.orig 2013-06-16 15:44:25.855183409 +0200 -+++ libvirt-1.0.6/tests/qemuxml2argvtest.c 2013-06-16 15:45:12.908515760 +0200 -@@ -614,7 +614,7 @@ +diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args +--- libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-02-16 14:25:07.000000000 +0000 ++++ libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-03-18 12:15:39.783768000 +0000 +@@ -3,7 +3,7 @@ PATH=/bin \ + HOME=/home/test \ + USER=test \ + LOGNAME=test \ +-SASL_CONF_PATH=/root/.sasl2 \ ++SASL_CONF_PATH=/root/.sasl \ + QEMU_AUDIO_DRV=none \ + /usr/bin/qemu \ + -name QEMUGuest1 \ +diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args +--- libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-02-16 14:25:07.000000000 +0000 ++++ libvirt-1.3.2/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-03-18 12:15:42.431768000 +0000 +@@ -3,7 +3,7 @@ PATH=/bin \ + HOME=/home/test \ + USER=test \ + LOGNAME=test \ +-SASL_CONF_PATH=/root/.sasl2 \ ++SASL_CONF_PATH=/root/.sasl \ + QEMU_AUDIO_DRV=none \ + /usr/bin/qemu \ + -name QEMUGuest1 \ +diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +--- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-01-10 01:57:37.000000000 +0000 ++++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-03-18 12:13:04.244768000 +0000 +@@ -3,7 +3,7 @@ PATH=/bin \ + HOME=/home/test \ + USER=test \ + LOGNAME=test \ +-SASL_CONF_PATH=/root/.sasl2 \ ++SASL_CONF_PATH=/root/.sasl \ + QEMU_AUDIO_DRV=spice \ + /usr/bin/qemu \ + -name QEMUGuest1 \ +diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +--- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-02-16 14:25:07.000000000 +0000 ++++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-03-18 12:12:18.798768000 +0000 +@@ -3,7 +3,7 @@ PATH=/bin \ + HOME=/home/test \ + USER=test \ + LOGNAME=test \ +-SASL_CONF_PATH=/root/.sasl2 \ ++SASL_CONF_PATH=/root/.sasl \ + QEMU_AUDIO_DRV=none \ + /usr/bin/qemu \ + -name QEMUGuest1 \ +diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +--- libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-02-16 14:25:07.000000000 +0000 ++++ libvirt-1.3.2/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-03-18 12:12:35.964768000 +0000 +@@ -3,7 +3,7 @@ PATH=/bin \ + HOME=/home/test \ + USER=test \ + LOGNAME=test \ +-SASL_CONF_PATH=/root/.sasl2 \ ++SASL_CONF_PATH=/root/.sasl \ + QEMU_AUDIO_DRV=none \ + /usr/bin/qemu \ + -name QEMUGuest1 \ +diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvtest.c libvirt-1.3.2/tests/qemuxml2argvtest.c +--- libvirt-1.3.2.orig/tests/qemuxml2argvtest.c 2016-02-27 03:16:01.000000000 +0000 ++++ libvirt-1.3.2/tests/qemuxml2argvtest.c 2016-03-18 12:11:24.793768000 +0000 +@@ -921,7 +921,7 @@ mymain(void) driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); - ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2")); + ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl")); - DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_VGA); + DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; +@@ -941,7 +941,7 @@ mymain(void) + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_SPICE_FILE_XFER_DISABLE); + driver.config->spiceSASL = 1; +- ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2")); ++ ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl")); + DO_TEST("graphics-spice-sasl", + QEMU_CAPS_VGA_QXL, + QEMU_CAPS_SPICE, diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch index 7ce574d..42df9c9 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,7 +1,7 @@ -diff -ur libvirt-1.2.17.orig/daemon/Makefile.am libvirt-1.2.17/daemon/Makefile.am ---- libvirt-1.2.17.orig/daemon/Makefile.am 2015-06-25 14:00:33.000000000 +0000 -+++ libvirt-1.2.17/daemon/Makefile.am 2015-07-10 16:28:56.157230844 +0000 -@@ -396,13 +396,11 @@ +diff -urp libvirt-1.3.2.orig/daemon/Makefile.am libvirt-1.3.2/daemon/Makefile.am +--- libvirt-1.3.2.orig/daemon/Makefile.am 2016-03-18 06:57:24.000000000 +0000 ++++ libvirt-1.3.2/daemon/Makefile.am 2016-03-18 12:50:49.382768000 +0000 +@@ -397,13 +397,11 @@ if WITH_SYSCTL # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on # /usr/lib/sysctl.d/ even when libdir is /usr/lib64 install-sysctl: diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch index a645d9f..86e6a3c 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,7 @@ -diff -urP libvirt-1.1.0.orig/src/util/virutil.c libvirt-1.1.0/src/util/virutil.c ---- libvirt-1.1.0.orig/src/util/virutil.c 2013-07-01 03:08:36.000000000 +0000 -+++ libvirt-1.1.0/src/util/virutil.c 2013-07-22 12:58:14.053179206 +0000 -@@ -1419,7 +1419,7 @@ +diff -urp libvirt-1.3.2.orig/src/util/virutil.c libvirt-1.3.2/src/util/virutil.c +--- libvirt-1.3.2.orig/src/util/virutil.c 2016-01-10 01:57:37.000000000 +0000 ++++ libvirt-1.3.2/src/util/virutil.c 2016-03-18 12:36:50.135768000 +0000 +@@ -1538,7 +1538,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi void virFileWaitForDevices(void) { # ifdef UDEVADM diff --git a/libvirt-xend.patch b/libvirt-xend.patch index a6d4d5b..dcbb0b3 100644 --- a/libvirt-xend.patch +++ b/libvirt-xend.patch @@ -1,28 +1,31 @@ ---- libvirt-1.2.4/src/xen/xen_driver.c.orig 2014-05-25 21:03:34.237326121 +0200 -+++ libvirt-1.2.4/src/xen/xen_driver.c 2014-05-25 21:25:26.260632109 +0200 -@@ -320,7 +320,7 @@ +diff -urp libvirt-1.3.2.orig/src/libxl/libxl_driver.c libvirt-1.3.2/src/libxl/libxl_driver.c +--- libvirt-1.3.2.orig/src/libxl/libxl_driver.c 2016-02-26 09:14:56.000000000 +0000 ++++ libvirt-1.3.2/src/libxl/libxl_driver.c 2016-03-18 12:34:43.118768000 +0000 +@@ -477,7 +477,7 @@ libxlDriverShouldLoad(bool privileged) if (virFileExists("/usr/sbin/xend")) { virCommandPtr cmd; - cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); + cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL); - if (virCommandRun(cmd, NULL) == 0) - ret = true; - virCommandFree(cmd); ---- libvirt-1.2.4/src/libxl/libxl_driver.c.orig 2014-05-25 21:03:34.447326117 +0200 -+++ libvirt-1.2.4/src/libxl/libxl_driver.c 2014-05-25 21:28:23.317295096 +0200 -@@ -258,7 +258,7 @@ + if (virCommandRun(cmd, NULL) == 0) { + VIR_INFO("Legacy xen tool stack seems to be in use, disabling " + "libxenlight driver."); +diff -urp libvirt-1.3.2.orig/src/xen/xen_driver.c libvirt-1.3.2/src/xen/xen_driver.c +--- libvirt-1.3.2.orig/src/xen/xen_driver.c 2016-02-16 14:25:07.000000000 +0000 ++++ libvirt-1.3.2/src/xen/xen_driver.c 2016-03-18 12:34:43.115768000 +0000 +@@ -308,7 +308,7 @@ xenUnifiedXendProbe(void) if (virFileExists("/usr/sbin/xend")) { virCommandPtr cmd; - cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); + cmd = virCommandNewArgList("/sbin/service", "xend", "status", NULL); - if (virCommandRun(cmd, NULL) == 0) { - VIR_INFO("Legacy xen tool stack seems to be in use, disabling " - "libxenlight driver."); ---- libvirt-1.2.3/tests/statstest.c.orig 2014-04-04 15:57:05.109436604 +0200 -+++ libvirt-1.2.3/tests/statstest.c 2014-04-04 16:00:09.836099420 +0200 -@@ -49,7 +49,7 @@ + if (virCommandRun(cmd, NULL) == 0) + ret = true; + virCommandFree(cmd); +diff -urp libvirt-1.3.2.orig/tests/reconnect.c libvirt-1.3.2/tests/reconnect.c +--- libvirt-1.3.2.orig/tests/reconnect.c 2015-01-23 11:46:24.000000000 +0000 ++++ libvirt-1.3.2/tests/reconnect.c 2016-03-18 12:34:43.119768000 +0000 +@@ -24,7 +24,7 @@ mymain(void) uname(&ut); if (strstr(ut.release, "xen") == NULL) return EXIT_AM_SKIP; @@ -31,9 +34,10 @@ if (virCommandRun(cmd, NULL) < 0) { virCommandFree(cmd); return EXIT_AM_SKIP; ---- libvirt-1.2.3/tests/reconnect.c.orig 2014-04-04 15:57:05.109436604 +0200 -+++ libvirt-1.2.3/tests/reconnect.c 2014-04-04 16:03:28.892761936 +0200 -@@ -24,7 +24,7 @@ +diff -urp libvirt-1.3.2.orig/tests/statstest.c libvirt-1.3.2/tests/statstest.c +--- libvirt-1.3.2.orig/tests/statstest.c 2015-04-28 01:15:40.000000000 +0000 ++++ libvirt-1.3.2/tests/statstest.c 2016-03-18 12:34:43.119768000 +0000 +@@ -48,7 +48,7 @@ mymain(void) uname(&ut); if (strstr(ut.release, "xen") == NULL) return EXIT_AM_SKIP; -- 2.46.0