From 95a8be3cf18cc4e7c042f5cea3252ad309db6207 Mon Sep 17 00:00:00 2001 From: "black.box (Unzoner) team@belodetek.io" Date: Sun, 3 Dec 2023 15:26:25 -0800 Subject: [PATCH] openssl openssh compat. --- unzoner/.balena/balena.yml | 4 +++- unzoner/Dockerfile.template | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/unzoner/.balena/balena.yml b/unzoner/.balena/balena.yml index bdd852d..36b5f4e 100644 --- a/unzoner/.balena/balena.yml +++ b/unzoner/.balena/balena.yml @@ -6,7 +6,9 @@ build-variables: # https://en.wikipedia.org/wiki/Bird_Internet_routing_daemon - BUILD_BIRD=0 # https://github.com/openssl/openssl - - BUILD_OPENSSL_VERSION=3.2.0 + # Setting up openssh-server (1:8.9p1-3ubuntu0.4) ... + # OpenSSL version mismatch. Built against 30000020, you have 30200000 + - BUILD_OPENSSL_VERSION=3.0.12 - BUILD_OPENSSL=1 # https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html - AARCH64_OPTIMISE_FLAGS=-O3 -mtune=cortex-a72 -march=armv8-a diff --git a/unzoner/Dockerfile.template b/unzoner/Dockerfile.template index 5fb3925..50f1f43 100644 --- a/unzoner/Dockerfile.template +++ b/unzoner/Dockerfile.template @@ -192,7 +192,8 @@ RUN [ -f /usr/local/sbin/openvpn ] || install_packages openvpn RUN [ -f /usr/local/sbin/sniproxy ] || install_packages sniproxy -RUN [ -f /usr/local/ssl/bin/openssl ] && (rm -f /usr/local/bin/openssl && ln -s /usr/local/ssl/bin/openssl /usr/local/bin/openssl) \ +RUN [ -f /usr/local/ssl/bin/openssl ] \ + && (rm -f /usr/local/bin/openssl && ln -s /usr/local/ssl/bin/openssl /usr/local/bin/openssl) \ || install_packages openssl RUN which bird || install_packages bird