From 419b1bfddf3e966774c2605afee1ddd992968488 Mon Sep 17 00:00:00 2001
From: Ben Marchant <13385275+bmarchant@users.noreply.github.com>
Date: Mon, 30 Dec 2019 12:23:33 -0600
Subject: [PATCH 1/3] vagrant up fails without an 'apt-get update' before
 installing other software.

---
 scripts/provision.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/provision.sh b/scripts/provision.sh
index 30b413213..11a290d35 100644
--- a/scripts/provision.sh
+++ b/scripts/provision.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+apt-get update;
+
 apt-get install -y git build-essential automake autoconf libtool;
 
 apt-get install -y libxml2-dev libpqxx-dev libfcgi-dev \

From 34b2cd081ccc757aab60211a07d59f5c32612311 Mon Sep 17 00:00:00 2001
From: mmd-osm <mmd.osm@gmail.com>
Date: Mon, 30 Dec 2019 21:02:57 +0100
Subject: [PATCH 2/3] Update Vagrantfile to use bionic

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

diff --git a/Vagrantfile b/Vagrantfile
index 336312f72..602d209a6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,10 +5,10 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # default build target is currently Ubuntu 16.04
-  config.vm.define "xenial", :primary => true do |xenial|
-    xenial.vm.box = 'ubuntu/xenial64'
-    xenial.vm.provision 'shell', path: 'scripts/provision.sh'
+  # default build target is currently Ubuntu 18.04
+  config.vm.define "bionic", :primary => true do |bionic|
+    bionic.vm.box = 'ubuntu/bionic64'
+    bionic.vm.provision 'shell', path: 'scripts/provision.sh'
   end
 
   config.vm.synced_folder ".", "/vagrant"

From c2a621ba629b208039f7fec2415cffcc0ad1163b Mon Sep 17 00:00:00 2001
From: mmd-osm <mmd.osm@gmail.com>
Date: Mon, 30 Dec 2019 21:36:36 +0100
Subject: [PATCH 3/3] Vagrant: install libraries according to travis.yml

---
 scripts/provision.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/provision.sh b/scripts/provision.sh
index 11a290d35..a513bacc7 100644
--- a/scripts/provision.sh
+++ b/scripts/provision.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
-apt-get update;
+apt-get update
 
-apt-get install -y git build-essential automake autoconf libtool;
+apt-get install -y git build-essential automake autoconf libtool
 
-apt-get install -y libxml2-dev libpqxx-dev libfcgi-dev \
-  libboost-dev libboost-regex-dev libboost-program-options-dev \
-  libboost-date-time-dev libboost-filesystem-dev \
-  libboost-system-dev libboost-locale-dev libmemcached-dev \
-  libcrypto++-dev;
+apt-get install -y libboost-dev libboost-filesystem-dev libboost-locale-dev \
+                   libboost-program-options-dev libboost-system-dev \
+                   libcrypto++-dev libfcgi-dev libmemcached-dev libpqxx-dev \
+                   libxml2-dev libyajl-dev
 
 # following stuff is for testing only
 apt-get install -y postgresql postgresql-contrib postgis