From 19a46070fafae21f7e4fba56476a7d03a9d7f97d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 11 Nov 2018 16:40:08 +0100
Subject: [PATCH] Windows: Remove old ssl fix
---
win/_base.sh | 13 -------------
win/build.sh | 2 --
2 files changed, 15 deletions(-)
diff --git a/win/_base.sh b/win/_base.sh
index b13e099d9f..b3e3c0c695 100644
--- a/win/_base.sh
+++ b/win/_base.sh
@@ -302,19 +302,6 @@ function cleanup_install {
}
-function download_ssl_libs {
- # Python needs these ssl libs but msys does not provide them
- curl -o "${BUILD_ROOT}"/ssl.zip https://gajim.org/downloads/snap/win/build/ssl.zip
- 7z x -o"${MINGW_ROOT}"/bin "${BUILD_ROOT}"/ssl.zip
-}
-
-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.7/lib-dynload/libeay32.dll
- cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/ssleay32.dll
-}
-
function build_installer {
(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi)
(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi)
diff --git a/win/build.sh b/win/build.sh
index 729c548e65..b77134680d 100644
--- a/win/build.sh
+++ b/win/build.sh
@@ -17,8 +17,6 @@ function main {
install_deps
install_gajim
cleanup_install
- download_ssl_libs
- move_ssl_libs
build_installer
}
--
GitLab