From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 26 Apr 2021 23:18:02 +0000 (+1000)
Subject: Fix custom OpenSSL tests.
X-Git-Tag: V_8_7_P1~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3cc9fbdff2782eca79e33e02ac22450dc63bce9;p=thirdparty%2Fopenssh-portable.git

Fix custom OpenSSL tests.

Check out specified OpenSSL version.  Install custom libcrypto where
configure expects to find it.  Remove unneeded OpenSSL config time
options.  Older OpenSSL versions were not make -j safe so remove it.
---

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 1b0c8870e..1918a4236 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -98,9 +98,10 @@ if [ ! -z "${INSTALL_OPENSSL}" ]; then
     (cd ${HOME} &&
      git clone https://github.com/openssl/openssl.git &&
      cd ${HOME}/openssl &&
-     ./config no-threads no-engine no-fips no-shared ${SSLCONFOPTS} \
-         --prefix=/opt/openssl/head &&
-     make -j2 && sudo make install_sw)
+     git checkout ${INSTALL_OPENSSL} &&
+     ./config no-threads ${SSLCONFOPTS} \
+         --prefix=/opt/openssl &&
+     make && sudo make install_sw)
 fi
 
 if [ ! -z "${INSTALL_LIBRESSL}" ]; then
@@ -109,6 +110,6 @@ if [ ! -z "${INSTALL_LIBRESSL}" ]; then
      cd ${HOME}/libressl/portable &&
      git checkout ${INSTALL_LIBRESSL} &&
      sh update.sh && sh autogen.sh &&
-     ./configure --prefix=/opt/libressl/head &&
+     ./configure --prefix=/opt/libressl &&
      make -j2 && sudo make install)
 fi