1 diff -ur libvirt-5.10.0.orig/docs/auth.html.in libvirt-5.10.0/docs/auth.html.in
2 --- libvirt-5.10.0.orig/docs/auth.html.in 2019-12-08 00:42:43.765000000 +0100
3 +++ libvirt-5.10.0/docs/auth.html.in 2019-12-08 00:43:02.262000000 +0100
6 Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
7 config change is rquired to enable plain password auth. This is done by
8 -editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
9 +editting <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-5.10.0.orig/src/Makefile.in libvirt-5.10.0/src/Makefile.in
14 --- libvirt-5.10.0.orig/src/Makefile.in 2019-12-08 00:42:43.668000000 +0100
15 +++ libvirt-5.10.0/src/Makefile.in 2019-12-08 00:43:02.265000000 +0100
18 # This is needed for clients too, so can't wrap in
19 # the WITH_LIBVIRTD conditional
20 -@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl2
21 +@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl
22 LIBVIRTD_UNIT_VARS = \
24 -e 's|[@]name[@]|Libvirt|g' \
25 diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.conf
26 --- libvirt-5.10.0.orig/src/qemu/qemu.conf 2019-12-08 00:42:43.698000000 +0100
27 +++ libvirt-5.10.0/src/qemu/qemu.conf 2019-12-08 00:43:02.265000000 +0100
29 # Examples include vinagre, virt-viewer and virt-manager
30 # itself. UltraVNC, RealVNC, TightVNC do not support this
32 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
33 +# It is necessary to configure /etc/sasl/qemu.conf to choose
34 # the desired SASL plugin (eg, GSSPI for Kerberos)
39 -# The default SASL configuration file is located in /etc/sasl2/
40 +# The default SASL configuration file is located in /etc/sasl/
41 # When running libvirtd unprivileged, it may be desirable to
42 # override the configs in this location. Set this parameter to
43 # point to the directory, and create a qemu.conf in that location
45 -#vnc_sasl_dir = "/some/directory/sasl2"
46 +#vnc_sasl_dir = "/some/directory/sasl"
49 # QEMU implements an extension for providing audio over a VNC connection,
51 # Enable use of SASL encryption on the SPICE server. This requires
52 # a SPICE client which supports the SASL protocol extension.
54 -# It is necessary to configure /etc/sasl2/qemu.conf to choose
55 +# It is necessary to configure /etc/sasl/qemu.conf to choose
56 # the desired SASL plugin (eg, GSSPI for Kerberos)
60 -# The default SASL configuration file is located in /etc/sasl2/
61 +# The default SASL configuration file is located in /etc/sasl/
62 # When running libvirtd unprivileged, it may be desirable to
63 # override the configs in this location. Set this parameter to
64 # point to the directory, and create a qemu.conf in that location
66 -#spice_sasl_dir = "/some/directory/sasl2"
67 +#spice_sasl_dir = "/some/directory/sasl"
69 # Enable use of TLS encryption on the chardev TCP transports.
71 diff -ur libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.10.0/src/qemu/test_libvirtd_qemu.aug.in
72 --- libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2019-12-08 00:42:43.697000000 +0100
73 +++ libvirt-5.10.0/src/qemu/test_libvirtd_qemu.aug.in 2019-12-08 00:43:02.265000000 +0100
75 { "vnc_tls_x509_verify" = "1" }
76 { "vnc_password" = "XYZ12345" }
78 -{ "vnc_sasl_dir" = "/some/directory/sasl2" }
79 +{ "vnc_sasl_dir" = "/some/directory/sasl" }
80 { "vnc_allow_host_audio" = "0" }
81 { "spice_listen" = "0.0.0.0" }
84 { "spice_auto_unix_socket" = "1" }
85 { "spice_password" = "XYZ12345" }
86 { "spice_sasl" = "1" }
87 -{ "spice_sasl_dir" = "/some/directory/sasl2" }
88 +{ "spice_sasl_dir" = "/some/directory/sasl" }
89 { "chardev_tls" = "1" }
90 { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
91 { "chardev_tls_x509_verify" = "1" }
92 diff -ur libvirt-5.10.0.orig/src/remote/Makefile.inc.am libvirt-5.10.0/src/remote/Makefile.inc.am
93 --- libvirt-5.10.0.orig/src/remote/Makefile.inc.am 2019-12-08 00:42:43.683000000 +0100
94 +++ libvirt-5.10.0/src/remote/Makefile.inc.am 2019-12-08 00:43:02.266000000 +0100
96 # This is needed for clients too, so can't wrap in
97 # the WITH_LIBVIRTD conditional
99 -sasldir = $(sysconfdir)/sasl2
100 +sasldir = $(sysconfdir)/sasl
103 $(MKDIR_P) $(DESTDIR)$(sasldir)
104 diff -ur libvirt-5.10.0.orig/src/remote/libvirtd.conf.in libvirt-5.10.0/src/remote/libvirtd.conf.in
105 --- libvirt-5.10.0.orig/src/remote/libvirtd.conf.in 2019-12-08 00:42:43.683000000 +0100
106 +++ libvirt-5.10.0/src/remote/libvirtd.conf.in 2019-12-08 00:43:02.266000000 +0100
108 # the network providing auth (eg, TLS/x509 certificates)
110 # - sasl: use SASL infrastructure. The actual auth scheme is then
111 -# controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP
112 +# controlled from @sysconfdir@/sasl/libvirt.conf. For the TCP
113 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
114 # For non-TCP or TLS sockets, any scheme is allowed.
117 # If you don't enable SASL, then all TCP traffic is cleartext.
118 # Don't do this outside of a dev/test scenario. For real world
119 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
120 -# mechanism in @sysconfdir@/sasl2/libvirt.conf
121 +# mechanism in @sysconfdir@/sasl/libvirt.conf
124 # Change the authentication scheme for TLS sockets.
125 diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
126 --- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-12-08 00:42:43.289000000 +0100
127 +++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-12-08 00:43:02.266000000 +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=spice \
135 /usr/bin/qemu-system-i686 \
137 diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
138 --- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-12-08 00:42:43.303000000 +0100
139 +++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-12-08 00:43:02.266000000 +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-i686 \
149 diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
150 --- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-12-08 00:42:43.303000000 +0100
151 +++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-12-08 00:43:02.266000000 +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-i686 \
160 -name guest=QEMUGuest1,debug-threads=on \
161 diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
162 --- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-12-08 00:42:43.289000000 +0100
163 +++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-12-08 00:43:02.266000000 +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-i686 \
173 diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
174 --- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-12-08 00:42:43.297000000 +0100
175 +++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-12-08 00:43:02.267000000 +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-i686 \
184 -name guest=QEMUGuest1,debug-threads=on \
185 diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
186 --- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-12-08 00:42:43.299000000 +0100
187 +++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-12-08 00:43:02.298000000 +0100
189 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
190 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
191 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
192 -SASL_CONF_PATH=/root/.sasl2 \
193 +SASL_CONF_PATH=/root/.sasl \
194 QEMU_AUDIO_DRV=none \
195 /usr/bin/qemu-system-i686 \
196 -name guest=QEMUGuest1,debug-threads=on \
197 diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvtest.c libvirt-5.10.0/tests/qemuxml2argvtest.c
198 --- libvirt-5.10.0.orig/tests/qemuxml2argvtest.c 2019-12-08 00:42:43.258000000 +0100
199 +++ libvirt-5.10.0/tests/qemuxml2argvtest.c 2019-12-08 00:43:42.225000000 +0100
200 @@ -1188,7 +1188,7 @@
202 driver.config->vncSASL = 1;
203 VIR_FREE(driver.config->vncSASLdir);
204 - driver.config->vncSASLdir = g_strdup("/root/.sasl2");
205 + driver.config->vncSASLdir = g_strdup("/root/.sasl");
206 DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
207 driver.config->vncTLS = 1;
208 driver.config->vncTLSx509verify = 1;
209 @@ -1218,7 +1218,7 @@
210 DO_TEST("graphics-spice-no-args",
211 QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
212 driver.config->spiceSASL = 1;
213 - driver.config->spiceSASLdir = g_strdup("/root/.sasl2");
214 + driver.config->spiceSASLdir = g_strdup("/root/.sasl");
215 DO_TEST("graphics-spice-sasl",
217 QEMU_CAPS_DEVICE_QXL);
218 diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.10.0/tests/virconfdata/libvirtd.conf
219 --- libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf 2019-12-08 00:42:43.506000000 +0100
220 +++ libvirt-5.10.0/tests/virconfdata/libvirtd.conf 2019-12-08 00:43:02.300000000 +0100
222 # the network providing auth (eg, TLS/x509 certificates)
224 # - sasl: use SASL infrastructure. The actual auth scheme is then
225 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
226 +# controlled from /etc/sasl/libvirt.conf. For the TCP
227 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
228 # For non-TCP or TLS sockets, any scheme is allowed.
231 # If you don't enable SASL, then all TCP traffic is cleartext.
232 # Don't do this outside of a dev/test scenario. For real world
233 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
234 -# mechanism in /etc/sasl2/libvirt.conf
235 +# mechanism in /etc/sasl/libvirt.conf
238 # Change the authentication scheme for TLS sockets.
239 diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.out libvirt-5.10.0/tests/virconfdata/libvirtd.out
240 --- libvirt-5.10.0.orig/tests/virconfdata/libvirtd.out 2019-12-08 00:42:43.506000000 +0100
241 +++ libvirt-5.10.0/tests/virconfdata/libvirtd.out 2019-12-08 00:43:02.300000000 +0100
243 # the network providing auth (eg, TLS/x509 certificates)
245 # - sasl: use SASL infrastructure. The actual auth scheme is then
246 -# controlled from /etc/sasl2/libvirt.conf. For the TCP
247 +# controlled from /etc/sasl/libvirt.conf. For the TCP
248 # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
249 # For non-TCP or TLS sockets, any scheme is allowed.
252 # If you don't enable SASL, then all TCP traffic is cleartext.
253 # Don't do this outside of a dev/test scenario. For real world
254 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
255 -# mechanism in /etc/sasl2/libvirt.conf
256 +# mechanism in /etc/sasl/libvirt.conf
258 # Change the authentication scheme for TLS sockets.