From bd6f79a7ac93726a0ec916f8dd8c4d1ab923b733 Mon Sep 17 00:00:00 2001 From: neodiX Date: Sun, 25 Feb 2024 09:54:08 +0100 Subject: [PATCH 1/2] Clone OpenSSL using tag name instead of branch name --- mytonctrl/scripts/upgrade.sh | 3 ++- scripts/ton_installer.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mytonctrl/scripts/upgrade.sh b/mytonctrl/scripts/upgrade.sh index 44cac111..408b1cbb 100644 --- a/mytonctrl/scripts/upgrade.sh +++ b/mytonctrl/scripts/upgrade.sh @@ -50,11 +50,12 @@ fi # compile openssl_3 rm -rf ${bindir}/openssl_3 -git clone --branch openssl-3.1.4 https://github.com/openssl/openssl ${bindir}/openssl_3 +git clone https://github.com/openssl/openssl ${bindir}/openssl_3 cd ${bindir}/openssl_3 ./config make build_libs -j$(nproc) opensslPath=`pwd` +git checkout openssl-3.1.4 # Go to work dir cd ${srcdir} diff --git a/scripts/ton_installer.sh b/scripts/ton_installer.sh index 6cf9a990..9f053379 100644 --- a/scripts/ton_installer.sh +++ b/scripts/ton_installer.sh @@ -92,10 +92,10 @@ pip3 install psutil crc16 requests # build openssl 3.0 echo -e "${COLOR}[2/6]${ENDC} Building OpenSSL 3.0" rm -rf $BIN_DIR/openssl_3 -git clone --branch openssl-3.1.4 https://github.com/openssl/openssl $BIN_DIR/openssl_3 +git clone https://github.com/openssl/openssl $BIN_DIR/openssl_3 cd $BIN_DIR/openssl_3 opensslPath=`pwd` -git checkout +git checkout openssl-3.1.4 ./config make build_libs -j$(nproc) From cb83ecf6465e75fd872f0fea889a4052307cc4a9 Mon Sep 17 00:00:00 2001 From: neodiX Date: Sun, 25 Feb 2024 09:59:47 +0100 Subject: [PATCH 2/2] Clone OpenSSL using tag name instead of branch name --- mytonctrl/scripts/upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mytonctrl/scripts/upgrade.sh b/mytonctrl/scripts/upgrade.sh index 408b1cbb..b5f3c8ed 100644 --- a/mytonctrl/scripts/upgrade.sh +++ b/mytonctrl/scripts/upgrade.sh @@ -52,10 +52,10 @@ fi rm -rf ${bindir}/openssl_3 git clone https://github.com/openssl/openssl ${bindir}/openssl_3 cd ${bindir}/openssl_3 +git checkout openssl-3.1.4 ./config make build_libs -j$(nproc) opensslPath=`pwd` -git checkout openssl-3.1.4 # Go to work dir cd ${srcdir}