From 6b44531330b2373ed8f8c8dc3c4ef5ac35c25f46 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 27 Mar 2018 20:55:13 +0200
Subject: [PATCH 1/3] vagrant: update to Python 3.5.5 (for binary builds)

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

diff --git a/Vagrantfile b/Vagrantfile
index f006fe6ab..f61136d05 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -233,7 +233,7 @@ def install_pythons(boxname)
     pyenv install 3.4.0  # tests
     pyenv install 3.5.0  # tests
     pyenv install 3.6.0  # tests
-    pyenv install 3.5.4  # binary build, use latest 3.5.x release
+    pyenv install 3.5.5  # binary build, use latest 3.5.x release
     pyenv rehash
   EOF
 end
@@ -251,8 +251,8 @@ def build_pyenv_venv(boxname)
     . ~/.bash_profile
     cd /vagrant/borg
     # use the latest 3.5 release
-    pyenv global 3.5.4
-    pyenv virtualenv 3.5.4 borg-env
+    pyenv global 3.5.5
+    pyenv virtualenv 3.5.5 borg-env
     ln -s ~/.pyenv/versions/borg-env .
   EOF
 end

From 011ba3ddf48f5dccad10181bdd736abd4c68daff Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 27 Mar 2018 20:57:05 +0200
Subject: [PATCH 2/3] vagrant: suppress any error msgs from __pycache__/.tox
 cleanup

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

diff --git a/Vagrantfile b/Vagrantfile
index f61136d05..fceaf8f55 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -329,9 +329,9 @@ end
 def fs_init(user)
   return <<-EOF
     # clean up (wrong/outdated) stuff we likely got via rsync:
-    rm -rf /vagrant/borg/borg/.tox
-    rm -rf /vagrant/borg/borg/__pycache__
-    find /vagrant/borg/borg/src -name '__pycache__' -exec rm -rf {} \\;
+    rm -rf /vagrant/borg/borg/.tox 2> /dev/null
+    rm -rf /vagrant/borg/borg/__pycache__ 2> /dev/null
+    find /vagrant/borg/borg/src -name '__pycache__' -exec rm -rf {} \\;  2> /dev/null
     chown -R #{user} /vagrant/borg
     touch ~#{user}/.bash_profile ; chown #{user} ~#{user}/.bash_profile
     echo 'export LANG=en_US.UTF-8' >> ~#{user}/.bash_profile

From ea03c1dd70b79911f73df1279d780e3839b22a7c Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 27 Mar 2018 20:59:57 +0200
Subject: [PATCH 3/3] vagrant: the boxcutter wheezy boxes are 404, use local
 ones

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

diff --git a/Vagrantfile b/Vagrantfile
index fceaf8f55..cfecc62b5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -443,7 +443,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.define "wheezy32" do |b|
-    b.vm.box = "boxcutter/debian7-i386"
+    b.vm.box = "debian7-i386"
     b.vm.provider :virtualbox do |v|
       v.memory = 768 + $wmem
     end
@@ -460,7 +460,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.define "wheezy64" do |b|
-    b.vm.box = "boxcutter/debian7"
+    b.vm.box = "debian7-amd64"
     b.vm.provider :virtualbox do |v|
       v.memory = 1024 + $wmem
     end