Updated manylinux wheel builds. Updated travis cfg. Updated libssh2 s…

…ubmodule upstream

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libssh2"]
 	path = libssh2
-	url = https://github.com/pkittenis/libssh2.git
+	url = https://github.com/ParallelSSH/libssh2.git

.travis.yml

@@ -143,8 +143,7 @@ jobs:
     #       on:
     #         repo: ParallelSSH/ssh2-python
     #         tags: true
-    - stage: build and deploy source and wheels
-      if: tag IS present
+    - stage: build wheels
       os: linux
       python: 3.6
       install:

ci/docker/manylinux/Dockerfile

@@ -1,29 +1,30 @@
 FROM quay.io/pypa/manylinux1_x86_64
 
-ENV CMAKE cmake-2.8.12.2-Linux-i386
-ENV OPENSSL openssl-1.0.2o
-ENV LIBSSH2 libssh2-1.8.0
+ENV CMAKE cmake-2.8.11.1-5.4.x86_64
+ENV OPENSSL openssl-1.0.2l
+ENV LIBSSH2_VER agent_fwd
 
 RUN yum install zlib-devel -y
 
-# Cmake
-RUN wget --no-check-certificate https://cmake.org/files/v2.8/${CMAKE}.tar.gz && \
-    tar -xzf ${CMAKE}.tar.gz && cp -af ${CMAKE}/share/* /usr/share/ && \
-    cp -af ${CMAKE}/bin/* /usr/bin/
+ADD https://github.com/ParallelSSH/libssh2/archive/${LIBSSH2_VER}.tar.gz libssh2.tar.gz
+ADD ${CMAKE}.rpm cmake.rpm
+ADD http://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
+
+RUN rpm -i cmake.rpm
 
 # Openssl
-RUN wget --no-check-certificate http://www.openssl.org/source/${OPENSSL}.tar.gz && \
-    tar -xzf ${OPENSSL}.tar.gz && \
+RUN tar -xzf ${OPENSSL}.tar.gz && \
     cd ${OPENSSL} && \
     ./config --prefix=/usr --openssldir=/usr/openssl threads shared && \
     make -j4 && make install
 
 # Libssh2
-RUN wget --no-check-certificate https://www.libssh2.org/download/${LIBSSH2}.tar.gz && \
-    tar -xzf ${LIBSSH2}.tar.gz
+RUN tar -xzf libssh2.tar.gz && \
+    mkdir -p build_libssh2 && cd build_libssh2 && \
+    cmake ../libssh2-${LIBSSH2_VER} -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON \
+    -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr && \
+    cmake --build . --config Release --target install
 
-RUN cd ${LIBSSH2} && cmake ../${LIBSSH2} -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON \
-    -DENABLE_CRYPT_NONE=ON -DENABLE_MAC_NONE=ON -DCMAKE_INSTALL_PREFIX=/usr \
-    && cmake --build . --config Release --target install
+RUN rm -rf ${OPENSSL}* libssh2-agent_fwd build_libssh2
 
-RUN rm -rf ${CMAKE}* ${OPENSSL}* ${LIBSSH2}*
+VOLUME /var/cache