meson: use deprecated tag for dns-over-tls and cryptolib meson options

Follow-up for #36937.
This commit is contained in:
Yu Watanabe
2025-04-21 13:26:27 +09:00
committed by Daan De Meyer
parent efe0fe43a8
commit 87541e254f
2 changed files with 6 additions and 6 deletions

6
NEWS
View File

@@ -69,9 +69,9 @@ CHANGES WITH 258 in spe:
* OpenSSL is the only crypto backend for systemd-resolved and
systemd-importd, and support for gnutls and gcrypt has been removed.
Hence, support for 'dns-over-tls=gnutls' meson option has been
removed. Also, 'cryptolib' meson option has been deprecated, and will
be removed in a future release.
Hence, 'gnutls' for 'dns-over-tls=' meson option has been deprecated,
deprecated. Also, 'cryptolib' meson option has been deprecated. They
will be removed in a future release.
* systemd-logind's session tracking, which used to be performed via
fifo fd installed in the client, has been fully switched to be

View File

@@ -358,7 +358,8 @@ option('default-llmnr', type : 'combo',
choices : ['yes', 'resolve', 'no'],
description : 'default LLMNR mode',
value : 'yes')
option('dns-over-tls', type : 'combo', choices : ['auto', 'openssl', 'true', 'false'],
option('dns-over-tls', type : 'combo', choices : ['auto', 'gnutls', 'openssl', 'true', 'false'],
deprecated : { 'gnutls' : 'auto' },
description : 'DNS-over-TLS support')
option('dns-servers', type : 'string',
description : 'space-separated list of default DNS servers',
@@ -434,8 +435,7 @@ option('gnutls', type : 'feature', deprecated : { 'true' : 'enabled', 'false' :
description : 'gnutls support')
option('openssl', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
description : 'openssl support')
option('cryptolib', type : 'combo', choices : ['auto', 'openssl'],
description : 'This option is deprecated and will be removed in a future release')
option('cryptolib', type : 'combo', choices : ['auto', 'openssl', 'gcrypt'], deprecated : true)
option('p11kit', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
description : 'p11kit support')
option('libfido2', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },