Skip to content

Commit f031e20

Browse files
committed
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.
1 parent e056862 commit f031e20

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

.travis.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,8 @@ env:
2020
- OPTIONS="-DTHREADSAFE=ON -DCMAKE_BUILD_TYPE=Release"
2121
- OPTIONS="-DTHREADSAFE=OFF -DBUILD_EXAMPLES=ON"
2222

23-
addons:
24-
apt:
25-
packages:
26-
- cmake
27-
- libssh2-1-dev
28-
- openssh-client
29-
- openssh-server
30-
- valgrind
31-
3223
dist: trusty
33-
sudo: false
24+
sudo: true
3425

3526
matrix:
3627
fast_finish: true
@@ -56,7 +47,7 @@ matrix:
5647
- env: COVERITY=1
5748

5849
install:
59-
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi
50+
- ./script/install-deps-${TRAVIS_OS_NAME}.sh
6051

6152
# Run the Build script and tests
6253
script:

script/install-deps-linux.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
3+
set -x
4+
5+
echo "deb http://libgit2deps.edwardthomson.com trusty libgit2deps" | sudo tee -a /etc/apt/sources.list
6+
sudo apt-key adv --keyserver pgp.mit.edu --recv 99131CD5
7+
sudo apt-get update -qq
8+
sudo apt-get install -y cmake curl libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libssh2-1-dev openssh-client openssh-server valgrind

0 commit comments

Comments
 (0)