Philipp Hörist pushed to branch master at gajim / gajim
Commits:
25e123a3 by Philipp Hörist at 2018-03-20T18:25:04+01:00
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
- - - - -
2 changed files:
- win/_base.sh
- win/build.sh
Changes:
=====================================
win/_base.sh
=====================================
--- 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)
=====================================
win/build.sh
=====================================
--- 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
}
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/25e123a379040209cef56e2adda390205d7f088a
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/25e123a379040209cef56e2adda390205d7f088a
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
