From ca6a7d15003083b81e2a6d09a74c224c6ce45073 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 8 Dec 2018 20:01:30 +0100
Subject: [PATCH 1/3] on linux, symlinks can't have ACLs, see #4044

(cherry picked from commit ca1928c92596d18fd240db604315680145265c43)
---
 src/borg/platform/linux.pyx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/borg/platform/linux.pyx b/src/borg/platform/linux.pyx
index 7b963c9e3..edd83e48b 100644
--- a/src/borg/platform/linux.pyx
+++ b/src/borg/platform/linux.pyx
@@ -273,6 +273,10 @@ def acl_set(path, item, numeric_owner=False, fd=None):
     cdef acl_t access_acl = NULL
     cdef acl_t default_acl = NULL
 
+    if stat.S_ISLNK(item.get('mode', 0)):
+        # Linux does not support setting ACLs on symlinks
+        return
+
     if fd is None and isinstance(path, str):
         path = os.fsencode(path)
     if numeric_owner:

From 042dfa0c73c3e10e8ef9e7e9d6aae8bc6f24c4e8 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 15 Dec 2018 21:37:43 +0100
Subject: [PATCH 2/3] Vagrantfile: add python 3.5.0 for testing

---
 Vagrantfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3775cd1d1..9af12c1e0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -111,6 +111,7 @@ def install_pythons(boxname)
     . ~/.bash_profile
     pyenv install 3.7.0  # tests
     pyenv install 3.6.0  # tests
+    pyenv install 3.5.0  # tests
     pyenv install 3.6.6  # binary build, use latest 3.6.x release
     pyenv rehash
   EOF
@@ -190,8 +191,8 @@ def run_tests(boxname)
     . ../borg-env/bin/activate
     if which pyenv 2> /dev/null; then
       # for testing, use the earliest point releases of the supported python versions:
-      pyenv global 3.6.0 3.7.0
-      pyenv local 3.6.0 3.7.0
+      pyenv global 3.5.0 3.6.0 3.7.0
+      pyenv local 3.5.0 3.6.0 3.7.0
     fi
     # otherwise: just use the system python
     if which fakeroot 2> /dev/null; then

From 15695205a11726ab1818fbbe272d8474a3e8f199 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sat, 15 Dec 2018 21:39:52 +0100
Subject: [PATCH 3/3] Vagrantfile: use python 3.6.7 for binary building

---
 Vagrantfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 9af12c1e0..a61c456b7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -112,7 +112,7 @@ def install_pythons(boxname)
     pyenv install 3.7.0  # tests
     pyenv install 3.6.0  # tests
     pyenv install 3.5.0  # tests
-    pyenv install 3.6.6  # binary build, use latest 3.6.x release
+    pyenv install 3.6.7  # binary build, use latest 3.6.x release
     pyenv rehash
   EOF
 end
@@ -130,8 +130,8 @@ def build_pyenv_venv(boxname)
     . ~/.bash_profile
     cd /vagrant/borg
     # use the latest 3.6 release
-    pyenv global 3.6.6
-    pyenv virtualenv 3.6.6 borg-env
+    pyenv global 3.6.7
+    pyenv virtualenv 3.6.7 borg-env
     ln -s ~/.pyenv/versions/borg-env .
   EOF
 end