meson: Fix a few consistency nits

diff --git a/meson/dnstap/meson.build b/meson/dnstap/meson.build
index e7a487ef51a3446f94149e0770b51b18098f2dfa..58dfe839dc4922c7244c967d1b7474efee2568da 100644 (file)
--- a/meson/dnstap/meson.build
+++ b/meson/dnstap/meson.build
@@ -14,4 +14,3 @@ endif
 
 conf.set('HAVE_FSTRM', dep_dnstap.found(), description: 'libfstrm')
 summary('DNSTAP', dep_dnstap.found(), bool_yn: true, section: 'Configuration')
-

diff --git a/meson/hardening/meson.build b/meson/hardening/meson.build
index 1859c63bafb85bbcebbd0c4ee15a9fe9eda6033d..3d5af7ad3fca65b246a80c16e0956e16f1890353 100644 (file)
--- a/meson/hardening/meson.build
+++ b/meson/hardening/meson.build
@@ -1,5 +1,5 @@
 opt_hardening = get_option('hardening')
-if opt_hardening.enabled() or opt_hardening.auto()
+if opt_hardening.allowed()
   hardening_features = []
 
   # PIE

diff --git a/meson/libssl/meson.build b/meson/libssl/meson.build
index 387d5514f6f0d4880b37e3c6b14ef37ed82c87db..06b63159993a1d57ff14f6ff30747f16411d00eb 100644 (file)
--- a/meson/libssl/meson.build
+++ b/meson/libssl/meson.build
@@ -20,23 +20,23 @@ if dep_libssl.found()
     has = cxx.has_function(func, dependencies: dep_libssl)
     conf.set('HAVE_' + func.to_upper(), has, description: 'Have OpenSSL libssl ' + func)
   endforeach
-endif
 
-has = cxx.has_header_symbol(
-  'openssl/ssl.h',
-  'SSL_CTX_set_min_proto_version',
-  dependencies: dep_libssl,
-)
-conf.set(
-  'HAVE_SSL_CTX_SET_MIN_PROTO_VERSION',
-  has,
-  description: 'Have OpenSSL libssl SSL_CTX_set_min_proto_version',
-)
-conf.set(
-  'OPENSSL_NO_ENGINE',
-  true,
-  description: 'Disable engine support for auth in libssl.cc',
-)
+  has = cxx.has_header_symbol(
+    'openssl/ssl.h',
+    'SSL_CTX_set_min_proto_version',
+    dependencies: dep_libssl,
+  )
+  conf.set(
+    'HAVE_SSL_CTX_SET_MIN_PROTO_VERSION',
+    has,
+    description: 'Have OpenSSL libssl SSL_CTX_set_min_proto_version',
+  )
+  conf.set(
+    'OPENSSL_NO_ENGINE',
+    true,
+    description: 'Disable engine support for auth in libssl.cc',
+  )
+endif
 
 conf.set('HAVE_LIBSSL', dep_libssl.found(), description: 'OpenSSL libssl')
 summary('OpenSSL libssl', dep_libssl.found(), bool_yn: true, section: 'Crypto')

diff --git a/meson/libsystemd/meson.build b/meson/libsystemd/meson.build
index 416c4f1b5849b81d4056839a0afaffbc1e7d4394..42a005dbf9e02387e87f00b634e260c5640a6d14 100644 (file)
--- a/meson/libsystemd/meson.build
+++ b/meson/libsystemd/meson.build
@@ -1,9 +1,9 @@
 opt_systemd = get_option('systemd-service')
 
-dep_libsystemd = dependency('', required: false)
-
 if opt_systemd.allowed()
   dep_libsystemd = dependency('libsystemd', required: opt_systemd)
+else
+  dep_libsystemd = dependency('', required: false)
 endif
 
 conf.set('HAVE_SYSTEMD', dep_libsystemd.found(), description: 'libsystemd')

diff --git a/meson/systemd/meson.build b/meson/systemd/meson.build
index fe8a594d985767e6eb0bc5a603e90db07975a45f..c6afff82c6ee17c1a55befce152f0be7d89a2cac 100644 (file)
--- a/meson/systemd/meson.build
+++ b/meson/systemd/meson.build
@@ -1,9 +1,10 @@
 opt_systemd = get_option('systemd-service')
 
-dep_systemd_prog = dependency('', required: false)
 
 if opt_systemd.allowed()
   dep_systemd_prog = dependency('systemd', required: opt_systemd)
+else
+  dep_systemd_prog = dependency('', required: false)
 endif
 
 if dep_systemd_prog.found()

diff --git a/pdns/dnsdistdist/meson/re2/meson.build b/pdns/dnsdistdist/meson/re2/meson.build
index 8ef952dce239aa827d8b52516991436039102476..6b046fda3d16793a824d35a7da597951a0789cbd 100644 (file)
--- a/pdns/dnsdistdist/meson/re2/meson.build
+++ b/pdns/dnsdistdist/meson/re2/meson.build
@@ -2,10 +2,10 @@ opt_libre2 = get_option('re2')
 dep_libre2 = dependency('re2', required: opt_libre2)
 
 if dep_libre2.found()
-    # we need to NOT pick the CFLAGS because re2 "helpfully" puts -std=c++11 here
-    dep_libre2 = dep_libre2.partial_dependency(
-        link_args: true
-    )
+  # we need to NOT pick the CFLAGS because re2 "helpfully" puts -std=c++11 here
+  dep_libre2 = dep_libre2.partial_dependency(
+      link_args: true
+  )
 endif
 
 conf.set('HAVE_RE2', dep_libre2.found(), description: 're2')

diff --git a/pdns/dnsdistdist/meson_options.txt b/pdns/dnsdistdist/meson_options.txt
index 1e91d47d0c2d249a9e6a317c8cc8a033239c5dda..8f83ff2b2458a119f43455683e9ece28195f2d04 100644 (file)
--- a/pdns/dnsdistdist/meson_options.txt
+++ b/pdns/dnsdistdist/meson_options.txt
@@ -11,7 +11,6 @@ option('hardening-experimental-cf', type: 'combo', choices: ['disabled', 'full',
 option('hardening-experimental-scp', type: 'feature', value: 'disabled', description: 'Stack Clash Protection')
 option('hardening-fortify-source', type: 'combo', choices: ['auto', 'disabled', '1', '2', '3'], value: '2', description: 'Source fortification level')
 option('ipcipher', type: 'feature', value: 'auto', description: 'IPCipher')
-#option('rng-kiss', type: 'boolean', value: false, description: 'Use the unsafe KISS RNG')
 option('tls-libssl', type: 'feature', value: 'auto', description: 'OpenSSL-based TLS')
 option('tls-libssl-providers', type: 'boolean', value: false, description: 'OpenSSL-based TLS with TLS providers')
 option('dns-over-tls', type: 'boolean', value: false, description: 'DNS over TLS (requires GnuTLS or OpenSSL)')