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

Follow-up for #36937.

diff --git a/NEWS b/NEWS
index 41798f92136cd189963eaa8f853f5fe7369e7341..af63649a166d3226402c55f7e068641fe0e3072e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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

diff --git a/meson_options.txt b/meson_options.txt
index c07a4ce082da4ccf60a6724d06039225e69689b9..72bf6a5f83d9c1bab86d659ee5827910747c67e5 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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' },