From 76d7c359afe464930585734322ba8ea468a35bfc Mon Sep 17 00:00:00 2001
From: Arthur Schreiber <arthur.schreiber@hp.com>
Date: Fri, 26 Jun 2015 17:58:45 +0200
Subject: [PATCH 1/4] Fast builds?

---
 .travis.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 760847978..c81fe9f23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,16 @@ 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
+
+sudo: false
+
 matrix:
  fast_finish: true
  exclude:
@@ -44,7 +54,7 @@ matrix:
          OPTIONS="-DBUILD_CLAR=ON -DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Debug"
 
 install:
-  - ./script/install-deps-${TRAVIS_OS_NAME}.sh
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./script/install-deps-${TRAVIS_OS_NAME}.sh; fi
 
 # Run the Build script and tests
 script:

From 51f8799903eca039d093ad632b516770f7757a87 Mon Sep 17 00:00:00 2001
From: Arthur Schreiber <arthur.schreiber@hp.com>
Date: Fri, 26 Jun 2015 18:05:17 +0200
Subject: [PATCH 2/4] Don't try to start ssh.

---
 script/cibuild.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/script/cibuild.sh b/script/cibuild.sh
index a11e7984f..de5df9ea8 100755
--- a/script/cibuild.sh
+++ b/script/cibuild.sh
@@ -34,8 +34,6 @@ killall git-daemon
 
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then
     echo 'PasswordAuthentication yes' | sudo tee -a /etc/sshd_config
-else
-    sudo start ssh
 fi
 
 ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q

From b48dfe0bbe73c1b17ff645fdbe3dcd321b2b5a7b Mon Sep 17 00:00:00 2001
From: Arthur Schreiber <schreiber.arthur@googlemail.com>
Date: Sat, 27 Jun 2015 14:54:19 +0200
Subject: [PATCH 3/4] Always install valgrind via the apt addon.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c81fe9f23..9022fdec2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ addons:
     - libssh2-1-dev
     - openssh-client
     - openssh-server
+    - valgrind
 
 sudo: false
 
@@ -62,7 +63,6 @@ script:
 
 # Run Tests
 after_success:
- - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then sudo apt-get -qq install valgrind; fi
  - if [ "$TRAVIS_OS_NAME" = "linux" -a -n "$VALGRIND" ]; then valgrind --leak-check=full --show-reachable=yes --suppressions=./libgit2_clar.supp _build/libgit2_clar -ionline; fi
 
 # Only watch the development and master branches

From 32f538ae2805eb9efe312e5ce26e5b32559eb3ba Mon Sep 17 00:00:00 2001
From: Arthur Schreiber <schreiber.arthur@googlemail.com>
Date: Sat, 27 Jun 2015 15:02:53 +0200
Subject: [PATCH 4/4] Remove dependency installation file for travis builds.

We're installing dependencies via the APT addon now.
---
 script/install-deps-linux.sh | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100755 script/install-deps-linux.sh

diff --git a/script/install-deps-linux.sh b/script/install-deps-linux.sh
deleted file mode 100755
index 347922b89..000000000
--- a/script/install-deps-linux.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -x
-
-sudo apt-get -qq update &&
-sudo apt-get -qq install cmake libssh2-1-dev openssh-client openssh-server