1 diff -ur libvirt-6.10.0.orig/docs/auth.html.in libvirt-6.10.0/docs/auth.html.in
2 --- libvirt-6.10.0.orig/docs/auth.html.in 2021-01-02 12:52:25.742090801 +0100
3 +++ libvirt-6.10.0/docs/auth.html.in 2021-01-02 12:52:59.973090801 +0100
6 Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
7 config change is required to enable plain password auth. This is done by
8 -editing <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
9 +editing <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
10 parameter to <code>scram-sha-1</code>.
13 diff -ur libvirt-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.conf
14 --- libvirt-6.10.0.orig/src/qemu/qemu.conf 2021-01-02 12:52:25.824090801 +0100
15 +++ libvirt-6.10.0/src/qemu/qemu.conf 2021-01-02 12:52:59.974090801 +0100
17 # Examples include vinagre, virt-viewer and virt-manager
18 # itself. UltraVNC, RealVNC, TightVNC do not support this
20 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
21 +# It is necessary to configure /etc/sasl/qemu.conf to choose
22 # the desired SASL plugin (eg, GSSPI for Kerberos)
27 -# The default SASL configuration file is located in /etc/sasl2/
28 +# The default SASL configuration file is located in /etc/sasl/
29 # When running libvirtd unprivileged, it may be desirable to
30 # override the configs in this location. Set this parameter to
31 # point to the directory, and create a qemu.conf in that location
33 -#vnc_sasl_dir = "/some/directory/sasl2"
34 +#vnc_sasl_dir = "/some/directory/sasl"
37 # QEMU implements an extension for providing audio over a VNC connection,
39 # Enable use of SASL encryption on the SPICE server. This requires
40 # a SPICE client which supports the SASL protocol extension.
42 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
43 +# It is necessary to configure /etc/sasl/qemu.conf to choose
44 # the desired SASL plugin (eg, GSSPI for Kerberos)
48 -# The default SASL configuration file is located in /etc/sasl2/
49 +# The default SASL configuration file is located in /etc/sasl/
50 # When running libvirtd unprivileged, it may be desirable to
51 # override the configs in this location. Set this parameter to
52 # point to the directory, and create a qemu.conf in that location
54 -#spice_sasl_dir = "/some/directory/sasl2"
55 +#spice_sasl_dir = "/some/directory/sasl"
57 # Enable use of TLS encryption on the chardev TCP transports.
59 diff -ur libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in
60 --- libvirt-6.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2021-01-02 12:52:25.830090801 +0100
61 +++ libvirt-6.10.0/src/qemu/test_libvirtd_qemu.aug.in 2021-01-02 12:52:59.974090801 +0100
63 { "vnc_tls_x509_verify" = "1" }
64 { "vnc_password" = "XYZ12345" }
66 -{ "vnc_sasl_dir" = "/some/directory/sasl2" }
67 +{ "vnc_sasl_dir" = "/some/directory/sasl" }
68 { "vnc_allow_host_audio" = "0" }
69 { "spice_listen" = "0.0.0.0" }
72 { "spice_auto_unix_socket" = "1" }
73 { "spice_password" = "XYZ12345" }
74 { "spice_sasl" = "1" }
75 -{ "spice_sasl_dir" = "/some/directory/sasl2" }
76 +{ "spice_sasl_dir" = "/some/directory/sasl" }
77 { "chardev_tls" = "1" }
78 { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
79 { "chardev_tls_x509_verify" = "1" }
80 diff -ur libvirt-6.10.0.orig/src/remote/libvirtd.conf.in libvirt-6.10.0/src/remote/libvirtd.conf.in
81 --- libvirt-6.10.0.orig/src/remote/libvirtd.conf.in 2021-01-02 12:52:25.830090801 +0100
82 +++ libvirt-6.10.0/src/remote/libvirtd.conf.in 2021-01-02 12:52:59.975090801 +0100
84 # the network providing auth (eg, TLS/x509 certificates)
86 # - sasl: use SASL infrastructure. The actual auth scheme is then
87 -# controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP
88 +# controlled from @sysconfdir@/sasl/libvirt.conf. For the TCP
89 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
90 # For non-TCP or TLS sockets, any scheme is allowed.
93 # If you don't enable SASL, then all TCP traffic is cleartext.
94 # Don't do this outside of a dev/test scenario. For real world
95 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
96 -# mechanism in @sysconfdir@/sasl2/libvirt.conf
97 +# mechanism in @sysconfdir@/sasl/libvirt.conf
100 # Change the authentication scheme for TLS sockets.
101 diff -ur libvirt-6.10.0.orig/src/remote/meson.build libvirt-6.10.0/src/remote/meson.build
102 --- libvirt-6.10.0.orig/src/remote/meson.build 2021-01-02 12:52:25.831090801 +0100
103 +++ libvirt-6.10.0/src/remote/meson.build 2021-01-02 12:53:19.602090801 +0100
105 if conf.has('WITH_SASL')
108 - install_dir: sysconfdir / 'sasl2',
109 + install_dir: sysconfdir / 'sasl',
110 rename: [ 'libvirt.conf' ],
113 diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
114 --- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2021-01-02 12:52:25.975090801 +0100
115 +++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2021-01-02 12:52:59.975090801 +0100
117 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
118 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
119 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
120 -SASL_CONF_PATH=/root/.sasl2 \
121 +SASL_CONF_PATH=/root/.sasl \
122 QEMU_AUDIO_DRV=spice \
123 /usr/bin/qemu-system-i386 \
125 diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
126 --- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2021-01-02 12:52:25.976090801 +0100
127 +++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2021-01-02 12:52:59.975090801 +0100
129 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
130 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
131 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
132 -SASL_CONF_PATH=/root/.sasl2 \
133 +SASL_CONF_PATH=/root/.sasl \
134 QEMU_AUDIO_DRV=none \
135 /usr/bin/qemu-system-i386 \
137 diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
138 --- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2021-01-02 12:52:25.976090801 +0100
139 +++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2021-01-02 12:52:59.975090801 +0100
141 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
142 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
143 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
144 -SASL_CONF_PATH=/root/.sasl2 \
145 +SASL_CONF_PATH=/root/.sasl \
146 QEMU_AUDIO_DRV=none \
147 /usr/bin/qemu-system-i386 \
148 -name guest=QEMUGuest1,debug-threads=on \
149 diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
150 --- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2021-01-02 12:52:25.976090801 +0100
151 +++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2021-01-02 12:52:59.975090801 +0100
153 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
154 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
155 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
156 -SASL_CONF_PATH=/root/.sasl2 \
157 +SASL_CONF_PATH=/root/.sasl \
158 QEMU_AUDIO_DRV=none \
159 /usr/bin/qemu-system-i386 \
161 diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
162 --- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2021-01-02 12:52:25.976090801 +0100
163 +++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2021-01-02 12:52:59.976090801 +0100
165 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
166 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
167 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
168 -SASL_CONF_PATH=/root/.sasl2 \
169 +SASL_CONF_PATH=/root/.sasl \
170 QEMU_AUDIO_DRV=none \
171 /usr/bin/qemu-system-i386 \
172 -name guest=QEMUGuest1,debug-threads=on \
173 diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
174 --- libvirt-6.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2021-01-02 12:52:25.976090801 +0100
175 +++ libvirt-6.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2021-01-02 12:52:59.976090801 +0100
177 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
178 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
179 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
180 -SASL_CONF_PATH=/root/.sasl2 \
181 +SASL_CONF_PATH=/root/.sasl \
182 QEMU_AUDIO_DRV=none \
183 /usr/bin/qemu-system-i386 \
184 -name guest=QEMUGuest1,debug-threads=on \
185 diff -ur libvirt-6.10.0.orig/tests/qemuxml2argvtest.c libvirt-6.10.0/tests/qemuxml2argvtest.c
186 --- libvirt-6.10.0.orig/tests/qemuxml2argvtest.c 2021-01-02 12:52:26.020090801 +0100
187 +++ libvirt-6.10.0/tests/qemuxml2argvtest.c 2021-01-02 12:52:59.976090801 +0100
188 @@ -1365,7 +1365,7 @@
190 driver.config->vncSASL = 1;
191 VIR_FREE(driver.config->vncSASLdir);
192 - driver.config->vncSASLdir = g_strdup("/root/.sasl2");
193 + driver.config->vncSASLdir = g_strdup("/root/.sasl");
194 DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
195 driver.config->vncTLS = 1;
196 driver.config->vncTLSx509verify = 1;
197 @@ -1395,7 +1395,7 @@
198 DO_TEST("graphics-spice-no-args",
199 QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
200 driver.config->spiceSASL = 1;
201 - driver.config->spiceSASLdir = g_strdup("/root/.sasl2");
202 + driver.config->spiceSASLdir = g_strdup("/root/.sasl");
203 DO_TEST("graphics-spice-sasl",
205 QEMU_CAPS_DEVICE_QXL);
206 diff -ur libvirt-6.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.10.0/tests/virconfdata/libvirtd.conf
207 --- libvirt-6.10.0.orig/tests/virconfdata/libvirtd.conf 2021-01-02 12:52:26.083090801 +0100
208 +++ libvirt-6.10.0/tests/virconfdata/libvirtd.conf 2021-01-02 12:52:59.977090801 +0100
210 # the network providing auth (eg, TLS/x509 certificates)
212 # - sasl: use SASL infrastructure. The actual auth scheme is then
213 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
214 +# controlled from /etc/sasl/libvirt.conf. For the TCP
215 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
216 # For non-TCP or TLS sockets, any scheme is allowed.
219 # If you don't enable SASL, then all TCP traffic is cleartext.
220 # Don't do this outside of a dev/test scenario. For real world
221 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
222 -# mechanism in /etc/sasl2/libvirt.conf
223 +# mechanism in /etc/sasl/libvirt.conf
226 # Change the authentication scheme for TLS sockets.
227 diff -ur libvirt-6.10.0.orig/tests/virconfdata/libvirtd.out libvirt-6.10.0/tests/virconfdata/libvirtd.out
228 --- libvirt-6.10.0.orig/tests/virconfdata/libvirtd.out 2021-01-02 12:52:26.083090801 +0100
229 +++ libvirt-6.10.0/tests/virconfdata/libvirtd.out 2021-01-02 12:52:59.977090801 +0100
231 # the network providing auth (eg, TLS/x509 certificates)
233 # - sasl: use SASL infrastructure. The actual auth scheme is then
234 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
235 +# controlled from /etc/sasl/libvirt.conf. For the TCP
236 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
237 # For non-TCP or TLS sockets, any scheme is allowed.
240 # If you don't enable SASL, then all TCP traffic is cleartext.
241 # Don't do this outside of a dev/test scenario. For real world
242 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
243 -# mechanism in /etc/sasl2/libvirt.conf
244 +# mechanism in /etc/sasl/libvirt.conf
246 # Change the authentication scheme for TLS sockets.