From 8ad1596897d15b8c73b9a86629a5b8bec77ec5af Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 5 Nov 2017 23:52:15 +0100
Subject: [PATCH 1/5] vagrant: use https pypi url for wheezy

http url stopped working

(cherry picked from commit ce7936b608bcc8199d4a6cee7ef1e3c950ff4a03)
---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 971a509e5..c3146c5c4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -38,7 +38,7 @@ def packages_debianoid
     # this way it works on older dists (like ubuntu 12.04) also:
     # for python 3.2 on ubuntu 12.04 we need pip<8 and virtualenv<14 as
     # newer versions are not compatible with py 3.2 any more.
-    easy_install3 'pip<8.0'
+    easy_install3 -i https://pypi.python.org/simple/ 'pip<8.0'
     pip3 install 'virtualenv<14.0'
     touch $home_dir/.bash_profile ; chown $username $home_dir/.bash_profile
   EOF

From 914d4d461c586c7e28020dbec354e01211d2d5ba Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Thu, 12 Oct 2017 03:37:48 +0200
Subject: [PATCH 2/5] don't brew update, hopefully fixes #2532

(cherry picked from commit 6049a07b74b55856d5be999bac4b4d49a5317d35)
(cherry picked from commit aac190eae14aa02989e034f49509e5becd617588)
---
 .travis/install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 8bea01320..19f0ada98 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -4,8 +4,6 @@ set -e
 set -x
 
 if [[ "$(uname -s)" == 'Darwin' ]]; then
-    brew update || brew update
-
     if [[ "${OPENSSL}" != "0.9.8" ]]; then
         brew outdated openssl || brew upgrade openssl
     fi

From f1164b131b44d2458367fffa70dff40ba7b8828f Mon Sep 17 00:00:00 2001
From: Milkey Mouse <milkeymouse@meme.institute>
Date: Mon, 6 Nov 2017 14:39:08 -0800
Subject: [PATCH 3/5] Clarify encrypted key format for borg key export (fixes
 #3296)

(cherry picked from commit 68bb3792fb438aac4d8e8456d67250cf9789f2a3)
---
 borg/archiver.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/borg/archiver.py b/borg/archiver.py
index 9386d4029..a0fde38e2 100644
--- a/borg/archiver.py
+++ b/borg/archiver.py
@@ -1285,6 +1285,9 @@ class Archiver:
         key_export_epilog = textwrap.dedent("""
         If repository encryption is used, the repository is inaccessible
         without the key. This command allows to backup this essential key.
+        Note that the backup produced does not include the passphrase itself
+        (i.e. the exported key stays encrypted). In order to regain access to a
+        repository, one needs both the exported key and the original passphrase.
 
         There are two backup formats. The normal backup format is suitable for
         digital storage as a file. The ``--paper`` backup format is optimized

From e065fccf3d5078b3c42bf03af28073334b78dff8 Mon Sep 17 00:00:00 2001
From: Narendra Vardi <narendravardi1127@gmail.com>
Date: Sun, 18 Jun 2017 20:18:26 +0530
Subject: [PATCH 4/5] Don't perform full Travis build on docs-only changes
 #2531

(cherry picked from commit 944ae4afc375aac0550e4d7c82271d0db46d2dc6)
---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 849726c7b..c26a4841d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,13 @@ matrix:
           osx_image: xcode6.4
           env: TOXENV=py36
 
+before_install:
+- |
+    git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(AUTHORS|README\.rst|^(docs)/)' || {
+      echo "Only docs were updated, stopping build process."
+      exit
+    }
+
 install:
     - git fetch --unshallow --tags
     - ./.travis/install.sh

From f948cfbe35e3349f334859822b6a3780168fab0d Mon Sep 17 00:00:00 2001
From: Marian Beermann <public@enkore.de>
Date: Thu, 24 Aug 2017 16:24:44 +0200
Subject: [PATCH 5/5] travis: only short-circuit docs-only changes for pull
 requests

if a branch build is stopped, then codecov will complain about
missing base branch coverage.

(cherry picked from commit d2f9e2868304729bbd63ca4900485ac5d49b5410)
---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c26a4841d..d80af233f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,9 +39,12 @@ matrix:
 
 before_install:
 - |
-    git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(AUTHORS|README\.rst|^(docs)/)' || {
-      echo "Only docs were updated, stopping build process."
-      exit
+    test $TRAVIS_EVENT_TYPE != "pull_request" || {
+        echo Checking whether $TRAVIS_COMMIT_RANGE changed only docs
+        git diff --name-only $TRAVIS_COMMIT_RANGE | grep --quiet --invert-match --extended-regexp '(AUTHORS|README\.rst|^(docs)/)' || {
+            echo "Only docs were updated, stopping build process."
+            exit
+        }
     }
 
 install: