X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sasl.patch;h=179b54997e675f73971388f37937c009915cc97f;hb=47ddc4829d55f0a1b6465c8c85c8e3d78d6adbe9;hp=474acdb2b33aa601bf069f19d05183ca7228deae;hpb=5362742718a035681452094c18259125ad56676e;p=packages%2Flibvirt.git diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 474acdb..179b549 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,6 +1,6 @@ -diff -urp libvirt-2.1.0.orig/daemon/libvirtd.conf libvirt-2.1.0/daemon/libvirtd.conf ---- libvirt-2.1.0.orig/daemon/libvirtd.conf 2016-08-20 10:07:32.043554000 +0000 -+++ libvirt-2.1.0/daemon/libvirtd.conf 2016-08-20 10:07:47.074554000 +0000 +diff -urp libvirt-2.3.0.orig/daemon/libvirtd.conf libvirt-2.3.0/daemon/libvirtd.conf +--- libvirt-2.3.0.orig/daemon/libvirtd.conf 2016-10-28 19:13:22.641715000 +0000 ++++ libvirt-2.3.0/daemon/libvirtd.conf 2016-10-28 19:13:48.452715000 +0000 @@ -123,7 +123,7 @@ # the network providing auth (eg, TLS/x509 certificates) # @@ -19,9 +19,9 @@ diff -urp libvirt-2.1.0.orig/daemon/libvirtd.conf libvirt-2.1.0/daemon/libvirtd. #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am ---- libvirt-2.1.0.orig/daemon/Makefile.am 2016-08-20 10:07:32.040554000 +0000 -+++ libvirt-2.1.0/daemon/Makefile.am 2016-08-20 10:07:47.074554000 +0000 +diff -urp libvirt-2.3.0.orig/daemon/Makefile.am libvirt-2.3.0/daemon/Makefile.am +--- libvirt-2.3.0.orig/daemon/Makefile.am 2016-10-28 19:13:22.638715000 +0000 ++++ libvirt-2.3.0/daemon/Makefile.am 2016-10-28 19:13:48.468715000 +0000 @@ -528,13 +528,13 @@ POD2MAN = pod2man -c "Virtualization Sup # the WITH_LIBVIRTD conditional if WITH_SASL @@ -40,10 +40,10 @@ diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am else ! WITH_SASL install-data-sasl: uninstall-data-sasl: -diff -urp libvirt-2.1.0.orig/daemon/Makefile.in libvirt-2.1.0/daemon/Makefile.in ---- libvirt-2.1.0.orig/daemon/Makefile.in 2016-08-20 10:07:32.040554000 +0000 -+++ libvirt-2.1.0/daemon/Makefile.in 2016-08-20 10:07:47.076554000 +0000 -@@ -2842,13 +2842,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/ +diff -urp libvirt-2.3.0.orig/daemon/Makefile.in libvirt-2.3.0/daemon/Makefile.in +--- libvirt-2.3.0.orig/daemon/Makefile.in 2016-10-28 19:13:22.638715000 +0000 ++++ libvirt-2.3.0/daemon/Makefile.in 2016-10-28 19:13:48.469715000 +0000 +@@ -2847,13 +2847,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/ # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional @WITH_SASL_TRUE@install-data-sasl: @@ -61,9 +61,9 @@ diff -urp libvirt-2.1.0.orig/daemon/Makefile.in libvirt-2.1.0/daemon/Makefile.in @WITH_SASL_FALSE@install-data-sasl: @WITH_SASL_FALSE@uninstall-data-sasl: -diff -urp libvirt-2.1.0.orig/docs/auth.html libvirt-2.1.0/docs/auth.html ---- libvirt-2.1.0.orig/docs/auth.html 2016-08-20 10:07:32.082554000 +0000 -+++ libvirt-2.1.0/docs/auth.html 2016-08-20 10:07:47.076554000 +0000 +diff -urp libvirt-2.3.0.orig/docs/auth.html libvirt-2.3.0/docs/auth.html +--- libvirt-2.3.0.orig/docs/auth.html 2016-10-28 19:13:22.665715000 +0000 ++++ libvirt-2.3.0/docs/auth.html 2016-10-28 19:13:48.470715000 +0000 @@ -415,7 +415,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 @@ -73,9 +73,9 @@ diff -urp libvirt-2.1.0.orig/docs/auth.html libvirt-2.1.0/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-2.1.0.orig/docs/auth.html.in libvirt-2.1.0/docs/auth.html.in ---- libvirt-2.1.0.orig/docs/auth.html.in 2016-08-20 10:07:32.100554000 +0000 -+++ libvirt-2.1.0/docs/auth.html.in 2016-08-20 10:07:47.077554000 +0000 +diff -urp libvirt-2.3.0.orig/docs/auth.html.in libvirt-2.3.0/docs/auth.html.in +--- libvirt-2.3.0.orig/docs/auth.html.in 2016-10-28 19:13:22.677715000 +0000 ++++ libvirt-2.3.0/docs/auth.html.in 2016-10-28 19:13:48.474715000 +0000 @@ -246,7 +246,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,11 @@ diff -urp libvirt-2.1.0.orig/docs/auth.html.in libvirt-2.1.0/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-2.1.0.orig/libvirt.spec libvirt-2.1.0/libvirt.spec ---- libvirt-2.1.0.orig/libvirt.spec 2016-08-20 10:07:31.917554000 +0000 -+++ libvirt-2.1.0/libvirt.spec 2016-08-20 10:08:58.351554000 +0000 -@@ -1827,7 +1827,7 @@ exit 0 +Only in libvirt-2.3.0: libvirt-sasl.patch +diff -urp libvirt-2.3.0.orig/libvirt.spec libvirt-2.3.0/libvirt.spec +--- libvirt-2.3.0.orig/libvirt.spec 2016-10-28 19:13:22.458715000 +0000 ++++ libvirt-2.3.0/libvirt.spec 2016-10-28 19:13:48.474715000 +0000 +@@ -1832,7 +1832,7 @@ exit 0 %{_datadir}/libvirt/cpu_map.xml %{_datadir}/libvirt/libvirtLogo.png @@ -97,10 +98,10 @@ diff -urp libvirt-2.1.0.orig/libvirt.spec libvirt-2.1.0/libvirt.spec %files admin %{_mandir}/man1/virt-admin.1* -diff -urp libvirt-2.1.0.orig/libvirt.spec.in libvirt-2.1.0/libvirt.spec.in ---- libvirt-2.1.0.orig/libvirt.spec.in 2016-08-20 10:07:31.915554000 +0000 -+++ libvirt-2.1.0/libvirt.spec.in 2016-08-20 10:09:09.031554000 +0000 -@@ -1827,7 +1827,7 @@ exit 0 +diff -urp libvirt-2.3.0.orig/libvirt.spec.in libvirt-2.3.0/libvirt.spec.in +--- libvirt-2.3.0.orig/libvirt.spec.in 2016-10-28 19:13:22.455715000 +0000 ++++ libvirt-2.3.0/libvirt.spec.in 2016-10-28 19:13:48.475715000 +0000 +@@ -1832,7 +1832,7 @@ exit 0 %{_datadir}/libvirt/cpu_map.xml %{_datadir}/libvirt/libvirtLogo.png @@ -109,10 +110,10 @@ diff -urp libvirt-2.1.0.orig/libvirt.spec.in libvirt-2.1.0/libvirt.spec.in %files admin %{_mandir}/man1/virt-admin.1* -diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf ---- libvirt-2.1.0.orig/src/qemu/qemu.conf 2016-08-20 10:07:31.997554000 +0000 -+++ libvirt-2.1.0/src/qemu/qemu.conf 2016-08-20 10:07:47.087554000 +0000 -@@ -74,18 +74,18 @@ +diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf +--- libvirt-2.3.0.orig/src/qemu/qemu.conf 2016-10-28 19:13:22.586715000 +0000 ++++ libvirt-2.3.0/src/qemu/qemu.conf 2016-10-28 19:13:48.475715000 +0000 +@@ -98,18 +98,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this # @@ -134,7 +135,7 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf # QEMU implements an extension for providing audio over a VNC connection, -@@ -154,17 +154,17 @@ +@@ -173,17 +173,17 @@ # Enable use of SASL encryption on the SPICE server. This requires # a SPICE client which supports the SASL protocol extension. # @@ -153,12 +154,12 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf -#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-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-08-20 10:07:31.997554000 +0000 -+++ libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in 2016-08-20 10:09:46.009554000 +0000 -@@ -9,7 +9,7 @@ module Test_libvirtd_qemu = + # Enable use of TLS encryption on the chardev TCP transports. + # +diff -urp libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.3.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-10-28 19:13:22.588715000 +0000 ++++ libvirt-2.3.0/src/qemu/test_libvirtd_qemu.aug.in 2016-10-28 19:14:27.032715000 +0000 +@@ -11,7 +11,7 @@ module Test_libvirtd_qemu = { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } { "vnc_sasl" = "1" } @@ -167,18 +168,18 @@ diff -urp libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.1.0/sr { "vnc_allow_host_audio" = "0" } { "spice_listen" = "0.0.0.0" } { "spice_tls" = "1" } -@@ -17,7 +17,7 @@ module Test_libvirtd_qemu = +@@ -19,7 +19,7 @@ module Test_libvirtd_qemu = { "spice_auto_unix_socket" = "1" } { "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-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args ---- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-08-20 10:07:32.590554000 +0000 -+++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-08-20 10:07:48.739554000 +0000 + { "chardev_tls" = "1" } + { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } + { "chardev_tls_x509_verify" = "1" } +diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args +--- libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-10-28 19:13:23.321715000 +0000 ++++ libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-10-28 19:13:48.476715000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -188,9 +189,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args ---- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-08-20 10:07:32.591554000 +0000 -+++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-08-20 10:07:48.739554000 +0000 +diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args +--- libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-10-28 19:13:23.321715000 +0000 ++++ libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-10-28 19:13:48.476715000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -200,9 +201,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args ---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:32.622554000 +0000 -+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:48.740554000 +0000 +diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +--- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-10-28 19:13:23.399715000 +0000 ++++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-10-28 19:13:48.476715000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -212,9 +213,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice- QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args ---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-08-20 10:07:32.623554000 +0000 -+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-08-20 10:07:48.740554000 +0000 +diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +--- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-10-28 19:13:23.399715000 +0000 ++++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-10-28 19:13:48.477715000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -224,9 +225,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args ---- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-08-20 10:07:32.623554000 +0000 -+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-08-20 10:07:48.740554000 +0000 +diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +--- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-10-28 19:13:23.399715000 +0000 ++++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-10-28 19:13:48.477715000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -236,10 +237,10 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxml2argvtest.c ---- libvirt-2.1.0.orig/tests/qemuxml2argvtest.c 2016-08-20 10:07:32.132554000 +0000 -+++ libvirt-2.1.0/tests/qemuxml2argvtest.c 2016-08-20 10:07:48.741554000 +0000 -@@ -929,7 +929,7 @@ mymain(void) +diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvtest.c libvirt-2.3.0/tests/qemuxml2argvtest.c +--- libvirt-2.3.0.orig/tests/qemuxml2argvtest.c 2016-10-28 19:13:22.696715000 +0000 ++++ libvirt-2.3.0/tests/qemuxml2argvtest.c 2016-10-28 19:13:48.478715000 +0000 +@@ -978,7 +978,7 @@ mymain(void) driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -248,7 +249,7 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxm DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -953,7 +953,7 @@ mymain(void) +@@ -1002,7 +1002,7 @@ mymain(void) DO_TEST("graphics-spice-no-args", QEMU_CAPS_SPICE); driver.config->spiceSASL = 1; @@ -257,9 +258,9 @@ diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxm DO_TEST("graphics-spice-sasl", QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, -diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.1.0/tests/virconfdata/libvirtd.conf ---- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf 2016-08-20 10:07:33.070554000 +0000 -+++ libvirt-2.1.0/tests/virconfdata/libvirtd.conf 2016-08-20 10:09:58.088554000 +0000 +diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.3.0/tests/virconfdata/libvirtd.conf +--- libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf 2016-10-28 19:13:23.469715000 +0000 ++++ libvirt-2.3.0/tests/virconfdata/libvirtd.conf 2016-10-28 19:13:48.478715000 +0000 @@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) # @@ -278,9 +279,9 @@ diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.1.0/tests auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out libvirt-2.1.0/tests/virconfdata/libvirtd.out ---- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out 2016-08-20 10:07:33.070554000 +0000 -+++ libvirt-2.1.0/tests/virconfdata/libvirtd.out 2016-08-20 10:10:07.948554000 +0000 +diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out libvirt-2.3.0/tests/virconfdata/libvirtd.out +--- libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out 2016-10-28 19:13:23.469715000 +0000 ++++ libvirt-2.3.0/tests/virconfdata/libvirtd.out 2016-10-28 19:13:48.479715000 +0000 @@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" # the network providing auth (eg, TLS/x509 certificates) #