Added static bundled libssh2 source code.

 Updated setup.py to build bundled libssh2 automatically.
 Added libssh2 python build script for use in sdist builds.
 Removed libssh2 submodule.
 Updated manylinux docker file.
 Updated sdist manifest.
 Updated setup.py
 Updated travis and appveyor cfgs.
Re-generated C sources with cython 0.29
Added session.sock public attribute for socket session.
Updated CI OSX scripts.
Updated changelog.
Resolves #43. Resolves #37.

Author: Pan

.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.2l
+    OPENSSL_VER: 1.0.2p
     PYPI_USER:
       secure: 2m0jy6JD/R9RExIosOT6YA==
     PYPI_PASS:
@@ -17,60 +17,70 @@ environment:
       PYTHON_ARCH: "32"
       MSVC: "Visual Studio 9"
       ARCH: i386
+      SYSTEM_LIBSSH2: 1
 
     - PYTHON: "C:\\Python27-x64"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "64"
       MSVC: "Visual Studio 9"
       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"
       MSVC: "Visual Studio 14"
       ARCH: i386
+      SYSTEM_LIBSSH2: 1
 
     - PYTHON: "C:\\Python35-x64"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "64"
       MSVC: "Visual Studio 14 Win64"
       ARCH: x64_86
+      SYSTEM_LIBSSH2: 1
 
     - PYTHON: "C:\\Python36"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
       MSVC: "Visual Studio 14"
       ARCH: i386
+      SYSTEM_LIBSSH2: 1
 
     - PYTHON: "C:\\Python36-x64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       MSVC: "Visual Studio 14 Win64"
       ARCH: x64_86
+      SYSTEM_LIBSSH2: 1
 
     - PYTHON: "C:\\Python37"
       PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "32"
       MSVC: "Visual Studio 14"
       ARCH: i386
+      SYSTEM_LIBSSH2: 1
 
     - PYTHON: "C:\\Python37-x64"
       PYTHON_VERSION: "3.7"
       PYTHON_ARCH: "64"
       MSVC: "Visual Studio 14 Win64"
       ARCH: x64_86
+      SYSTEM_LIBSSH2: 1
 
 install:
   # If there is a newer build queued for the same PR, cancel this one.
@@ -119,20 +129,22 @@ install:
   - cp ssleay32.dll ssh2\
   - cp libeay32.dll ssh2\
   - ps: ls ssh2
-
 build_script:
   - "%CMD_IN_ENV% ci\\appveyor\\build_zlib.bat"
   - "%CMD_IN_ENV% ci\\appveyor\\build_ssh2.bat"
   - rm -f ssh2/*.c
+  - "%CMD_IN_ENV% python setup.py build_ext -I libssh2/include"
   - "%CMD_IN_ENV% python setup.py build"
-  - "%CMD_IN_ENV% python setup.py build_ext -i"
+  - "%CMD_IN_ENV% python setup.py install"
 
 test_script:
+  - cd dist
   - python -c "from ssh2.session import Session; Session()"
+  - cd ..
 
 after_test:
   # If tests are successful, create binary packages for the project.
-  - "%CMD_IN_ENV% python setup.py bdist_wheel"
+  - "%CMD_IN_ENV% python setup.py bdist_wheel "
   - mv dist/* .
 
 artifacts:

.gitmodules

@@ -10,7 +10,6 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - pypy
 addons:
   apt:
     packages:
@@ -20,15 +19,14 @@ addons:
       - cmake
 install:
   - pip install flake8 jinja2 sphinx sphinx_rtd_theme
-  - sudo ci/install-ssh2.sh
   - python setup.py build_ext --inplace
   - eval "$(ssh-agent -s)"
 script:
   - export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu
   - nosetests
   - flake8 ssh2
   - python setup.py sdist
-  - cd dist; pip install *; cd ..
+  - cd dist && pip install * && cd ..
   - cd doc; make html; cd ..
 jobs:
   include:
@@ -39,9 +37,10 @@ jobs:
       osx_image: xcode8.3
       env:
         - PYENV: 3.6.4
+        - SYSTEM_LIBSSH2: 1
       before_install:
         - brew update
-        - brew outdated openssl || brew upgrade openssl
+        - brew outdated openssl || brew upgrade openssl || echo "y"
         - brew link --overwrite python@2 || brew install python@2 || brew link --overwrite python@2
         - which python2
         - python2 -c "from __future__ import print_function; import ssl; from platform import python_version; print(ssl.OPENSSL_VERSION); print(python_version())"
@@ -65,7 +64,7 @@ jobs:
         - python -c "from ssh2.session import Session; Session()"
         - cd ..; pwd
         - mv -f *.whl wheels/
-        - ./ci/travis/pyenv-wheel.sh
+        - travis_wait ./ci/travis/pyenv-wheel.sh
       after_success:
         - if [[ ! -z "$TRAVIS_TAG" ]]; then
               twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheels/*.whl;
@@ -80,9 +79,10 @@ jobs:
       osx_image: xcode6.4
       env:
         - PYENV: 3.7.0
+        - SYSTEM_LIBSSH2: 1
       install: skip
       script:
-        - ./ci/travis/pyenv-wheel.sh
+        - travis_wait ./ci/travis/pyenv-wheel.sh
 
     - <<: *osx-wheels
       osx_image: xcode8
@@ -94,25 +94,28 @@ jobs:
       osx_image: xcode8
       env:
         - PYENV: 3.7.0
+        - SYSTEM_LIBSSH2: 1
       install: skip
       script:
-        - ./ci/travis/pyenv-wheel.sh
+        - travis_wait ./ci/travis/pyenv-wheel.sh
 
     - <<: *osx-wheels
       osx_image: xcode8.3
       env:
         - PYENV: 3.7.0
+        - SYSTEM_LIBSSH2: 1
       install: skip
       script:
-        - ./ci/travis/pyenv-wheel.sh
+        - travis_wait ./ci/travis/pyenv-wheel.sh
 
     - <<: *osx-wheels
       osx_image: xcode9.3
       env:
         - PYENV: 3.7.0
+        - SYSTEM_LIBSSH2: 1
       install: skip
       script:
-        - ./ci/travis/pyenv-wheel.sh
+        - travis_wait ./ci/travis/pyenv-wheel.sh
 
     - stage: build packages
       env:

.travis.yml

@@ -1,6 +1,19 @@
 Change Log
 =============
 
+0.16.0
++++++++
+
+Changes
+--------
+
+* Added ``Session.sock`` public attribute for getting socket used by ``Session``.
+* Source distribution default ``libssh2`` build target updated to upstream ``libssh2`` master branch.
+* Added bundled libssh2 source code for current master branch to repository and source distribution.
+* Added automatic build of bundled libssh2 code for source builds and ``SYSTEM_LIBSSH2`` environment variable to control building and linking against system provided libssh2. This will require additional steps for Windows platforms and older libssh2 versions - see documentation.
+* Updated binary wheels for all platforms to latest libssh2.
+
+
 0.15.0
 +++++++
 

Changelog.rst

@@ -1,4 +1,6 @@
+recursive-include libssh2 *
 recursive-exclude docker *
+include _setup_libssh2.py
 include versioneer.py
 include ssh2/_version.py
 exclude .travis.yml

MANIFEST.in

@@ -0,0 +1,29 @@
+import os
+
+from sys import stderr
+from subprocess import check_call
+from glob import glob
+from shutil import copy2
+from multiprocessing import cpu_count
+
+
+def build_ssh2():
+    if bool(os.environ.get('SYSTEM_LIBSSH', False)):
+        stderr.write("Using system libssh2..%s" % (os.sep))
+        return
+    if os.path.exists('/usr/local/opt/openssl'):
+        os.environ['OPENSSL_ROOT_DIR'] = '/usr/local/opt/openssl'
+
+    if not os.path.exists('src'):
+        os.mkdir('src')
+
+    os.chdir('src')
+    check_call('cmake ../libssh2 -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_ZLIB_COMPRESSION=ON -DENABLE_CRYPT_NONE=ON \
+    -DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL',
+               shell=True, env=os.environ)
+    check_call('cmake --build . --config Release', shell=True, env=os.environ)
+    os.chdir('..')
+
+    for src in glob('src/src/libssh2.so*'):
+        copy2(src, 'ssh2/')

_setup_libssh2.py

@@ -10,7 +10,7 @@ for x in `ls -1d ci/docker/{fedora,centos}*`; do
 	dist="el${dist_num}"
     fi
     docker pull $docker_tag || echo
-    docker build --cache-from $docker_tag $x -t $name
+    docker build --pull --cache-from $docker_tag $x -t $name
     docker tag $name $docker_tag
     # docker push $docker_tag
     sudo rm -rf build dist
@@ -26,7 +26,7 @@ for x in `ls -1d ci/docker/{debian,ubuntu}*`; do
     name=`echo "$x" | awk -F/ '{print $3}' | awk -F. '{print $1}'`
     docker_tag="parallelssh/ssh2-python:$name"
     docker pull $docker_tag || echo
-    docker build --cache-from $docker_tag $x -t $name
+    docker build --pull --cache-from $docker_tag $x -t $name
     docker tag $name $docker_tag
     # docker push $docker_tag
     sudo rm -rf build dist

ci/docker/build-packages.sh

@@ -5,3 +5,4 @@ RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f
 
 ENV EMBEDDED_LIB 0
 ENV HAVE_AGENT_FWD 0
+ENV SYSTEM_LIBSSH2 1

ci/docker/centos7/Dockerfile

@@ -5,5 +5,6 @@ RUN pip install -U setuptools
 RUN pip install -U pip wheel
 RUN pip install cython
 
-ENV EMBEDDED_LIB 1
+ENV EMBEDDED_LIB 0
 ENV HAVE_AGENT_FWD 0
+ENV SYSTEM_LIBSSH2 1

ci/docker/debian8/Dockerfile

@@ -1,7 +1,8 @@
 FROM cdrx/fpm-fedora:22
 
-RUN yum -y install libssh2-devel python-devel python-setuptools git
+RUN dnf -y install libssh2-devel python-devel python-setuptools git
 RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py && pip install -U setuptools wheel && pip install cython
 
 ENV EMBEDDED_LIB 0
 ENV HAVE_AGENT_FWD 0
+ENV SYSTEM_LIBSSH2 1

ci/docker/fedora22/Dockerfile

@@ -1,7 +1,8 @@
 FROM cdrx/fpm-fedora:23
 
-RUN yum -y install libssh2-devel python-devel python-setuptools git
+RUN dnf -y install libssh2-devel python-devel python-setuptools git
 RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py && pip install -U setuptools wheel && pip install cython
 
 ENV EMBEDDED_LIB 0
 ENV HAVE_AGENT_FWD 0
+ENV SYSTEM_LIBSSH2 1

ci/docker/fedora23/Dockerfile

@@ -1,7 +1,8 @@
 FROM cdrx/fpm-fedora:24
 
-RUN yum -y install libssh2-devel python-devel python-setuptools git
+RUN dnf -y install libssh2-devel python-devel python-setuptools git
 RUN curl -sLO https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm -f get-pip.py && pip install -U setuptools wheel && pip install cython
 
 ENV EMBEDDED_LIB 1
 ENV HAVE_AGENT_FWD 0
+ENV SYSTEM_LIBSSH2 1

ci/docker/fedora24/Dockerfile

@@ -1,12 +1,12 @@
 FROM quay.io/pypa/manylinux1_x86_64
 
 ENV CMAKE cmake-2.8.11.1-5.4.x86_64
-ENV OPENSSL openssl-1.0.2l
-ENV LIBSSH2_VER agent_fwd
+ENV OPENSSL openssl-1.0.2p
+ENV SYSTEM_LIBSSH2 1
 
 RUN yum install zlib-devel -y
 
-ADD https://github.com/ParallelSSH/libssh2/archive/${LIBSSH2_VER}.tar.gz libssh2.tar.gz
+ADD libssh2.tar.gz libssh2.tar.gz
 ADD ${CMAKE}.rpm cmake.rpm
 ADD http://www.openssl.org/source/${OPENSSL}.tar.gz ${OPENSSL}.tar.gz
 
@@ -19,12 +19,11 @@ RUN tar -xzf ${OPENSSL}.tar.gz && \
     make -j4 && make install
 
 # Libssh2
-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 \
+RUN mkdir -p build_libssh2 && cd build_libssh2 && \
+    cmake ../libssh2.tar.gz -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 ${OPENSSL}* build_libssh2
 
 VOLUME /var/cache

ci/docker/manylinux/Dockerfile

@@ -7,3 +7,4 @@ RUN pip install cython
 
 ENV EMBEDDED_LIB 0
 ENV HAVE_AGENT_FWD 0
+ENV SYSTEM_LIBSSH2 1

ci/docker/manylinux/libssh2.tar.gz

@@ -7,3 +7,4 @@ RUN pip install cython
 
 ENV EMBEDDED_LIB 0
 ENV HAVE_AGENT_FWD 0
+ENV SYSTEM_LIBSSH2 1

ci/docker/ubuntu14.04/Dockerfile

@@ -7,3 +7,4 @@ RUN pip install cython
 
 ENV EMBEDDED_LIB 1
 ENV HAVE_AGENT_FWD 0
+ENV SYSTEM_LIBSSH2 1