Merge pull request #5088 from ThomasWaldmann/vagrant-fixes

vagrant fixes

Vagrantfile

@@ -16,6 +16,7 @@ end
 
 def packages_debianoid(user)
   return <<-EOF
+    export DEBIAN_FRONTEND=noninteractive
     apt-get update
     # install all the (security and other) updates
     apt-get dist-upgrade -y
@@ -78,12 +79,12 @@ def packages_darwin
     # brew is already installed in the base box
     #ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
     brew update
-    brew install openssl
-    brew install lz4
-    brew install xz  # required for python lzma module
-    brew install fakeroot
-    brew install git
-    brew install pkg-config
+    brew install openssl || brew upgrade openssl
+    brew install lz4 || brew upgrade lz4
+    brew install xz  || brew upgrade xz  # required for python lzma module
+    brew install fakeroot || brew upgrade fakeroot
+    brew install git || brew upgrade git
+    brew install pkg-config || brew upgrade pkg-config
   EOF
 end