Merge pull request #4317 from libgit2/ethomson/libcurl_build

Build with patched libcurl

.travis.yml

@@ -2,6 +2,7 @@
 # see travis-ci.org for details
 
 language: c
+dist: trusty
 
 os:
   - linux
@@ -20,17 +21,8 @@ env:
   - OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release"
   - OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON"
 
-addons:
-  apt:
-    packages:
-    - cmake
-    - libssh2-1-dev
-    - openssh-client
-    - openssh-server
-    - valgrind
-
 dist: trusty
-sudo: false
+sudo: true
 
 matrix:
  fast_finish: true
@@ -56,7 +48,7 @@ matrix:
    - env: COVERITY=1
 
 install:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi
+  - ./script/install-deps-${TRAVIS_OS_NAME}.sh
 
 # Run the Build script and tests
 script:

script/cibuild.sh

@@ -50,6 +50,7 @@ cat >~/sshd/sshd_config<<-EOF
 	ListenAddress 0.0.0.0
 	Protocol 2
 	HostKey ${HOME}/sshd/id_rsa
+	PidFile ${HOME}/sshd/pid
 	RSAAuthentication yes
 	PasswordAuthentication yes
 	PubkeyAuthentication yes
@@ -99,7 +100,7 @@ if [ -e ./libgit2_clar ]; then
 
 fi
 
-killall sshd
+kill $(cat "$HOME/sshd/pid")
 
 export GITTEST_REMOTE_URL="https://github.com/libgit2/non-existent"
 export GITTEST_REMOTE_USER="libgit2test"

script/install-deps-linux.sh

+#!/bin/sh
+
+set -x
+
+if [ -z "$PRECISE" ]; then
+    echo "deb http://libgit2deps.edwardthomson.com trusty libgit2deps" | sudo tee -a /etc/apt/sources.list
+    sudo apt-key adv --keyserver pgp.mit.edu --recv 99131CD5
+    sudo apt-get update -qq
+    sudo apt-get install -y curl libcurl3 libcurl3-gnutls libcurl4-gnutls-dev
+fi
+
+sudo apt-get install -y cmake libssh2-1-dev openssh-client openssh-server valgrind