Skip to content

Commit cf7b015

Browse files
authored
Updated openssl version (#107)
* Removed obsolete openssl windows binary files. * Updated manylinux dockerfile to pull openssl remotely, removed openssl manylinux file. * Migrated manylinux builds to 2010. * Removed perl binary files.
1 parent 5aa507b commit cf7b015

13 files changed

+5
-51
lines changed

ci/appveyor/openssl-1.0.2q-i386-win32.zip

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/appveyor/openssl-1.0.2q-x64_86-win64.zip

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/appveyor/openssl-1.1.0h-x32-VC2017.zip

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/Dockerfile

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
1-
FROM quay.io/pypa/manylinux1_x86_64
1+
FROM quay.io/pypa/manylinux2010_x86_64
22

3-
ENV CMAKE cmake-2.8.11.1-5.4.x86_64
4-
ENV OPENSSL openssl-1.1.1b
3+
ENV OPENSSL openssl-1.1.1g
54
ENV SYSTEM_LIBSSH2 1
65
ENV LIBSSH2_VERSION 1.9.0
76

87
RUN yum install zlib-devel -y
98

109
ADD libssh2-${LIBSSH2_VERSION}.tar.gz libssh2-${LIBSSH2_VERSION}.tar.gz
11-
ADD ${CMAKE}.rpm cmake.rpm
12-
ADD ${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
13-
ADD local-perl-5.10.0-62.ep.x86_64.rpm local-perl.rpm
14-
ADD local-perl-Pod-Simple-3.07-62.ep.x86_64.rpm local-perl-Pod-Simple.rpm
15-
ADD local-perl-Module-Pluggable-3.60-62.ep.x86_64.rpm local-perl-Module-Pluggable.rpm
16-
ADD local-perl-XSLoader-0.10-1.noarch.rpm local-perl-XSLoader.rpm
17-
ADD local-perl-version-0.74-62.ep.x86_64.rpm local-perl-version.rpm
18-
ADD local-perl-libs-5.10.0-62.ep.x86_64.rpm local-perl-libs.rpm
19-
ADD local-perl-Pod-Escapes-1.04-62.ep.x86_64.rpm local-perl-Pod-Escapes.rpm
20-
21-
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
10+
ADD https://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
2211

12+
RUN tar -xzf ${OPENSSL}.tar.gz
2313
# Openssl
24-
RUN cd ${OPENSSL}.tar.gz/${OPENSSL} && \
14+
RUN cd ${OPENSSL} && \
2515
./config --prefix=/usr --openssldir=/usr/openssl threads shared && \
2616
make -j4 && make install
2717

ci/docker/manylinux/cmake-2.8.11.1-5.4.x86_64.rpm

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/local-perl-5.10.0-62.ep.x86_64.rpm

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/local-perl-Module-Pluggable-3.60-62.ep.x86_64.rpm

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/local-perl-Pod-Escapes-1.04-62.ep.x86_64.rpm

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/local-perl-Pod-Simple-3.07-62.ep.x86_64.rpm

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/local-perl-XSLoader-0.10-1.noarch.rpm

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/local-perl-libs-5.10.0-62.ep.x86_64.rpm

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/local-perl-version-0.74-62.ep.x86_64.rpm

Lines changed: 0 additions & 3 deletions
This file was deleted.

ci/docker/manylinux/openssl-1.1.1b.tar.gz

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)