diff options
| author | Philipp Hörist <philipp@hoerist.com> | 2018-03-20 19:45:02 +0300 |
|---|---|---|
| committer | Philipp Hörist <philipp@hoerist.com> | 2018-03-20 20:25:04 +0300 |
| commit | 25e123a379040209cef56e2adda390205d7f088a (patch) | |
| tree | 3536885a14c7998d041b7d1d9c682e22fabc4c5d /win | |
| parent | 9c295e62c631dfffcfa0a468ac187164fd4b9f18 (diff) | |
Windows Build: Move ssl libs to correct dir
Python searches in lib-dynload and if not found it searches in
C:/Windows/system32 which can contain dlls with an invalid version
Fixes #8905
Diffstat (limited to 'win')
| -rw-r--r-- | win/_base.sh | 8 | ||||
| -rw-r--r-- | win/build.sh | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/win/_base.sh b/win/_base.sh index d3cd64a57..f536ddc2f 100644 --- a/win/_base.sh +++ b/win/_base.sh @@ -293,6 +293,14 @@ function cleanup_install { } +function move_ssl_libs { + # Pythons ssl module searches in that path for these dlls, if they are not there + # C:/Windows/system32 is searcherd and potentially wrong versioned dlls are found there + cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.6/lib-dynload/libeay32.dll + cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.6/lib-dynload/ssleay32.dll + +} + function build_installer { (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim.nsi) (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim-portable.nsi) diff --git a/win/build.sh b/win/build.sh index 3b1dad392..6ff624e43 100644 --- a/win/build.sh +++ b/win/build.sh @@ -17,6 +17,7 @@ function main { install_deps install_gajim "$GIT_TAG" cleanup_install + move_ssl_libs build_installer } |