From f031e20b516209f19a56ef934e12fea6adec097a Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Sun, 23 Jul 2017 03:41:52 +0100
Subject: travis: build with patched libcurl

Ubuntu trusty has a bug in curl when using NTLM credentials in a proxy,
dereferencing a null pointer and causing segmentation faults.  Use a
custom-patched version of libcurl that avoids this issue.
---
 .travis.yml                  | 13 ++-----------
 script/install-deps-linux.sh |  8 ++++++++
 2 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100755 script/install-deps-linux.sh

diff --git a/.travis.yml b/.travis.yml
index d789f15a7..5ceb97dc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,17 +20,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 +47,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:
diff --git a/script/install-deps-linux.sh b/script/install-deps-linux.sh
new file mode 100755
index 000000000..c18b03bfe
--- /dev/null
+++ b/script/install-deps-linux.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+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 cmake curl libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libssh2-1-dev openssh-client openssh-server valgrind
-- 
cgit v1.2.1