From 91c8ecc49e76adc68e52c41d1a18a7c987faad34 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Fri, 5 Sep 2025 12:31:22 -0700 Subject: [PATCH 1/2] Fix error with openssl version handling --- scripts/utils-openssl.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/utils-openssl.sh b/scripts/utils-openssl.sh index cd3d5780..384fb8bb 100755 --- a/scripts/utils-openssl.sh +++ b/scripts/utils-openssl.sh @@ -64,7 +64,11 @@ clone_openssl() { if [ ! -d ${OPENSSL_SOURCE_DIR} ]; then printf "\tOpenSSL source directory not found: ${OPENSSL_SOURCE_DIR}\n" printf "\tParent directory:\n" - tree -L 2 $(dirname ${OPENSSL_SOURCE_DIR}/..) || true + if command -v tree >/dev/null 2>&1; then + tree -L 2 "$(dirname "${OPENSSL_SOURCE_DIR}")" || true + else + ls -R "$(dirname "${OPENSSL_SOURCE_DIR}")" || true + fi CLONE_TAG=${USE_CUR_TAG:+${OPENSSL_TAG_CUR}} CLONE_TAG=${CLONE_TAG:-${OPENSSL_TAG}} @@ -235,6 +239,7 @@ init_openssl() { OSSL_VER=`LD_LIBRARY_PATH=${OPENSSL_LIB_DIRS} $OPENSSL_BIN version | tail -n1` case $OSSL_VER in OpenSSL\ 3.*) ;; + OpenSSL\ 4.*) ;; *) echo "OpenSSL ($OPENSSL_BIN) has wrong version: $OSSL_VER" echo "Set: OPENSSL_DIR" From dbe9c832251901f736a28709d02980880b64e979 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 9 Sep 2025 10:19:35 -0700 Subject: [PATCH 2/2] Remove debug --- scripts/utils-openssl.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/utils-openssl.sh b/scripts/utils-openssl.sh index 384fb8bb..4a6adb9a 100755 --- a/scripts/utils-openssl.sh +++ b/scripts/utils-openssl.sh @@ -63,12 +63,6 @@ clone_openssl() { if [ ! -d ${OPENSSL_SOURCE_DIR} ]; then printf "\tOpenSSL source directory not found: ${OPENSSL_SOURCE_DIR}\n" - printf "\tParent directory:\n" - if command -v tree >/dev/null 2>&1; then - tree -L 2 "$(dirname "${OPENSSL_SOURCE_DIR}")" || true - else - ls -R "$(dirname "${OPENSSL_SOURCE_DIR}")" || true - fi CLONE_TAG=${USE_CUR_TAG:+${OPENSSL_TAG_CUR}} CLONE_TAG=${CLONE_TAG:-${OPENSSL_TAG}}