From: Daniel P. Berrangé <berra...@redhat.com> The implementation of this workaround does not currently work, so remove the option entirely to avoid exposing it to users. The code will remain (temporarily dormant) to be fixed in the next release cycle.
Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> Reviewed-by: Fabiano Rosas <faro...@suse.de> Link: https://lore.kernel.org/qemu-devel/20250805182431.504158-1-berra...@redhat.com Signed-off-by: Fabiano Rosas <faro...@suse.de> --- meson.build | 6 +++--- meson_options.txt | 2 -- scripts/meson-buildoptions.sh | 5 ----- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index e53cd5b413..a7b3c683ce 100644 --- a/meson.build +++ b/meson.build @@ -1836,11 +1836,11 @@ if get_option('gnutls').enabled() or (get_option('gnutls').auto() and have_syste required: get_option('gnutls')) endif - if gnutls.found() and not get_option('gnutls-bug1717-workaround').disabled() + #if gnutls.found() and not get_option('gnutls-bug1717-workaround').disabled() # XXX: when bug 1717 is resolved, add logic to probe for # the GNUTLS fixed version number to handle the 'auto' case - gnutls_bug1717_workaround = true - endif + # gnutls_bug1717_workaround = true + #endif endif # We prefer use of gnutls for crypto, unless the options diff --git a/meson_options.txt b/meson_options.txt index dd33530750..fff1521e58 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -174,8 +174,6 @@ option('libcbor', type : 'feature', value : 'auto', description: 'libcbor support') option('gnutls', type : 'feature', value : 'auto', description: 'GNUTLS cryptography support') -option('gnutls-bug1717-workaround', type: 'feature', value : 'auto', - description: 'GNUTLS workaround for https://gitlab.com/gnutls/gnutls/-/issues/1717') option('nettle', type : 'feature', value : 'auto', description: 'nettle cryptography support') option('gcrypt', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index d559e260ed..0ebe6bc52a 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -123,9 +123,6 @@ meson_options_help() { printf "%s\n" ' gio use libgio for D-Bus support' printf "%s\n" ' glusterfs Glusterfs block device driver' printf "%s\n" ' gnutls GNUTLS cryptography support' - printf "%s\n" ' gnutls-bug1717-workaround' - printf "%s\n" ' GNUTLS workaround for' - printf "%s\n" ' https://gitlab.com/gnutls/gnutls/-/issues/1717' printf "%s\n" ' gtk GTK+ user interface' printf "%s\n" ' gtk-clipboard clipboard support for the gtk UI (EXPERIMENTAL, MAY HANG)' printf "%s\n" ' guest-agent Build QEMU Guest Agent' @@ -334,8 +331,6 @@ _meson_option_parse() { --disable-glusterfs) printf "%s" -Dglusterfs=disabled ;; --enable-gnutls) printf "%s" -Dgnutls=enabled ;; --disable-gnutls) printf "%s" -Dgnutls=disabled ;; - --enable-gnutls-bug1717-workaround) printf "%s" -Dgnutls-bug1717-workaround=enabled ;; - --disable-gnutls-bug1717-workaround) printf "%s" -Dgnutls-bug1717-workaround=disabled ;; --enable-gtk) printf "%s" -Dgtk=enabled ;; --disable-gtk) printf "%s" -Dgtk=disabled ;; --enable-gtk-clipboard) printf "%s" -Dgtk_clipboard=enabled ;; -- 2.35.3
