Skip to content

Commit 76dc460

Browse files
author
Pan
committed
Migrated manylinux wheel builds to openssl 1.1.
Migrated Windows builds to openssl 1.1.
1 parent 86c534d commit 76dc460

16 files changed

+56
-33
lines changed

.appveyor.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ environment:
66
CMD_IN_ENV: "cmd /E:ON /V:ON /C %APPVEYOR_BUILD_FOLDER%\\ci\\appveyor\\run_with_env.cmd"
77
PYTHONUNBUFFERED: 1
88
EMBEDDED_LIB: 1
9-
OPENSSL_VER: 1.0.2q
9+
OPENSSL_VER: 1.1.0h
1010
PYPI_USER:
1111
secure: 2m0jy6JD/R9RExIosOT6YA==
1212
PYPI_PASS:
@@ -26,20 +26,6 @@ environment:
2626
ARCH: x64_86
2727
SYSTEM_LIBSSH2: 1
2828

29-
- PYTHON: "C:\\Python34"
30-
PYTHON_VERSION: "3.4"
31-
PYTHON_ARCH: "32"
32-
MSVC: "Visual Studio 10"
33-
ARCH: i386
34-
SYSTEM_LIBSSH2: 1
35-
36-
- PYTHON: "C:\\Python34-x64"
37-
PYTHON_VERSION: "3.4"
38-
PYTHON_ARCH: "64"
39-
MSVC: "Visual Studio 10 Win64"
40-
ARCH: x64_86
41-
SYSTEM_LIBSSH2: 1
42-
4329
- PYTHON: "C:\\Python35"
4430
PYTHON_VERSION: "3.5"
4531
PYTHON_ARCH: "32"
@@ -123,9 +109,9 @@ install:
123109
- python ci/appveyor/fix_version.py .
124110
- mv -f .git .git.bak
125111
- 7z x ci\appveyor\zlib1211.zip
126-
- 7z x ci\appveyor\openssl-%OPENSSL_VER%-%ARCH%-win%PYTHON_ARCH%.zip
127-
- cp ssleay32.dll ssh2\
128-
- cp libeay32.dll ssh2\
112+
- 7z x ci\appveyor\openssl-%OPENSSL_VER%-x%PYTHON_ARCH%-VC2017.zip
113+
- cp openssl-%OPENSSL_VER%-x%PYTHON_ARCH%-VC2017\libssl-1_1-x%PYTHON_ARCH%.dll ssh2\ || cp openssl-%OPENSSL_VER%-x%PYTHON_ARCH%-VC2017\libssl-1_1.dll ssh2\
114+
- cp openssl-%OPENSSL_VER%-x%PYTHON_ARCH%-VC2017\libcrypto-1_1-x%PYTHON_ARCH%.dll ssh2\ || cp openssl-%OPENSSL_VER%-x%PYTHON_ARCH%-VC2017\libcrypto-1_1.dll ssh2\
129115
- ps: ls ssh2
130116
build_script:
131117
- "%CMD_IN_ENV% ci\\appveyor\\build_zlib.bat"

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ openssl-1.0.2q-i386-win32.zip filter=lfs diff=lfs merge=lfs -text
22
openssl-1.0.2q-x64_86-win64.zip filter=lfs diff=lfs merge=lfs -text
33
zlib1211.zip filter=lfs diff=lfs merge=lfs -text
44
*.tar.gz filter=lfs diff=lfs merge=lfs -text
5+
*.zip filter=lfs diff=lfs merge=lfs -text
6+
*.rpm filter=lfs diff=lfs merge=lfs -text

ci/appveyor/build_ssh2.bat

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ mkdir src
22
cd src
33

44
IF "%PYTHON_ARCH%" == "32" (
5-
set OPENSSL_DIR="C:\OpenSSL-Win32"
5+
set OPENSSL_DIR="C:\OpenSSL-v11-Win32"
66
) ELSE (
7-
set OPENSSL_DIR="C:\OpenSSL-Win64"
7+
set OPENSSL_DIR="C:\OpenSSL-v11-Win64"
88
)
99

1010
ls %OPENSSL_DIR%\lib
@@ -42,10 +42,9 @@ REM -DOPENSSL_MSVC_STATIC_RT=TRUE
4242
REM -DOPENSSL_USE_STATIC_LIBS=TRUE
4343
)
4444

45-
cp %OPENSSL_DIR%\lib\VC\libeay32MD.lib %APPVEYOR_BUILD_FOLDER%
46-
cp %OPENSSL_DIR%\lib\VC\ssleay32MD.lib %APPVEYOR_BUILD_FOLDER%
47-
REM cp %OPENSSL_DIR%\libeay32.dll %APPVEYOR_BUILD_FOLDER%\ssh2\
48-
REM cp %OPENSSL_DIR%\ssleay32.dll %APPVEYOR_BUILD_FOLDER%\ssh2\
45+
46+
cp %OPENSSL_DIR%\lib\VC\libcrypto%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
47+
cp %OPENSSL_DIR%\lib\VC\libssl%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
4948

5049
cmake --build . --config Release
5150
cd ..
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:3ce4b05192d1b62efb529e8c51da0bce26614c8cde47a3e397fd1c19b2403eb1
3+
size 1695059
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:c3592481c530ec3a74cf9e3f436a629ad50eeb820173482782e7bfee0bebc69f
3+
size 1806520

ci/docker/manylinux/Dockerfile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
FROM quay.io/pypa/manylinux1_x86_64
22

33
ENV CMAKE cmake-2.8.11.1-5.4.x86_64
4-
ENV OPENSSL openssl-1.0.2p
4+
ENV OPENSSL openssl-1.1.1b
55
ENV SYSTEM_LIBSSH2 1
66

77
RUN yum install zlib-devel -y
88

99
ADD libssh2.tar.gz libssh2.tar.gz
1010
ADD ${CMAKE}.rpm cmake.rpm
11-
ADD http://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
11+
ADD ${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
12+
ADD local-perl-5.10.0-62.ep.x86_64.rpm local-perl.rpm
13+
ADD local-perl-Pod-Simple-3.07-62.ep.x86_64.rpm local-perl-Pod-Simple.rpm
14+
ADD local-perl-Module-Pluggable-3.60-62.ep.x86_64.rpm local-perl-Module-Pluggable.rpm
15+
ADD local-perl-XSLoader-0.10-1.noarch.rpm local-perl-XSLoader.rpm
16+
ADD local-perl-version-0.74-62.ep.x86_64.rpm local-perl-version.rpm
17+
ADD local-perl-libs-5.10.0-62.ep.x86_64.rpm local-perl-libs.rpm
18+
ADD local-perl-Pod-Escapes-1.04-62.ep.x86_64.rpm local-perl-Pod-Escapes.rpm
1219

13-
RUN rpm -i cmake.rpm
20+
RUN rpm -i cmake.rpm local-perl-Module-Pluggable.rpm local-perl-Pod-Escapes.rpm local-perl-Pod-Simple.rpm local-perl-XSLoader.rpm local-perl-version.rpm local-perl-libs.rpm local-perl.rpm
1421

1522
# Openssl
16-
RUN tar -xzf ${OPENSSL}.tar.gz && \
17-
cd ${OPENSSL} && \
23+
RUN cd ${OPENSSL}.tar.gz/${OPENSSL} && \
1824
./config --prefix=/usr --openssldir=/usr/openssl threads shared && \
1925
make -j4 && make install
2026

@@ -24,6 +30,6 @@ RUN mkdir -p build_libssh2 && cd build_libssh2 && \
2430
-DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr && \
2531
cmake --build . --config Release --target install
2632

27-
RUN rm -rf ${OPENSSL}* build_libssh2
33+
RUN rm -rf ${OPENSSL}* build_libssh2 libssh2.tar.gz
2834

2935
VOLUME /var/cache
-10.8 MB
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:331fd97d8cdac348c87b10534c9b28481a443906cd2643ec8743bddc1fc4ddf0
3+
size 15328393
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:e6f670fd4cd7c545bd75617e5ac0d7b79796d3ab8f85a6a39bf89c4e585135de
3+
size 22167
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:e14f8cc8c6d13b1e9d66ba9ea09b9b0b431750f28111010e00366dd19edbc0fe
3+
size 20219

0 commit comments

Comments
 (0)