From: Yorgos Thessalonikefs <yorgos@nlnetlabs.nl>
Date: Mon, 27 May 2024 15:17:48 +0000 (+0200)
Subject: - Update patch to remove 'command' shell builtin and update error
X-Git-Tag: release-1.21.0rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fc467390181e76698f8f04b2cbab23687deea21;p=thirdparty%2Funbound.git

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

diff --git a/doc/Changelog b/doc/Changelog
index c21e84277..06d6ce2dc 100644
--- 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 90af77b38..f74b0105a 100644
--- 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