From 270ab3676a03a7dea28909130a6edfc9a8c68651 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 14 Apr 2016 11:14:03 +0000 Subject: [PATCH] - updated to 1.3.3, fixed broken qemu-acl patch --- libvirt-qemu-acl.patch | 36 +++++------ libvirt-sasl.patch | 116 +++++++++++++++++------------------ libvirt-udevadm-settle.patch | 8 +-- libvirt.spec | 7 ++- 4 files changed, 84 insertions(+), 83 deletions(-) diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch index fda5d65..346926c 100644 --- a/libvirt-qemu-acl.patch +++ b/libvirt-qemu-acl.patch @@ -1,20 +1,20 @@ -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"); - } +diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu_command.c +--- libvirt-1.3.3.orig/src/qemu/qemu_command.c 2016-04-14 10:17:35.131170000 +0000 ++++ libvirt-1.3.3/src/qemu/qemu_command.c 2016-04-14 10:30:12.861170000 +0000 +@@ -7336,6 +7336,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD + virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); + + /* TODO: Support ACLs later */ + -+ if (cfg->vncACL) ++ 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 + virCommandAddArg(cmd, "-vnc"); +diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf +--- libvirt-1.3.3.orig/src/qemu/qemu.conf 2016-04-14 10:17:35.131170000 +0000 ++++ libvirt-1.3.3/src/qemu/qemu.conf 2016-04-14 10:18:01.034170000 +0000 @@ -80,6 +80,15 @@ #vnc_sasl = 1 @@ -31,9 +31,9 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/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-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 +diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.c libvirt-1.3.3/src/qemu/qemu_conf.c +--- libvirt-1.3.3.orig/src/qemu/qemu_conf.c 2016-04-14 10:17:35.130170000 +0000 ++++ libvirt-1.3.3/src/qemu/qemu_conf.c 2016-04-14 10:18:01.034170000 +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); @@ -42,9 +42,9 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu_conf.c libvirt-1.3.2/src/qemu/qemu_co p = virConfGetValue(conf, "security_driver"); if (p && p->type == VIR_CONF_LIST) { -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 +diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.h libvirt-1.3.3/src/qemu/qemu_conf.h +--- libvirt-1.3.3.orig/src/qemu/qemu_conf.h 2016-04-14 10:17:35.130170000 +0000 ++++ libvirt-1.3.3/src/qemu/qemu_conf.h 2016-04-14 10:18:01.035170000 +0000 @@ -112,6 +112,7 @@ struct _virQEMUDriverConfig { bool vncTLS; bool vncTLSx509verify; diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index d9f1675..7823a60 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -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 +diff -urp libvirt-1.3.3.orig/daemon/libvirtd.conf libvirt-1.3.3/daemon/libvirtd.conf +--- libvirt-1.3.3.orig/daemon/libvirtd.conf 2016-04-14 10:15:59.438170000 +0000 ++++ libvirt-1.3.3/daemon/libvirtd.conf 2016-04-14 10:16:21.849170000 +0000 @@ -128,7 +128,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -19,9 +19,9 @@ diff -urp libvirt-1.3.2.orig/daemon/libvirtd.conf libvirt-1.3.2/daemon/libvirtd. #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -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 +diff -urp libvirt-1.3.3.orig/daemon/Makefile.am libvirt-1.3.3/daemon/Makefile.am +--- libvirt-1.3.3.orig/daemon/Makefile.am 2016-04-14 10:15:59.438170000 +0000 ++++ libvirt-1.3.3/daemon/Makefile.am 2016-04-14 10:16:21.849170000 +0000 @@ -521,13 +521,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in # the WITH_LIBVIRTD conditional if WITH_SASL @@ -40,9 +40,9 @@ diff -urp libvirt-1.3.2.orig/daemon/Makefile.am libvirt-1.3.2/daemon/Makefile.am else ! WITH_SASL install-data-sasl: uninstall-data-sasl: -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 +diff -urp libvirt-1.3.3.orig/daemon/Makefile.in libvirt-1.3.3/daemon/Makefile.in +--- libvirt-1.3.3.orig/daemon/Makefile.in 2016-04-14 10:15:59.436170000 +0000 ++++ libvirt-1.3.3/daemon/Makefile.in 2016-04-14 10:16:21.852170000 +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 @@ -61,10 +61,10 @@ diff -urp libvirt-1.3.2.orig/daemon/Makefile.in libvirt-1.3.2/daemon/Makefile.in @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: +diff -urp libvirt-1.3.3.orig/docs/auth.html libvirt-1.3.3/docs/auth.html +--- libvirt-1.3.3.orig/docs/auth.html 2016-04-14 10:15:59.421170000 +0000 ++++ libvirt-1.3.3/docs/auth.html 2016-04-14 10:16:21.852170000 +0000 +@@ -404,7 +404,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, @@ -73,9 +73,9 @@ diff -urp libvirt-1.3.2.orig/docs/auth.html libvirt-1.3.2/docs/auth.html The mech_list parameter must first be changed to gssapi 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 +diff -urp libvirt-1.3.3.orig/docs/auth.html.in libvirt-1.3.3/docs/auth.html.in +--- libvirt-1.3.3.orig/docs/auth.html.in 2016-04-14 10:15:59.414170000 +0000 ++++ libvirt-1.3.3/docs/auth.html.in 2016-04-14 10:16:21.853170000 +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 @@ -85,10 +85,10 @@ diff -urp libvirt-1.3.2.orig/docs/auth.html.in libvirt-1.3.2/docs/auth.html.in The mech_list parameter must first be changed to gssapi 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 +diff -urp libvirt-1.3.3.orig/libvirt.spec libvirt-1.3.3/libvirt.spec +--- libvirt-1.3.3.orig/libvirt.spec 2016-04-14 10:15:59.436170000 +0000 ++++ libvirt-1.3.3/libvirt.spec 2016-04-14 10:16:21.860170000 +0000 +@@ -2332,7 +2332,7 @@ exit 0 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %if %{with_sasl} @@ -97,10 +97,10 @@ diff -urp libvirt-1.3.2.orig/libvirt.spec libvirt-1.3.2/libvirt.spec %endif %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 +diff -urp libvirt-1.3.3.orig/libvirt.spec.in libvirt-1.3.3/libvirt.spec.in +--- libvirt-1.3.3.orig/libvirt.spec.in 2016-04-14 10:16:00.591170000 +0000 ++++ libvirt-1.3.3/libvirt.spec.in 2016-04-14 10:16:21.872170000 +0000 +@@ -2332,7 +2332,7 @@ exit 0 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ %if %{with_sasl} @@ -109,9 +109,9 @@ diff -urp libvirt-1.3.2.orig/libvirt.spec.in libvirt-1.3.2/libvirt.spec.in %endif %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 +diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf +--- libvirt-1.3.3.orig/src/qemu/qemu.conf 2016-04-14 10:16:00.616170000 +0000 ++++ libvirt-1.3.3/src/qemu/qemu.conf 2016-04-14 10:16:21.872170000 +0000 @@ -74,18 +74,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -155,9 +155,9 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf # 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 +diff -urp libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.3/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-04-14 10:16:00.617170000 +0000 ++++ libvirt-1.3.3/src/qemu/test_libvirtd_qemu.aug.in 2016-04-14 10:16:21.872170000 +0000 @@ -9,14 +9,14 @@ module Test_libvirtd_qemu = { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } @@ -175,9 +175,9 @@ diff -urp libvirt-1.3.2.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.2/sr { "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 +diff -urp libvirt-1.3.3.orig/tests/confdata/libvirtd.conf libvirt-1.3.3/tests/confdata/libvirtd.conf +--- libvirt-1.3.3.orig/tests/confdata/libvirtd.conf 2016-04-14 10:16:00.575170000 +0000 ++++ libvirt-1.3.3/tests/confdata/libvirtd.conf 2016-04-14 10:16:21.872170000 +0000 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) # @@ -196,9 +196,9 @@ diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.conf libvirt-1.3.2/tests/co auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -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 +diff -urp libvirt-1.3.3.orig/tests/confdata/libvirtd.out libvirt-1.3.3/tests/confdata/libvirtd.out +--- libvirt-1.3.3.orig/tests/confdata/libvirtd.out 2016-04-14 10:16:00.575170000 +0000 ++++ libvirt-1.3.3/tests/confdata/libvirtd.out 2016-04-14 10:16:21.872170000 +0000 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) # @@ -217,9 +217,9 @@ diff -urp libvirt-1.3.2.orig/tests/confdata/libvirtd.out libvirt-1.3.2/tests/con auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. # -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 +diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args +--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-04-14 10:15:59.729170000 +0000 ++++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-04-14 10:16:21.873170000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -229,9 +229,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa 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 +diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args +--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-04-14 10:15:59.730170000 +0000 ++++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-04-14 10:16:21.873170000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -241,9 +241,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl 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 +diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +--- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-04-14 10:15:59.691170000 +0000 ++++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-04-14 10:16:21.873170000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -253,9 +253,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice- 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 +diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +--- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-04-14 10:15:59.692170000 +0000 ++++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-04-14 10:16:21.874170000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -265,9 +265,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa 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 +diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +--- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-04-14 10:15:59.672170000 +0000 ++++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-04-14 10:16:21.874170000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -277,10 +277,10 @@ diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl 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) +diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvtest.c libvirt-1.3.3/tests/qemuxml2argvtest.c +--- libvirt-1.3.3.orig/tests/qemuxml2argvtest.c 2016-04-14 10:15:59.666170000 +0000 ++++ libvirt-1.3.3/tests/qemuxml2argvtest.c 2016-04-14 10:16:21.875170000 +0000 +@@ -897,7 +897,7 @@ mymain(void) driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -289,9 +289,9 @@ diff -urp libvirt-1.3.2.orig/tests/qemuxml2argvtest.c libvirt-1.3.2/tests/qemuxm 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); +@@ -919,7 +919,7 @@ mymain(void) + DO_TEST("graphics-spice-no-args", + QEMU_CAPS_SPICE); driver.config->spiceSASL = 1; - ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2")); + ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl")); diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch index 86e6a3c..ce4f100 100644 --- a/libvirt-udevadm-settle.patch +++ b/libvirt-udevadm-settle.patch @@ -1,7 +1,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 +diff -urp libvirt-1.3.3.orig/src/util/virutil.c libvirt-1.3.3/src/util/virutil.c +--- libvirt-1.3.3.orig/src/util/virutil.c 2016-04-14 10:31:32.419170000 +0000 ++++ libvirt-1.3.3/src/util/virutil.c 2016-04-14 10:31:45.518170000 +0000 +@@ -1535,7 +1535,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi void virFileWaitForDevices(void) { # ifdef UDEVADM diff --git a/libvirt.spec b/libvirt.spec index d4f55a4..b9bd489 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -39,12 +39,12 @@ Summary: Toolkit to interact with virtualization capabilities Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji Name: libvirt -Version: 1.3.2 -Release: 2 +Version: 1.3.3 +Release: 1 License: LGPL v2.1+ Group: Libraries Source0: ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz -# Source0-md5: b48b06bbc7efbe9973ed0f3f223d6da2 +# Source0-md5: 698e0949a41a2b669dbe374759aaa64b Source1: %{name}.init Patch0: %{name}-sasl.patch Patch2: %{name}-qemu-acl.patch @@ -562,6 +562,7 @@ fi %doc ChangeLog README TODO NEWS %dir %{_sysconfdir}/libvirt %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/libvirt.conf +%attr(755,root,root) %{_libdir}/libnss_libvirt.so.2 %attr(755,root,root) %{_libdir}/libvirt.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libvirt.so.0 %attr(755,root,root) %{_libdir}/libvirt-admin.so.*.*.* -- 2.46.0