From 0416bfdc5af16655f19dace38fbbcca090f33aa2 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 30 Jul 2017 21:43:59 +0200
Subject: [PATCH 1/3] vagrant: add exe location to PATH when we build an exe

(cherry picked from commit c1f9ed991b9679d789389741eaa3248075774572)
---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 076a2b7b9..7042feebe 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -214,7 +214,7 @@ end
 def install_pyenv(boxname)
   script = <<-EOF
     curl -s -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash
-    echo 'export PATH="$HOME/.pyenv/bin:/vagrant/borg:$PATH"' >> ~/.bash_profile
+    echo 'export PATH="$HOME/.pyenv/bin:$PATH"' >> ~/.bash_profile
     echo 'eval "$(pyenv init -)"' >> ~/.bash_profile
     echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bash_profile
     echo 'export PYTHON_CONFIGURE_OPTS="--enable-shared"' >> ~/.bash_profile
@@ -307,6 +307,7 @@ def build_binary_with_pyinstaller(boxname)
     . borg-env/bin/activate
     cd borg
     pyinstaller --clean --distpath=/vagrant/borg scripts/borg.exe.spec
+    echo 'export PATH="/vagrant/borg:$PATH"' >> ~/.bash_profile
   EOF
 end
 

From a01d595c850f303823510fc3591615c0910622e5 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 30 Jul 2017 21:55:15 +0200
Subject: [PATCH 2/3] vagrant: fix netbsd version in PKG_PATH

the VM is using netbsd 7.0.1, likely updating the version in the
PKG_PATH was forgotten when the machine itself was upgraded to a newer
version. it became visible now as the 6.1.5 stuff vanished from the
ftp server.

also: remove trailing /
(cherry picked from commit 1f5eba0cb8679cf4520f519be36efd18a18e29e9)
---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 7042feebe..0375011b4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -139,7 +139,7 @@ end
 def packages_netbsd
   return <<-EOF
     hostname netbsd  # the box we use has an invalid hostname
-    PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/6.1.5/All/"
+    PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/7.0.1/All"
     export PKG_PATH
     pkg_add mozilla-rootcerts lz4 git bash
     chsh -s bash vagrant

From a07b771662a30eb67b38d9bf5c302c5e2582237e Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 30 Jul 2017 22:02:43 +0200
Subject: [PATCH 3/3] vagrant: netbsd: bash is already installed

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

diff --git a/Vagrantfile b/Vagrantfile
index 0375011b4..984c73ea0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -141,7 +141,7 @@ def packages_netbsd
     hostname netbsd  # the box we use has an invalid hostname
     PKG_PATH="ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/amd64/7.0.1/All"
     export PKG_PATH
-    pkg_add mozilla-rootcerts lz4 git bash
+    pkg_add mozilla-rootcerts lz4 git
     chsh -s bash vagrant
     mkdir -p /usr/local/opt/lz4/include
     mkdir -p /usr/local/opt/lz4/lib