[openssh-commits] [openssh] 01/01: Fix custom OpenSSL tests.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit b3cc9fbdff2782eca79e33e02ac22450dc63bce9
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Tue Apr 27 09:18:02 2021 +1000

    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.
---
 .github/setup_ci.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 1b0c8870..1918a423 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.