copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Philipp Hörist 2018-03-20 17:45:02 +01:00
parent 9c295e62c6
commit 25e123a379
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
win/_base.sh
View File

@ -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 { 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.nsi)
(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim-portable.nsi) (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" "${MISC}"/gajim-portable.nsi)

1
win/build.sh
View File

@ -17,6 +17,7 @@ function main {
install_deps install_deps
install_gajim "$GIT_TAG" install_gajim "$GIT_TAG"
cleanup_install cleanup_install
move_ssl_libs
build_installer build_installer
} }