Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
update inc/nginx_configure.inc libressl & openssl nginx routines
account for differences in gitlab vs github downloaded tar.gz files for their respectively extracted top level directory names as outlined at https://community.centminmod.com/posts/28587/
  • Loading branch information
centminmod committed Mar 11, 2016
1 parent a62b6c4 commit a1ab492
Showing 1 changed file with 21 additions and 7 deletions.
28 changes: 21 additions & 7 deletions inc/nginx_configure.inc
Expand Up @@ -307,19 +307,22 @@ if [[ "$CENTOSVER" = '6.0' || "$CENTOSVER" = '6.1' || "$CENTOSVER" = '6.2' || "$
fi

if [[ "$LIBRESSL_SWITCH" = [yY] ]]; then
LIBRESSLOPT=" --with-openssl=../libressl-${LIBRESSL_VERSION}"
LIBRESSLDIR=$(tar -tzf "$DIR_TMP/${LIBRESSL_LINKFILE}" | head -1 | cut -f1 -d"/")
LIBRESSLOPT=" --with-openssl=../$LIBRESSLDIR"
OPENSSLOPT=""
LRT='-lrt '
else
if [ "$NOSOURCEOPENSSL" == 'n' ]; then
OPENSSLDIR=$(tar -tzf "$DIR_TMP/${OPENSSL_LINKFILE}" | head -1 | cut -f1 -d"/")
LIBRESSLOPT=""
OPENSSLOPT=" --with-openssl=../openssl-${OPENSSL_VERSION}"
OPENSSLOPT=" --with-openssl=../$OPENSSLDIR"
LRT=""
else
OPENSSLDIR=$(tar -tzf "$DIR_TMP/${OPENSSL_LINKFILE}" | head -1 | cut -f1 -d"/")
export BPATH=$DIR_TMP
export STATICLIBSSL="${BPATH}/staticlibssl"
LIBRESSLOPT=""
OPENSSLOPT=" --with-openssl=../openssl-${OPENSSL_VERSION}"
OPENSSLOPT=" --with-openssl=../$OPENSSLDIR"
LRT=""
fi
fi
Expand Down Expand Up @@ -750,13 +753,24 @@ else
fi

if [[ "$LIBRESSL_SWITCH" = [yY] ]]; then
LIBRESSLOPT=" --with-openssl=../libressl-${LIBRESSL_VERSION}"
LIBRESSLDIR=$(tar -tzf "$DIR_TMP/${LIBRESSL_LINKFILE}" | head -1 | cut -f1 -d"/")
LIBRESSLOPT=" --with-openssl=../$LIBRESSLDIR"
OPENSSLOPT=""
LRT='-lrt '
else
LIBRESSLOPT=""
OPENSSLOPT=" --with-openssl=../openssl-${OPENSSL_VERSION}"
LRT=""
if [ "$NOSOURCEOPENSSL" == 'n' ]; then
OPENSSLDIR=$(tar -tzf "$DIR_TMP/${OPENSSL_LINKFILE}" | head -1 | cut -f1 -d"/")
LIBRESSLOPT=""
OPENSSLOPT=" --with-openssl=../$OPENSSLDIR"
LRT=""
else
OPENSSLDIR=$(tar -tzf "$DIR_TMP/${OPENSSL_LINKFILE}" | head -1 | cut -f1 -d"/")
export BPATH=$DIR_TMP
export STATICLIBSSL="${BPATH}/staticlibssl"
LIBRESSLOPT=""
OPENSSLOPT=" --with-openssl=../$OPENSSLDIR"
LRT=""
fi
fi

if [[ "$NGINX_SPDY" = [yY] ]]; then
Expand Down

0 comments on commit a1ab492

Please sign in to comment.