From eb48cb684690d9d28daa4f5278694d9291ac993a Mon Sep 17 00:00:00 2001
From: "Felix A. Croes" <felix@dworkin.nl>
Date: Wed, 22 Jun 2022 14:12:23 +0200
Subject: [PATCH] Prepare for iRODS 4.3.0.

Depends on a bugfix that should be included in iRODS 4.3.1.
---
 CMakeLists.txt                             |  2 +-
 vagrant/build/.env                         | 12 +++++-------
 vagrant/build/install-davrods-build-env.sh |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26358f5..09cfd29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(davrods C)
 
-set(IRODSRT_VERSION "4.2.11" CACHE STRING "iRODS client library version")
+set(IRODSRT_VERSION "4.3.0" CACHE STRING "iRODS client library version")
 
 set(DAVRODS_FEATURE     "1.5.0")
 set(DAVRODS_VERSION     "${IRODSRT_VERSION}_${DAVRODS_FEATURE}")
diff --git a/vagrant/build/.env b/vagrant/build/.env
index 9d4cb2e..25bcfe8 100644
--- a/vagrant/build/.env
+++ b/vagrant/build/.env
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Tested/supported box names:
-# - centos/7
+# - generic/centos7
 # - ubuntu/bionic64
-BOXNAME=ubuntu/bionic64
+BOXNAME=generic/centos7
 
 # Amount of memory for VM (MB)
 MEMORY=2048
@@ -14,17 +14,15 @@ MEMORY=2048
 DISKSPACE="41GB"
 
 # Version of iRODS to use
-IRODS_VERSION="4.2.11"
+IRODS_VERSION="4.3.0"
 
 # URL of the signing key of the iRODS apt repository
 APT_IRODS_REPO_SIGNING_KEY_LOC=https://packages.irods.org/irods-signing-key.asc
 
-# Parameters of the iRODS apt repository. As of 2 July 2019, the distribution 
-# for Ubuntu 18.04 servers (bionic) needs to be set to Ubuntu 16.04 (xenial),
-# since packages for Ubuntu 18.04 aren't available yet.
+# Parameters of the iRODS apt repository.
 APT_IRODS_REPO_URL=https://packages.irods.org/apt/
 APT_IRODS_REPO_ARCHITECTURE=amd64
-APT_IRODS_REPO_DISTRIBUTION=xenial
+APT_IRODS_REPO_DISTRIBUTION=bionic
 APT_IRODS_REPO_COMPONENT=main
 
 # Packages to be installed (separated by whitespace).
diff --git a/vagrant/build/install-davrods-build-env.sh b/vagrant/build/install-davrods-build-env.sh
index f6ce250..23eb66c 100644
--- a/vagrant/build/install-davrods-build-env.sh
+++ b/vagrant/build/install-davrods-build-env.sh
@@ -19,8 +19,8 @@ function get_package_version()
      local package="$1"
      local IRODS_VERSION="$2"
      local distro="$3"
-     if [ "$IRODS_VERSION" == "4.2.11" ] && [  "$distro" == "ubuntu" ]
-         then package_version="4.2.11-1~xenial"
+     if [ "$IRODS_VERSION" == "4.3.0" ] && [  "$distro" == "ubuntu" ]
+         then package_version="4.3.0-1~bionic"
          else # shellcheck disable=SC2034
               package_version="$IRODS_VERSION"
      fi