From b6348913329f24b2ffa0afd0bd02c528d62ee3dc Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 9 Jul 2018 17:27:24 +0000 Subject: [PATCH] - updated to 4.5.0 --- libvirt-qemu-acl.patch | 30 ++++----- libvirt-sasl.patch | 122 ++++++++++++++--------------------- libvirt-sysctl-dir.patch | 16 ++--- libvirt-udevadm-settle.patch | 8 +-- libvirt.spec | 11 +++- 5 files changed, 85 insertions(+), 102 deletions(-) diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index ce711ac..e05d5df 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,7 +1,7 @@ -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 +diff -urp libvirt-4.5.0.orig/src/qemu/qemu_command.c libvirt-4.5.0/src/qemu/qemu_command.c +--- libvirt-4.5.0.orig/src/qemu/qemu_command.c 2018-07-09 16:27:53.841864595 +0000 ++++ libvirt-4.5.0/src/qemu/qemu_command.c 2018-07-09 16:28:11.860863521 +0000 +@@ -7859,6 +7859,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ @@ -12,9 +12,9 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu_command.c libvirt-4.2.0/src/qemu/qemu } virCommandAddArg(cmd, "-vnc"); -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 +diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf +--- libvirt-4.5.0.orig/src/qemu/qemu.conf 2018-07-09 16:27:53.844864595 +0000 ++++ libvirt-4.5.0/src/qemu/qemu.conf 2018-07-09 16:28:11.861863521 +0000 @@ -135,6 +135,15 @@ #vnc_sasl = 1 @@ -31,10 +31,10 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.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.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 +diff -urp libvirt-4.5.0.orig/src/qemu/qemu_conf.c libvirt-4.5.0/src/qemu/qemu_conf.c +--- libvirt-4.5.0.orig/src/qemu/qemu_conf.c 2018-07-09 16:27:53.842864595 +0000 ++++ libvirt-4.5.0/src/qemu/qemu_conf.c 2018-07-09 16:28:11.861863521 +0000 +@@ -555,6 +555,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD goto cleanup; if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0) goto cleanup; @@ -43,10 +43,10 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu_conf.c libvirt-4.2.0/src/qemu/qemu_co if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0) -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 { +diff -urp libvirt-4.5.0.orig/src/qemu/qemu_conf.h libvirt-4.5.0/src/qemu/qemu_conf.h +--- libvirt-4.5.0.orig/src/qemu/qemu_conf.h 2018-07-09 16:27:53.842864595 +0000 ++++ libvirt-4.5.0/src/qemu/qemu_conf.h 2018-07-09 16:28:11.861863521 +0000 +@@ -124,6 +124,7 @@ struct _virQEMUDriverConfig { bool vncTLS; bool vncTLSx509verify; bool vncSASL; diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 94c0698..0a8ad52 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -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 +diff -urp libvirt-4.5.0.orig/docs/auth.html libvirt-4.5.0/docs/auth.html +--- libvirt-4.5.0.orig/docs/auth.html 2018-07-09 16:24:49.467875585 +0000 ++++ libvirt-4.5.0/docs/auth.html 2018-07-09 16:25:07.306874521 +0000 @@ -338,7 +338,7 @@ to turn on SASL auth in these listeners.

Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a @@ -10,9 +10,9 @@ diff -urp libvirt-4.2.0.orig/docs/auth.html libvirt-4.2.0/docs/auth.html parameter to scram-sha-1.

-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 +diff -urp libvirt-4.5.0.orig/docs/auth.html.in libvirt-4.5.0/docs/auth.html.in +--- libvirt-4.5.0.orig/docs/auth.html.in 2018-07-09 16:24:49.471875584 +0000 ++++ libvirt-4.5.0/docs/auth.html.in 2018-07-09 16:25:07.307874521 +0000 @@ -267,7 +267,7 @@ to turn on SASL auth in these listeners.

Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a @@ -22,34 +22,10 @@ diff -urp libvirt-4.2.0.orig/docs/auth.html.in libvirt-4.2.0/docs/auth.html.in parameter to scram-sha-1.

-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 - --%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - - %files admin - %{_mandir}/man1/virt-admin.1* -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 - --%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - - %files admin - %{_mandir}/man1/virt-admin.1* -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) +diff -urp libvirt-4.5.0.orig/src/Makefile.in libvirt-4.5.0/src/Makefile.in +--- libvirt-4.5.0.orig/src/Makefile.in 2018-07-09 16:24:49.542875580 +0000 ++++ libvirt-4.5.0/src/Makefile.in 2018-07-09 16:25:07.311874521 +0000 +@@ -13166,13 +13166,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: @@ -67,9 +43,9 @@ diff -urp libvirt-4.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in @WITH_SASL_FALSE@install-sasl: @WITH_SASL_FALSE@uninstall-sasl: -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 +diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf +--- libvirt-4.5.0.orig/src/qemu/qemu.conf 2018-07-09 16:24:49.520875581 +0000 ++++ libvirt-4.5.0/src/qemu/qemu.conf 2018-07-09 16:25:07.311874521 +0000 @@ -129,18 +129,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -113,9 +89,9 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -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 +diff -urp libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2018-07-09 16:24:49.520875581 +0000 ++++ libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in 2018-07-09 16:25:07.312874521 +0000 @@ -12,7 +12,7 @@ module Test_libvirtd_qemu = { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -134,9 +110,9 @@ diff -urp libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.2.0/sr { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -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 +diff -urp libvirt-4.5.0.orig/src/remote/libvirtd.conf libvirt-4.5.0/src/remote/libvirtd.conf +--- libvirt-4.5.0.orig/src/remote/libvirtd.conf 2018-07-09 16:24:49.523875581 +0000 ++++ libvirt-4.5.0/src/remote/libvirtd.conf 2018-07-09 16:25:07.312874521 +0000 @@ -123,7 +123,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -155,10 +131,10 @@ diff -urp libvirt-4.2.0.orig/src/remote/libvirtd.conf libvirt-4.2.0/src/remote/l #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -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 +diff -urp libvirt-4.5.0.orig/src/remote/Makefile.inc.am libvirt-4.5.0/src/remote/Makefile.inc.am +--- libvirt-4.5.0.orig/src/remote/Makefile.inc.am 2018-07-09 16:24:49.520875581 +0000 ++++ libvirt-4.5.0/src/remote/Makefile.inc.am 2018-07-09 16:25:07.312874521 +0000 +@@ -248,13 +248,13 @@ endif ! WITH_LIBVIRTD # the WITH_LIBVIRTD conditional if WITH_SASL install-sasl: @@ -176,9 +152,9 @@ diff -urp libvirt-4.2.0.orig/src/remote/Makefile.inc.am libvirt-4.2.0/src/remote 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 +diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args +--- libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-07-09 16:24:50.006875552 +0000 ++++ libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-07-09 16:25:07.312874521 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -188,9 +164,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvi QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -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 +diff -urp libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-tls.args +--- libvirt-4.5.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-07-09 16:24:50.006875552 +0000 ++++ libvirt-4.5.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-07-09 16:25:07.312874521 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -200,9 +176,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvir QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -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 +diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args +--- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-07-09 16:24:49.567875579 +0000 ++++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-07-09 16:25:07.312874521 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -212,9 +188,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args lib QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -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 +diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args +--- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-07-09 16:24:49.567875579 +0000 ++++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-07-09 16:25:07.312874521 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -224,9 +200,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -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 +diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args +--- libvirt-4.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-07-09 16:24:49.567875579 +0000 ++++ libvirt-4.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-07-09 16:25:07.313874521 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -236,10 +212,10 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvir QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -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) +diff -urp libvirt-4.5.0.orig/tests/qemuxml2argvtest.c libvirt-4.5.0/tests/qemuxml2argvtest.c +--- libvirt-4.5.0.orig/tests/qemuxml2argvtest.c 2018-07-09 16:24:49.831875563 +0000 ++++ libvirt-4.5.0/tests/qemuxml2argvtest.c 2018-07-09 16:25:07.313874521 +0000 +@@ -1190,7 +1190,7 @@ mymain(void) driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -248,7 +224,7 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvtest.c libvirt-4.2.0/tests/qemuxm DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -1122,7 +1122,7 @@ mymain(void) +@@ -1210,7 +1210,7 @@ mymain(void) DO_TEST("graphics-spice-no-args", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->spiceSASL = 1; @@ -257,9 +233,9 @@ diff -urp libvirt-4.2.0.orig/tests/qemuxml2argvtest.c libvirt-4.2.0/tests/qemuxm DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); -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 +diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.5.0/tests/virconfdata/libvirtd.conf +--- libvirt-4.5.0.orig/tests/virconfdata/libvirtd.conf 2018-07-09 16:24:49.818875564 +0000 ++++ libvirt-4.5.0/tests/virconfdata/libvirtd.conf 2018-07-09 16:25:07.313874521 +0000 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) # @@ -278,9 +254,9 @@ diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.2.0/tests auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -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 +diff -urp libvirt-4.5.0.orig/tests/virconfdata/libvirtd.out libvirt-4.5.0/tests/virconfdata/libvirtd.out +--- libvirt-4.5.0.orig/tests/virconfdata/libvirtd.out 2018-07-09 16:24:49.818875564 +0000 ++++ libvirt-4.5.0/tests/virconfdata/libvirtd.out 2018-07-09 16:25:07.313874521 +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 a50224f..4834b14 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,7 +1,7 @@ -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) +diff -urp libvirt-4.5.0.orig/src/Makefile.in libvirt-4.5.0/src/Makefile.in +--- libvirt-4.5.0.orig/src/Makefile.in 2018-07-09 16:30:47.099854268 +0000 ++++ libvirt-4.5.0/src/Makefile.in 2018-07-09 16:31:05.422853176 +0000 +@@ -13125,13 +13125,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: @@ -17,10 +17,10 @@ diff -urp libvirt-4.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in @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 +diff -urp libvirt-4.5.0.orig/src/remote/Makefile.inc.am libvirt-4.5.0/src/remote/Makefile.inc.am +--- libvirt-4.5.0.orig/src/remote/Makefile.inc.am 2018-07-09 16:30:47.115854267 +0000 ++++ libvirt-4.5.0/src/remote/Makefile.inc.am 2018-07-09 16:31:05.423853176 +0000 +@@ -199,13 +199,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 05ecb51..e48dcdd 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-4.1.0.orig/src/util/virutil.c libvirt-4.1.0/src/util/virutil.c ---- libvirt-4.1.0.orig/src/util/virutil.c 2018-02-26 09:02:18.000000000 +0000 -+++ libvirt-4.1.0/src/util/virutil.c 2018-03-12 10:56:34.535946323 +0000 -@@ -1600,7 +1600,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi +diff -urp libvirt-4.5.0.orig/src/util/virutil.c libvirt-4.5.0/src/util/virutil.c +--- libvirt-4.5.0.orig/src/util/virutil.c 2018-07-09 16:29:11.910859942 +0000 ++++ libvirt-4.5.0/src/util/virutil.c 2018-07-09 16:29:30.389858840 +0000 +@@ -1598,7 +1598,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi void virWaitForDevices(void) { # ifdef UDEVADM diff --git a/libvirt.spec b/libvirt.spec index 9397e19..f61fff9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -41,12 +41,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 4.4.0 +Version: 4.5.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz -# Source0-md5: 07376bcb6ae1d598285137c95caff6d0 +# Source0-md5: 692b2d00907438ed08a68813d3177cd3 Source1: libvirtd.init Source2: virtlockd.init Source3: virtlogd.init @@ -567,6 +567,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/virtlogd %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la \ %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la \ + %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a} %if %{with sanlock} %{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \ @@ -755,11 +757,14 @@ fi %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_sheepdog.so %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so +%dir %{_libdir}/libvirt/storage-file +%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so %if %{with glusterfs} %files daemon-storage-gluster %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so +%attr(755,root,root) %{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so %endif %if %{with ceph} @@ -854,6 +859,8 @@ fi %{_datadir}/libvirt/schemas/networkcommon.rng %{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/nwfilter.rng +%{_datadir}/libvirt/schemas/nwfilter_params.rng +%{_datadir}/libvirt/schemas/nwfilterbinding.rng %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storagecommon.rng %{_datadir}/libvirt/schemas/storagepool.rng -- 2.37.3