From c993bcc51a02adb19e83c4d001ed7a9939451d83 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 12 Jul 2018 11:53:21 +0100
Subject: [PATCH 1/5] Remove sudo from travis build steps

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

diff --git a/.travis.yml b/.travis.yml
index 9dfce2c7..d781a8c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
 before_install:
   - wget https://matrix.org/git/olm/snapshot/olm-2.2.2.tar.bz2
   - tar -xvf olm-2.2.2.tar.bz2
-  - pushd olm-2.2.2 && make && sudo make PREFIX="/usr" install && popd
+  - pushd olm-2.2.2 && make && make PREFIX="/usr" install && popd
   - rm -r olm-2.2.2
 install: pip install tox-travis
 script: tox

From d65aba7750e3c923155178393a6816afb2db29b6 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 12 Jul 2018 13:05:38 +0100
Subject: [PATCH 2/5] Update .travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index d781a8c7..e4628e6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
 before_install:
   - wget https://matrix.org/git/olm/snapshot/olm-2.2.2.tar.bz2
   - tar -xvf olm-2.2.2.tar.bz2
-  - pushd olm-2.2.2 && make && make PREFIX="/usr" install && popd
+  - pushd olm-2.2.2 && make && make PREFIX="./usr" install && popd
   - rm -r olm-2.2.2
 install: pip install tox-travis
 script: tox

From bc28b47706f1dd114a24d56ef47e170a92c16e5a Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 12 Jul 2018 13:36:39 +0100
Subject: [PATCH 3/5] Install libs to /tmp

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e4628e6e..6027ea6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,12 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+env:
+  - LIBRARY_PATH="/tmp/usr/lib;$LIBRARY_PATH"
 before_install:
   - wget https://matrix.org/git/olm/snapshot/olm-2.2.2.tar.bz2
   - tar -xvf olm-2.2.2.tar.bz2
-  - pushd olm-2.2.2 && make && make PREFIX="./usr" install && popd
+  - pushd olm-2.2.2 && make && make PREFIX="/tmp/usr" install && popd
   - rm -r olm-2.2.2
 install: pip install tox-travis
 script: tox

From 95c8ecbae0309135d60195b90af2693fb309e97f Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 12 Jul 2018 13:41:24 +0100
Subject: [PATCH 4/5] Fine! Sudo it is!

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6027ea6c..34dae5c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,14 @@
-sudo: false
+sudo: required
 language: python
 python:
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
-env:
-  - LIBRARY_PATH="/tmp/usr/lib;$LIBRARY_PATH"
 before_install:
   - wget https://matrix.org/git/olm/snapshot/olm-2.2.2.tar.bz2
   - tar -xvf olm-2.2.2.tar.bz2
-  - pushd olm-2.2.2 && make && make PREFIX="/tmp/usr" install && popd
+  - pushd olm-2.2.2 && make && sudo make PREFIX="/tmp/usr" install && popd
   - rm -r olm-2.2.2
 install: pip install tox-travis
 script: tox

From d69840e7beab3c3fa6a2e9da0f40dfb2bb1eb757 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Thu, 12 Jul 2018 14:07:03 +0100
Subject: [PATCH 5/5] Update .travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index 34dae5c4..c55b49ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
 before_install:
   - wget https://matrix.org/git/olm/snapshot/olm-2.2.2.tar.bz2
   - tar -xvf olm-2.2.2.tar.bz2
-  - pushd olm-2.2.2 && make && sudo make PREFIX="/tmp/usr" install && popd
+  - pushd olm-2.2.2 && make && sudo make PREFIX="/usr" install && popd
   - rm -r olm-2.2.2
 install: pip install tox-travis
 script: tox