From d139c6b6c09e77a47960a391fa2c8ee0b4fcdb81 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 12 Apr 2018 13:00:11 +0000
Subject: [PATCH] - updated to 4.2.0
---
libvirt-qemu-acl.patch | 26 +++----
libvirt-sasl.patch | 148 +++++++++++++++++++--------------------
libvirt-sysctl-dir.patch | 27 +++++--
libvirt.spec | 8 +--
4 files changed, 114 insertions(+), 95 deletions(-)
diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e81c7d8..ce711ac 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.1.0.orig/src/qemu/qemu_command.c libvirt-4.1.0/src/qemu/qemu_command.c
---- libvirt-4.1.0.orig/src/qemu/qemu_command.c 2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu_command.c 2018-03-12 10:54:51.326947485 +0000
-@@ -7842,6 +7842,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_command.c libvirt-4.2.0/src/qemu/qemu_command.c
+--- libvirt-4.2.0.orig/src/qemu/qemu_command.c 2018-04-12 12:47:51.427576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_command.c 2018-04-12 12:48:01.793576849 +0000
+@@ -7893,6 +7893,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
/* TODO: Support ACLs later */
@@ -12,9 +12,9 @@ diff -urp libvirt-4.1.0.orig/src/qemu/qemu_command.c libvirt-4.1.0/src/qemu/qemu
}
virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf
---- libvirt-4.1.0.orig/src/qemu/qemu.conf 2018-03-12 10:51:10.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu.conf 2018-03-12 10:54:51.327947485 +0000
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
+--- libvirt-4.2.0.orig/src/qemu/qemu.conf 2018-04-12 12:47:51.430576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu.conf 2018-04-12 12:48:01.794576849 +0000
@@ -135,6 +135,15 @@
#vnc_sasl = 1
@@ -31,9 +31,9 @@ diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf
# 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
-diff -urp libvirt-4.1.0.orig/src/qemu/qemu_conf.c libvirt-4.1.0/src/qemu/qemu_conf.c
---- libvirt-4.1.0.orig/src/qemu/qemu_conf.c 2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu_conf.c 2018-03-12 10:54:51.327947485 +0000
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_conf.c libvirt-4.2.0/src/qemu/qemu_conf.c
+--- libvirt-4.2.0.orig/src/qemu/qemu_conf.c 2018-04-12 12:47:51.428576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_conf.c 2018-04-12 12:48:01.794576849 +0000
@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
goto cleanup;
if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
@@ -43,9 +43,9 @@ diff -urp libvirt-4.1.0.orig/src/qemu/qemu_conf.c libvirt-4.1.0/src/qemu/qemu_co
if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-4.1.0.orig/src/qemu/qemu_conf.h libvirt-4.1.0/src/qemu/qemu_conf.h
---- libvirt-4.1.0.orig/src/qemu/qemu_conf.h 2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu_conf.h 2018-03-12 10:54:51.327947485 +0000
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_conf.h libvirt-4.2.0/src/qemu/qemu_conf.h
+--- libvirt-4.2.0.orig/src/qemu/qemu_conf.h 2018-04-12 12:47:51.428576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_conf.h 2018-04-12 12:48:01.794576849 +0000
@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
bool vncTLS;
bool vncTLSx509verify;
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index d8b8824..94c0698 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -1,6 +1,6 @@
-diff -urp libvirt-4.1.0.orig/docs/auth.html libvirt-4.1.0/docs/auth.html
---- libvirt-4.1.0.orig/docs/auth.html 2018-02-26 09:05:10.000000000 +0000
-+++ libvirt-4.1.0/docs/auth.html 2018-03-12 10:51:10.186949975 +0000
+diff -urp libvirt-4.2.0.orig/docs/auth.html libvirt-4.2.0/docs/auth.html
+--- libvirt-4.2.0.orig/docs/auth.html 2018-04-12 12:41:58.327580941 +0000
++++ libvirt-4.2.0/docs/auth.html 2018-04-12 12:42:15.267580750 +0000
@@ -338,7 +338,7 @@ to turn on SASL auth in these listeners.
<p>
Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
@@ -10,9 +10,9 @@ diff -urp libvirt-4.1.0.orig/docs/auth.html libvirt-4.1.0/docs/auth.html
parameter to <code>scram-sha-1</code>.
</p>
<p>
-diff -urp libvirt-4.1.0.orig/docs/auth.html.in libvirt-4.1.0/docs/auth.html.in
---- libvirt-4.1.0.orig/docs/auth.html.in 2017-08-29 08:38:20.000000000 +0000
-+++ libvirt-4.1.0/docs/auth.html.in 2018-03-12 10:51:10.186949975 +0000
+diff -urp libvirt-4.2.0.orig/docs/auth.html.in libvirt-4.2.0/docs/auth.html.in
+--- libvirt-4.2.0.orig/docs/auth.html.in 2018-04-12 12:41:58.331580941 +0000
++++ libvirt-4.2.0/docs/auth.html.in 2018-04-12 12:42:15.268580750 +0000
@@ -267,7 +267,7 @@ to turn on SASL auth in these listeners.
<p>
Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
@@ -22,10 +22,10 @@ diff -urp libvirt-4.1.0.orig/docs/auth.html.in libvirt-4.1.0/docs/auth.html.in
parameter to <code>scram-sha-1</code>.
</p>
<p>
-diff -urp libvirt-4.1.0.orig/libvirt.spec libvirt-4.1.0/libvirt.spec
---- libvirt-4.1.0.orig/libvirt.spec 2018-03-05 09:00:00.000000000 +0000
-+++ libvirt-4.1.0/libvirt.spec 2018-03-12 10:51:10.199949975 +0000
-@@ -2118,7 +2118,7 @@ exit 0
+diff -urp libvirt-4.2.0.orig/libvirt.spec libvirt-4.2.0/libvirt.spec
+--- libvirt-4.2.0.orig/libvirt.spec 2018-04-12 12:41:58.347580941 +0000
++++ libvirt-4.2.0/libvirt.spec 2018-04-12 12:42:15.268580750 +0000
+@@ -2124,7 +2124,7 @@ exit 0
%{_datadir}/libvirt/test-screenshot.png
@@ -34,10 +34,10 @@ diff -urp libvirt-4.1.0.orig/libvirt.spec libvirt-4.1.0/libvirt.spec
%files admin
%{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-4.1.0.orig/libvirt.spec.in libvirt-4.1.0/libvirt.spec.in
---- libvirt-4.1.0.orig/libvirt.spec.in 2018-02-28 16:48:15.000000000 +0000
-+++ libvirt-4.1.0/libvirt.spec.in 2018-03-12 10:51:10.199949975 +0000
-@@ -2118,7 +2118,7 @@ exit 0
+diff -urp libvirt-4.2.0.orig/libvirt.spec.in libvirt-4.2.0/libvirt.spec.in
+--- libvirt-4.2.0.orig/libvirt.spec.in 2018-04-12 12:41:58.346580941 +0000
++++ libvirt-4.2.0/libvirt.spec.in 2018-04-12 12:42:15.268580750 +0000
+@@ -2124,7 +2124,7 @@ exit 0
%{_datadir}/libvirt/test-screenshot.png
@@ -46,31 +46,10 @@ diff -urp libvirt-4.1.0.orig/libvirt.spec.in libvirt-4.1.0/libvirt.spec.in
%files admin
%{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-4.1.0.orig/src/Makefile.am libvirt-4.1.0/src/Makefile.am
---- libvirt-4.1.0.orig/src/Makefile.am 2018-03-05 08:57:31.000000000 +0000
-+++ libvirt-4.1.0/src/Makefile.am 2018-03-12 10:52:52.804948819 +0000
-@@ -2300,13 +2300,13 @@ endif ! WITH_LIBVIRTD
- # the WITH_LIBVIRTD conditional
- if WITH_SASL
- install-sasl:
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
-- $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-
- uninstall-sasl:
-- rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-- rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
-+ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-+ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
- else ! WITH_SASL
- install-sasl:
- uninstall-sasl:
-diff -urp libvirt-4.1.0.orig/src/Makefile.in libvirt-4.1.0/src/Makefile.in
---- libvirt-4.1.0.orig/src/Makefile.in 2018-03-05 08:59:17.000000000 +0000
-+++ libvirt-4.1.0/src/Makefile.in 2018-03-12 10:53:22.637948484 +0000
-@@ -12931,13 +12931,13 @@ uninstall-sysconfig:
+diff -urp libvirt-4.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in
+--- libvirt-4.2.0.orig/src/Makefile.in 2018-04-12 12:41:58.401580940 +0000
++++ libvirt-4.2.0/src/Makefile.in 2018-04-12 12:42:15.272580750 +0000
+@@ -13098,13 +13098,13 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
# This is needed for clients too, so can't wrap in
# the WITH_LIBVIRTD conditional
@WITH_SASL_TRUE@install-sasl:
@@ -88,9 +67,9 @@ diff -urp libvirt-4.1.0.orig/src/Makefile.in libvirt-4.1.0/src/Makefile.in
@WITH_SASL_FALSE@install-sasl:
@WITH_SASL_FALSE@uninstall-sasl:
-diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf
---- libvirt-4.1.0.orig/src/qemu/qemu.conf 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/qemu.conf 2018-03-12 10:51:10.199949975 +0000
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
+--- libvirt-4.2.0.orig/src/qemu/qemu.conf 2018-04-12 12:41:58.380580940 +0000
++++ libvirt-4.2.0/src/qemu/qemu.conf 2018-04-12 12:42:15.272580750 +0000
@@ -129,18 +129,18 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -134,9 +113,9 @@ diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf
# Enable use of TLS encryption on the chardev TCP transports.
#
-diff -urp libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.1.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2017-09-29 07:30:58.000000000 +0000
-+++ libvirt-4.1.0/src/qemu/test_libvirtd_qemu.aug.in 2018-03-12 10:51:10.199949975 +0000
+diff -urp libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.2.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2018-04-12 12:41:58.380580940 +0000
++++ libvirt-4.2.0/src/qemu/test_libvirtd_qemu.aug.in 2018-04-12 12:42:15.273580750 +0000
@@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
{ "vnc_tls_x509_verify" = "1" }
{ "vnc_password" = "XYZ12345" }
@@ -155,9 +134,9 @@ diff -urp libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.1.0/sr
{ "chardev_tls" = "1" }
{ "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
{ "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-4.1.0.orig/src/remote/libvirtd.conf libvirt-4.1.0/src/remote/libvirtd.conf
---- libvirt-4.1.0.orig/src/remote/libvirtd.conf 2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/remote/libvirtd.conf 2018-03-12 10:52:04.539949363 +0000
+diff -urp libvirt-4.2.0.orig/src/remote/libvirtd.conf libvirt-4.2.0/src/remote/libvirtd.conf
+--- libvirt-4.2.0.orig/src/remote/libvirtd.conf 2018-04-12 12:41:58.382580940 +0000
++++ libvirt-4.2.0/src/remote/libvirtd.conf 2018-04-12 12:42:15.273580750 +0000
@@ -123,7 +123,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
@@ -176,9 +155,30 @@ diff -urp libvirt-4.1.0.orig/src/remote/libvirtd.conf libvirt-4.1.0/src/remote/l
#auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-03-12 10:51:10.199949975 +0000
+diff -urp libvirt-4.2.0.orig/src/remote/Makefile.inc.am libvirt-4.2.0/src/remote/Makefile.inc.am
+--- libvirt-4.2.0.orig/src/remote/Makefile.inc.am 2018-04-12 12:41:58.380580940 +0000
++++ libvirt-4.2.0/src/remote/Makefile.inc.am 2018-04-12 12:43:43.861579753 +0000
+@@ -243,13 +243,13 @@ endif ! WITH_LIBVIRTD
+ # the WITH_LIBVIRTD conditional
+ if WITH_SASL
+ install-sasl:
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
++ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
+ $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
+- $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
++ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
+
+ uninstall-sasl:
+- rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
+- rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
++ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
++ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
+ else ! WITH_SASL
+ install-sasl:
+ uninstall-sasl:
+diff -urp libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
+--- libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-04-12 12:41:58.691580937 +0000
++++ libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-04-12 12:42:15.273580750 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
@@ -188,9 +188,9 @@ diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvi
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-03-12 10:51:10.199949975 +0000
+diff -urp libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
+--- libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-04-12 12:41:58.691580937 +0000
++++ libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-04-12 12:42:15.273580750 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
@@ -200,9 +200,9 @@ diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvir
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-03-12 10:51:10.200949975 +0000
+diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-04-12 12:41:58.722580936 +0000
++++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-04-12 12:42:15.273580750 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
@@ -212,9 +212,9 @@ diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args lib
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-03-12 10:51:10.200949975 +0000
+diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-04-12 12:41:58.722580936 +0000
++++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-04-12 12:42:15.273580750 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
@@ -224,9 +224,9 @@ diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-12 14:48:37.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-03-12 10:51:10.200949975 +0000
+diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-04-12 12:41:58.722580936 +0000
++++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-04-12 12:42:15.273580750 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
@@ -236,10 +236,10 @@ diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvir
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvtest.c libvirt-4.1.0/tests/qemuxml2argvtest.c
---- libvirt-4.1.0.orig/tests/qemuxml2argvtest.c 2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/tests/qemuxml2argvtest.c 2018-03-12 10:51:10.207949975 +0000
-@@ -1097,7 +1097,7 @@ mymain(void)
+diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvtest.c libvirt-4.2.0/tests/qemuxml2argvtest.c
+--- libvirt-4.2.0.orig/tests/qemuxml2argvtest.c 2018-04-12 12:41:58.410580940 +0000
++++ libvirt-4.2.0/tests/qemuxml2argvtest.c 2018-04-12 12:42:15.274580750 +0000
+@@ -1098,7 +1098,7 @@ mymain(void)
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
@@ -248,7 +248,7 @@ diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvtest.c libvirt-4.1.0/tests/qemuxm
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
-@@ -1121,7 +1121,7 @@ mymain(void)
+@@ -1122,7 +1122,7 @@ mymain(void)
DO_TEST("graphics-spice-no-args",
QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->spiceSASL = 1;
@@ -257,9 +257,9 @@ diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvtest.c libvirt-4.1.0/tests/qemuxm
DO_TEST("graphics-spice-sasl",
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.1.0/tests/virconfdata/libvirtd.conf
---- libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf 2017-10-30 07:32:36.000000000 +0000
-+++ libvirt-4.1.0/tests/virconfdata/libvirtd.conf 2018-03-12 10:51:10.218949974 +0000
+diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.2.0/tests/virconfdata/libvirtd.conf
+--- libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf 2018-04-12 12:41:58.827580935 +0000
++++ libvirt-4.2.0/tests/virconfdata/libvirtd.conf 2018-04-12 12:42:15.274580750 +0000
@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
# the network providing auth (eg, TLS/x509 certificates)
#
@@ -278,9 +278,9 @@ diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.1.0/tests
auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out libvirt-4.1.0/tests/virconfdata/libvirtd.out
---- libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out 2017-10-30 07:32:36.000000000 +0000
-+++ libvirt-4.1.0/tests/virconfdata/libvirtd.out 2018-03-12 10:51:10.218949974 +0000
+diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.out libvirt-4.2.0/tests/virconfdata/libvirtd.out
+--- libvirt-4.2.0.orig/tests/virconfdata/libvirtd.out 2018-04-12 12:41:58.827580935 +0000
++++ libvirt-4.2.0/tests/virconfdata/libvirtd.out 2018-04-12 12:42:15.274580750 +0000
@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
# the network providing auth (eg, TLS/x509 certificates)
#
diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 9faf43d..a50224f 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,7 +1,26 @@
-diff -urp libvirt-4.1.0.orig/src/Makefile.am libvirt-4.1.0/src/Makefile.am
---- libvirt-4.1.0.orig/src/Makefile.am 2018-03-12 10:52:52.000000000 +0000
-+++ libvirt-4.1.0/src/Makefile.am 2018-03-12 11:03:24.668941705 +0000
-@@ -2232,13 +2232,11 @@ if WITH_SYSCTL
+diff -urp libvirt-4.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in
+--- libvirt-4.2.0.orig/src/Makefile.in 2018-04-12 12:49:25.591575905 +0000
++++ libvirt-4.2.0/src/Makefile.in 2018-04-12 12:54:21.166572577 +0000
+@@ -13057,13 +13057,11 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
+ # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
+ # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@install-sysctl:
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@ $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@ $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@ $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
++@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@ $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@uninstall-sysctl:
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@ rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@ rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
++@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_FALSE@install-sysctl:
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_FALSE@uninstall-sysctl:
+
+diff -urp libvirt-4.2.0.orig/src/remote/Makefile.inc.am libvirt-4.2.0/src/remote/Makefile.inc.am
+--- libvirt-4.2.0.orig/src/remote/Makefile.inc.am 2018-04-12 12:49:25.608575905 +0000
++++ libvirt-4.2.0/src/remote/Makefile.inc.am 2018-04-12 12:52:11.899574033 +0000
+@@ -194,13 +194,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.spec b/libvirt.spec
index ae4f326..acea98e 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -43,12 +43,12 @@
Summary: Toolkit to interact with virtualization capabilities
Summary(pl.UTF-8): NarzÄdzia wspóÅpracujÄ
ce z funkcjami wirtualizacji
Name: libvirt
-Version: 4.1.0
-Release: 2
+Version: 4.2.0
+Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 30b95c458da4f8c3d073a82755815997
+# Source0-md5: 7dfbaeb30fc0ee1184c27a4b6c1d7254
Source1: libvirtd.init
Source2: virtlockd.init
Source3: virtlogd.init
@@ -897,7 +897,7 @@ fi
%defattr(644,root,root,755)
%{_datadir}/systemtap/tapset/libvirt_functions.stp
%{_datadir}/systemtap/tapset/libvirt_probes.stp
-%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp
+%{?with_qemu:%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp}
%endif
%if %{with wireshark}
--
2.49.0