]> TLD Linux GIT Repositories - packages/libvirt.git/blob - libvirt-sasl.patch
- updated to 10.6.0
[packages/libvirt.git] / libvirt-sasl.patch
1 diff -ur libvirt-10.2.0.orig/docs/auth.rst libvirt-10.2.0/docs/auth.rst
2 --- libvirt-10.2.0.orig/docs/auth.rst   2024-04-03 17:45:03.261111129 +0200
3 +++ libvirt-10.2.0/docs/auth.rst        2024-04-03 17:45:24.393393683 +0200
4 @@ -225,7 +225,7 @@
5  
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 ``/etc/sasl2/libvirt.conf`` to set the ``mech_list``
9 +editing ``/etc/sasl/libvirt.conf`` to set the ``mech_list``
10  parameter to ``scram-sha-256``.
11  
12  **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and
13 diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu.conf.in
14 --- libvirt-10.2.0.orig/src/qemu/qemu.conf.in   2024-04-03 17:45:03.365112520 +0200
15 +++ libvirt-10.2.0/src/qemu/qemu.conf.in        2024-04-03 17:45:24.457394538 +0200
16 @@ -141,18 +141,18 @@
17  # Examples include vinagre, virt-viewer and virt-manager
18  # itself. UltraVNC, RealVNC, TightVNC do not support this
19  #
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)
23  #
24  #vnc_sasl = 1
25  
26  
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
32  #
33 -#vnc_sasl_dir = "/some/directory/sasl2"
34 +#vnc_sasl_dir = "/some/directory/sasl"
35  
36  
37  # QEMU implements an extension for providing audio over a VNC connection,
38 @@ -217,17 +217,17 @@
39  # Enable use of SASL encryption on the SPICE server. This requires
40  # a SPICE client which supports the SASL protocol extension.
41  #
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)
45  #
46  #spice_sasl = 1
47  
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
53  #
54 -#spice_sasl_dir = "/some/directory/sasl2"
55 +#spice_sasl_dir = "/some/directory/sasl"
56  
57  # Enable use of TLS encryption on the chardev TCP transports.
58  #
59 diff -ur libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in
60 --- libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2024-04-03 17:45:03.369112573 +0200
61 +++ libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in   2024-04-03 17:45:24.457394538 +0200
62 @@ -13,7 +13,7 @@
63  { "vnc_tls_x509_verify" = "1" }
64  { "vnc_password" = "XYZ12345" }
65  { "vnc_sasl" = "1" }
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" }
70  { "spice_tls" = "1" }
71 @@ -21,7 +21,7 @@
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-10.2.0.orig/src/remote/libvirtd.conf.in libvirt-10.2.0/src/remote/libvirtd.conf.in
81 --- libvirt-10.2.0.orig/src/remote/libvirtd.conf.in     2024-04-03 17:45:03.369112573 +0200
82 +++ libvirt-10.2.0/src/remote/libvirtd.conf.in  2024-04-03 17:45:24.457394538 +0200
83 @@ -140,7 +140,7 @@
84  #          the network providing auth (eg, TLS/x509 certificates)
85  #
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.
91  #
92 @@ -190,7 +190,7 @@
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
98  #auth_tcp = "sasl"
99  
100  # Change the authentication scheme for TLS sockets.
101 diff -ur libvirt-10.2.0.orig/src/remote/meson.build libvirt-10.2.0/src/remote/meson.build
102 --- libvirt-10.2.0.orig/src/remote/meson.build  2024-04-03 17:45:03.369112573 +0200
103 +++ libvirt-10.2.0/src/remote/meson.build       2024-04-03 17:45:24.457394538 +0200
104 @@ -328,7 +328,7 @@
105  if conf.has('WITH_SASL')
106    install_data(
107      'libvirtd.sasl',
108 -    install_dir: sysconfdir / 'sasl2',
109 +    install_dir: sysconfdir / 'sasl',
110      rename: [ 'libvirt.conf' ],
111    )
112  endif
113 diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
114 --- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args    2024-04-03 17:45:03.593115568 +0200
115 +++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args 2024-04-03 17:47:10.346810356 +0200
116 @@ -6,7 +6,7 @@
117  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
118  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
119  XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
120 -SASL_CONF_PATH=/etc/sasl2 \
121 +SASL_CONF_PATH=/etc/sasl \
122  /usr/bin/qemu-system-x86_64 \
123  -name guest=QEMUGuest1,debug-threads=on \
124  -S \
125 diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
126 --- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args      2024-04-03 17:45:03.597115621 +0200
127 +++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args   2024-04-03 17:47:02.230701838 +0200
128 @@ -6,7 +6,7 @@
129  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
130  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
131  XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
132 -SASL_CONF_PATH=/etc/sasl2 \
133 +SASL_CONF_PATH=/etc/sasl \
134  /usr/bin/qemu-system-x86_64 \
135  -name guest=QEMUGuest1,debug-threads=on \
136  -S \
137 diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args
138 --- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2024-04-03 17:45:03.597115621 +0200
139 +++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args      2024-04-03 17:47:06.658761044 +0200
140 @@ -6,7 +6,7 @@
141  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
142  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
143  XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
144 -SASL_CONF_PATH=/etc/sasl2 \
145 +SASL_CONF_PATH=/etc/sasl \
146  /usr/bin/qemu-system-x86_64 \
147  -name guest=QEMUGuest1,debug-threads=on \
148  -S \
149 diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
150 --- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args        2024-04-03 17:45:03.597115621 +0200
151 +++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args     2024-04-03 17:47:16.594893897 +0200
152 @@ -6,7 +6,7 @@
153  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
154  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
155  XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
156 -SASL_CONF_PATH=/etc/sasl2 \
157 +SASL_CONF_PATH=/etc/sasl \
158  /usr/bin/qemu-system-x86_64 \
159  -name guest=QEMUGuest1,debug-threads=on \
160  -S \
161 diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
162 --- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args       2024-04-03 17:45:03.597115621 +0200
163 +++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args    2024-04-03 17:47:13.522852821 +0200
164 @@ -6,7 +6,7 @@
165  XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
166  XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
167  XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
168 -SASL_CONF_PATH=/etc/sasl2 \
169 +SASL_CONF_PATH=/etc/sasl \
170  /usr/bin/qemu-system-x86_64 \
171  -name guest=QEMUGuest1,debug-threads=on \
172  -S \
173 diff -ur libvirt-10.2.0.orig/tests/testutilsqemu.c libvirt-10.2.0/tests/testutilsqemu.c
174 --- libvirt-10.2.0.orig/tests/testutilsqemu.c   2024-04-03 17:45:03.705117066 +0200
175 +++ libvirt-10.2.0/tests/testutilsqemu.c        2024-04-03 17:45:28.901453959 +0200
176 @@ -387,9 +387,9 @@
177      cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup");
178  
179      VIR_FREE(cfg->vncSASLdir);
180 -    cfg->vncSASLdir = g_strdup("/etc/sasl2");
181 +    cfg->vncSASLdir = g_strdup("/etc/sasl");
182      VIR_FREE(cfg->spiceSASLdir);
183 -    cfg->spiceSASLdir = g_strdup("/etc/sasl2");
184 +    cfg->spiceSASLdir = g_strdup("/etc/sasl");
185  
186      VIR_FREE(cfg->spicePassword);
187      cfg->spicePassword = g_strdup("123456");
188 diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-10.2.0/tests/virconfdata/libvirtd.conf
189 --- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf 2024-04-03 17:45:03.905119740 +0200
190 +++ libvirt-10.2.0/tests/virconfdata/libvirtd.conf      2024-04-03 17:45:28.929454333 +0200
191 @@ -91,7 +91,7 @@
192  #          the network providing auth (eg, TLS/x509 certificates)
193  #
194  #  - sasl: use SASL infrastructure. The actual auth scheme is then
195 -#          controlled from /etc/sasl2/libvirt.conf. For the TCP
196 +#          controlled from /etc/sasl/libvirt.conf. For the TCP
197  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
198  #          For non-TCP or TLS sockets,  any scheme is allowed.
199  #
200 @@ -122,7 +122,7 @@
201  # If you don't enable SASL, then all TCP traffic is cleartext.
202  # Don't do this outside of a dev/test scenario. For real world
203  # use, always enable SASL and use the GSSAPI or DIGEST-MD5
204 -# mechanism in /etc/sasl2/libvirt.conf
205 +# mechanism in /etc/sasl/libvirt.conf
206  auth_tcp = "sasl"
207  
208  # Change the authentication scheme for TLS sockets.
209 diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out libvirt-10.2.0/tests/virconfdata/libvirtd.out
210 --- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out  2024-04-03 17:45:03.905119740 +0200
211 +++ libvirt-10.2.0/tests/virconfdata/libvirtd.out       2024-04-03 17:45:28.929454333 +0200
212 @@ -73,7 +73,7 @@
213  #          the network providing auth (eg, TLS/x509 certificates)
214  #
215  #  - sasl: use SASL infrastructure. The actual auth scheme is then
216 -#          controlled from /etc/sasl2/libvirt.conf. For the TCP
217 +#          controlled from /etc/sasl/libvirt.conf. For the TCP
218  #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
219  #          For non-TCP or TLS sockets,  any scheme is allowed.
220  #
221 @@ -102,7 +102,7 @@
222  # If you don't enable SASL, then all TCP traffic is cleartext.
223  # Don't do this outside of a dev/test scenario. For real world
224  # use, always enable SASL and use the GSSAPI or DIGEST-MD5
225 -# mechanism in /etc/sasl2/libvirt.conf
226 +# mechanism in /etc/sasl/libvirt.conf
227  auth_tcp = "sasl"
228  # Change the authentication scheme for TLS sockets.
229  #