Skip to content

Commit a9df63d

Browse files
committed
1 parent b176ac1 commit a9df63d

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

_versions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export LIBPSL_VER_='0.21.5'
2626
export LIBPSL_HASH=1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208
2727
export LIBSSH_VER_='0.11.1'
2828
export LIBSSH_HASH=14b7dcc72e91e08151c58b981a7b570ab2663f630e7d2837645d5a9c612c1b79
29-
export LIBSSH2_VER_='1.11.0'
30-
export LIBSSH2_HASH=a488a22625296342ddae862de1d59633e6d446eff8417398e06674a49be3d7c2
29+
export LIBSSH2_VER_='1.11.1'
30+
export LIBSSH2_HASH=9954cb54c4f548198a7cbebad248bdc87dd64bd26185708a294b2b50771e3769
3131
export LIBSSH2_CPPFLAGS='-DLIBSSH2_NO_BLOWFISH -DLIBSSH2_NO_RC4 -DLIBSSH2_NO_HMAC_RIPEMD -DLIBSSH2_NO_CAST -DLIBSSH2_NO_3DES -DLIBSSH2_NO_MD5'
3232
export NGHTTP2_VER_='1.63.0'
3333
export NGHTTP2_HASH=4879c75dd32a74421b9857924449460b8341796c0613ba114ab2188e4622354b

libssh2.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,11 @@ _VER="$1"
3434
if [ "${_OS}" = 'win' ]; then
3535
# Silence useless libssh2 warning about missing runtime DLL
3636
touch "${_TOP}/${_OPENSSL}/${_PP}/crypto.dll"
37-
if [ "${LIBSSH2_VER_}" = '1.11.0' ]; then
38-
touch "${_TOP}/${_OPENSSL}/${_PP}/ssl.dll"
39-
fi
4037
fi
4138
elif [ "${_OS}" = 'win' ]; then
4239
options+=' -DCRYPTO_BACKEND=WinCNG'
4340
fi
4441

45-
if [ "${LIBSSH2_VER_}" != '1.11.0' ]; then
46-
options+=' -DLIBSSH2_NO_DEPRECATED=ON'
47-
fi
48-
4942
if [[ "${_CONFIG}" != *'nounity'* ]]; then
5043
options+=' -DCMAKE_UNITY_BUILD=ON'
5144
fi
@@ -54,17 +47,14 @@ _VER="$1"
5447
options+=' -DHIDE_SYMBOLS=OFF'
5548
fi
5649

57-
if [ "${LIBSSH2_VER_}" = '1.11.0' ]; then
58-
LIBSSH2_CPPFLAGS+=' -DLIBSSH2_NO_DSA'
59-
fi
60-
6150
if [ "${CW_DEV_INCREMENTAL:-}" != '1' ] || [ ! -d "${_BLDDIR}" ]; then
6251
# shellcheck disable=SC2086
6352
cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${options} \
6453
'-DBUILD_SHARED_LIBS=OFF' \
6554
'-DBUILD_EXAMPLES=OFF' \
6655
'-DBUILD_TESTING=OFF' \
6756
'-DENABLE_DEBUG_LOGGING=OFF' \
57+
'-DLIBSSH2_NO_DEPRECATED=ON' \
6858
"-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${LIBSSH2_CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" # --debug-trycompile
6959
fi
7060

0 commit comments

Comments
 (0)