- Update patch to remove 'command' shell builtin and update error

  text.

diff --git a/doc/Changelog b/doc/Changelog
index c21e8427764edc11341ff660f4bb01388779d2fc..06d6ce2dcdc4dffdd89e1bf6daee26a056774759 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,10 @@
 
 27 May 2024: Yorgos
        - Fix unused variable warning on compilation with no thread support.
+       - unbound-control-setup: check openssl availability before doing
+         anything, patch from Michael Tokarev.
+       - Update patch to remove 'command' shell builtin and update error
+         text.
 
 24 May 2024: Wouter
        - Fix #1064: Unbound 1.20 Cachedb broken?

diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in
index 90af77b38d09762d5e521c1827dd72a7c5a77319..f74b0105afeeb74b553309e273bda8b5bd6f795d 100644 (file)
--- a/smallapp/unbound-control-setup.sh.in
+++ b/smallapp/unbound-control-setup.sh.in
@@ -104,8 +104,8 @@ while getopts 'd:hr' arg; do
 done
 shift $((OPTIND - 1))
 
-if ! command -v openssl >/dev/null; then
-    echo "$0 requires openssl package to be installed to generate the keys." >&2
+if ! openssl >/dev/null 2>&1; then
+    echo "$0 requires openssl to be installed for keys/certificates generation." >&2
     exit 1
 fi