Migrated manylinux wheel builds to openssl 1.1.

Pan · Pan · commit 76dc46039431 · 2019-03-06T18:19:33.000Z
Migrated Windows builds to openssl 1.1.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,7 +6,7 @@ environment:
     CMD_IN_ENV: "cmd /E:ON /V:ON /C %APPVEYOR_BUILD_FOLDER%\\ci\\appveyor\\run_with_env.cmd"
     PYTHONUNBUFFERED: 1
     EMBEDDED_LIB: 1
-    OPENSSL_VER: 1.0.2q
+    OPENSSL_VER: 1.1.0h
     PYPI_USER:
       secure: 2m0jy6JD/R9RExIosOT6YA==
     PYPI_PASS:
@@ -26,20 +26,6 @@ environment:
       ARCH: x64_86
       SYSTEM_LIBSSH2: 1
 
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "32"
-      MSVC: "Visual Studio 10"
-      ARCH: i386
-      SYSTEM_LIBSSH2: 1
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4"
-      PYTHON_ARCH: "64"
-      MSVC: "Visual Studio 10 Win64"
-      ARCH: x64_86
-      SYSTEM_LIBSSH2: 1
-
     - PYTHON: "C:\\Python35"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "32"
@@ -123,9 +109,9 @@ install:
   - python ci/appveyor/fix_version.py .
   - mv -f .git .git.bak
   - 7z x ci\appveyor\zlib1211.zip
-  - 7z x ci\appveyor\openssl-%OPENSSL_VER%-%ARCH%-win%PYTHON_ARCH%.zip
-  - cp ssleay32.dll ssh2\
-  - cp libeay32.dll ssh2\
+  - 7z x ci\appveyor\openssl-%OPENSSL_VER%-x%PYTHON_ARCH%-VC2017.zip
+  - 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\
+  - 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\
   - ps: ls ssh2
 build_script:
   - "%CMD_IN_ENV% ci\\appveyor\\build_zlib.bat"
diff --git a/.gitattributes b/.gitattributes
@@ -2,3 +2,5 @@ openssl-1.0.2q-i386-win32.zip filter=lfs diff=lfs merge=lfs -text
 openssl-1.0.2q-x64_86-win64.zip filter=lfs diff=lfs merge=lfs -text
 zlib1211.zip filter=lfs diff=lfs merge=lfs -text
 *.tar.gz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
diff --git a/ci/appveyor/build_ssh2.bat b/ci/appveyor/build_ssh2.bat
@@ -2,9 +2,9 @@ mkdir src
 cd src
 
 IF "%PYTHON_ARCH%" == "32" (
-  set OPENSSL_DIR="C:\OpenSSL-Win32"
+  set OPENSSL_DIR="C:\OpenSSL-v11-Win32"
 ) ELSE (
-  set OPENSSL_DIR="C:\OpenSSL-Win64"
+  set OPENSSL_DIR="C:\OpenSSL-v11-Win64"
 )
 
 ls %OPENSSL_DIR%\lib
@@ -42,10 +42,9 @@ REM	 -DOPENSSL_MSVC_STATIC_RT=TRUE
 REM	 -DOPENSSL_USE_STATIC_LIBS=TRUE
 )
 
-cp %OPENSSL_DIR%\lib\VC\libeay32MD.lib %APPVEYOR_BUILD_FOLDER%
-cp %OPENSSL_DIR%\lib\VC\ssleay32MD.lib %APPVEYOR_BUILD_FOLDER%
-REM cp %OPENSSL_DIR%\libeay32.dll %APPVEYOR_BUILD_FOLDER%\ssh2\
-REM cp %OPENSSL_DIR%\ssleay32.dll %APPVEYOR_BUILD_FOLDER%\ssh2\
+
+cp %OPENSSL_DIR%\lib\VC\libcrypto%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\libssl%PYTHON_ARCH%MD.lib %APPVEYOR_BUILD_FOLDER%
 
 cmake --build . --config Release
 cd ..
diff --git a/ci/appveyor/openssl-1.1.0h-x32-VC2017.zip b/ci/appveyor/openssl-1.1.0h-x32-VC2017.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ce4b05192d1b62efb529e8c51da0bce26614c8cde47a3e397fd1c19b2403eb1
+size 1695059
diff --git a/ci/appveyor/openssl-1.1.0h-x64-VC2017.zip b/ci/appveyor/openssl-1.1.0h-x64-VC2017.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3592481c530ec3a74cf9e3f436a629ad50eeb820173482782e7bfee0bebc69f
+size 1806520
diff --git a/ci/docker/manylinux/Dockerfile b/ci/docker/manylinux/Dockerfile
@@ -1,20 +1,26 @@
 FROM quay.io/pypa/manylinux1_x86_64
 
 ENV CMAKE cmake-2.8.11.1-5.4.x86_64
-ENV OPENSSL openssl-1.0.2p
+ENV OPENSSL openssl-1.1.1b
 ENV SYSTEM_LIBSSH2 1
 
 RUN yum install zlib-devel -y
 
 ADD libssh2.tar.gz libssh2.tar.gz
 ADD ${CMAKE}.rpm cmake.rpm
-ADD http://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
+ADD ${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
+ADD local-perl-5.10.0-62.ep.x86_64.rpm local-perl.rpm
+ADD local-perl-Pod-Simple-3.07-62.ep.x86_64.rpm local-perl-Pod-Simple.rpm
+ADD local-perl-Module-Pluggable-3.60-62.ep.x86_64.rpm local-perl-Module-Pluggable.rpm
+ADD local-perl-XSLoader-0.10-1.noarch.rpm local-perl-XSLoader.rpm
+ADD local-perl-version-0.74-62.ep.x86_64.rpm local-perl-version.rpm
+ADD local-perl-libs-5.10.0-62.ep.x86_64.rpm local-perl-libs.rpm
+ADD local-perl-Pod-Escapes-1.04-62.ep.x86_64.rpm local-perl-Pod-Escapes.rpm
 
-RUN rpm -i cmake.rpm
+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
 
 # Openssl
-RUN tar -xzf ${OPENSSL}.tar.gz && \
-    cd ${OPENSSL} && \
+RUN cd ${OPENSSL}.tar.gz/${OPENSSL} && \
     ./config --prefix=/usr --openssldir=/usr/openssl threads shared && \
     make -j4 && make install
 
@@ -24,6 +30,6 @@ RUN mkdir -p build_libssh2 && cd build_libssh2 && \
     -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr && \
     cmake --build . --config Release --target install
 
-RUN rm -rf ${OPENSSL}* build_libssh2
+RUN rm -rf ${OPENSSL}* build_libssh2 libssh2.tar.gz
 
 VOLUME /var/cache
diff --git a/ci/docker/manylinux/cmake-2.8.11.1-5.4.x86_64.rpm b/ci/docker/manylinux/cmake-2.8.11.1-5.4.x86_64.rpm
diff --git a/ci/docker/manylinux/local-perl-5.10.0-62.ep.x86_64.rpm b/ci/docker/manylinux/local-perl-5.10.0-62.ep.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:331fd97d8cdac348c87b10534c9b28481a443906cd2643ec8743bddc1fc4ddf0
+size 15328393
diff --git a/ci/docker/manylinux/local-perl-Module-Pluggable-3.60-62.ep.x86_64.rpm b/ci/docker/manylinux/local-perl-Module-Pluggable-3.60-62.ep.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6f670fd4cd7c545bd75617e5ac0d7b79796d3ab8f85a6a39bf89c4e585135de
+size 22167
diff --git a/ci/docker/manylinux/local-perl-Pod-Escapes-1.04-62.ep.x86_64.rpm b/ci/docker/manylinux/local-perl-Pod-Escapes-1.04-62.ep.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e14f8cc8c6d13b1e9d66ba9ea09b9b0b431750f28111010e00366dd19edbc0fe
+size 20219
diff --git a/ci/docker/manylinux/local-perl-Pod-Simple-3.07-62.ep.x86_64.rpm b/ci/docker/manylinux/local-perl-Pod-Simple-3.07-62.ep.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:192e4eea2cc51f4640f9b2279e0caea948c7971386e27719555456278c16fdca
+size 156291
diff --git a/ci/docker/manylinux/local-perl-XSLoader-0.10-1.noarch.rpm b/ci/docker/manylinux/local-perl-XSLoader-0.10-1.noarch.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74c6452fcbf48351911aa60e6b109b5ac8caaff77c491c64310bb5e9cf43173e
+size 13149
diff --git a/ci/docker/manylinux/local-perl-libs-5.10.0-62.ep.x86_64.rpm b/ci/docker/manylinux/local-perl-libs-5.10.0-62.ep.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90473006df6d55414c4b5410a6cd25321d25800140dcde98d5451b9dcfc05d37
+size 1608544
diff --git a/ci/docker/manylinux/local-perl-version-0.74-62.ep.x86_64.rpm b/ci/docker/manylinux/local-perl-version-0.74-62.ep.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a94a9b24c0e87e9522315b78bed2c0aa194ccccf76926e3597d37b7e36dce714
+size 24947
diff --git a/ci/docker/manylinux/openssl-1.1.1b.tar.gz b/ci/docker/manylinux/openssl-1.1.1b.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b
+size 8213737
diff --git a/setup.py b/setup.py
@@ -39,9 +39,10 @@
 
 ext = 'pyx' if USING_CYTHON else 'c'
 sources = glob('ssh2/*.%s' % (ext,))
+_arch = platform.architecture()[0][0:2]
 _libs = ['ssh2'] if not ON_WINDOWS else [
     'Ws2_32', 'libssh2', 'user32',
-    'libeay32MD', 'ssleay32MD',
+    'libcrypto%sMD' % _arch, 'libssl%sMD' % _arch,
     'zlibstatic',
 ]
 
@@ -88,7 +89,7 @@
 
 if ON_WINDOWS:
     package_data['ssh2'].extend([
-        'libeay32.dll', 'ssleay32.dll',
+        'libcrypto*.dll', 'libssl*.dll',
     ])
 
 cmdclass = versioneer.get_cmdclass()
@@ -122,7 +123,6 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:3ce4b05192d1b62efb529e8c51da0bce26614c8cde47a3e397fd1c19b2403eb1`
	`3`	`+size 1695059`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:c3592481c530ec3a74cf9e3f436a629ad50eeb820173482782e7bfee0bebc69f`
	`3`	`+size 1806520`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:331fd97d8cdac348c87b10534c9b28481a443906cd2643ec8743bddc1fc4ddf0`
	`3`	`+size 15328393`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:e6f670fd4cd7c545bd75617e5ac0d7b79796d3ab8f85a6a39bf89c4e585135de`
	`3`	`+size 22167`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:e14f8cc8c6d13b1e9d66ba9ea09b9b0b431750f28111010e00366dd19edbc0fe`
	`3`	`+size 20219`