From e80fa4a189af5ebdfe128cf7a25a0d0a4903b4d0 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 25 Dec 2023 22:40:38 +0100 Subject: [PATCH 1/4] vagrant: use generic/openbsd7 box --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 92266577f..13f20e00a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -346,7 +346,7 @@ Vagrant.configure(2) do |config| end config.vm.define "openbsd64" do |b| - b.vm.box = "openbsd71-64" + b.vm.box = "generic/openbsd7" b.vm.provider :virtualbox do |v| v.memory = 1024 + $wmem end From f2b70cf0a6f6e0ef67e2333dcb0882bd5d2a3838 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 25 Dec 2023 22:54:40 +0100 Subject: [PATCH 2/4] vagrant: remove outdated comment --- Vagrantfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 13f20e00a..45e05fbd1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -408,7 +408,4 @@ Vagrant.configure(2) do |config| b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("nofuse") b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("openindiana64", ".*fuse.*") end - - # TODO: create more VMs with python 3.9+ and openssl 1.1. - # See branch 1.1-maint for a better equipped Vagrantfile (but still on py35 and openssl 1.0). end From 8ce3f23dcad0d7d5f30c402f0d09efeba368a658 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 25 Dec 2023 23:03:34 +0100 Subject: [PATCH 3/4] vagrant: use openssl 3.0 on openbsd --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 45e05fbd1..11a4e8470 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -74,7 +74,7 @@ def packages_openbsd pkg_add lz4 pkg_add zstd pkg_add git # no fakeroot - pkg_add openssl%1.1 + pkg_add openssl%3.0 pkg_add py3-pip pkg_add py3-virtualenv EOF From bd9d12c0bacfce2564f862c97d265c7a9a6d6b38 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 25 Dec 2023 23:22:00 +0100 Subject: [PATCH 4/4] vagrant: use openssl 3.0 on macOS --- Vagrantfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 11a4e8470..8b31b316e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -113,10 +113,13 @@ def packages_darwin sudo softwareupdate --install --all which brew || CI=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)" brew update > /dev/null - brew install pkg-config readline openssl@1.1 zstd lz4 xz + brew install pkg-config readline openssl@3.0 zstd lz4 xz brew install --cask macfuse # brew upgrade # upgrade everything (takes rather long) - echo 'export PKG_CONFIG_PATH=/usr/local/opt/openssl@1.1/lib/pkgconfig' >> ~vagrant/.bash_profile + echo 'export LDFLAGS=-L/usr/local/opt/openssl@3.0/lib' >> ~vagrant/.bash_profile + echo 'export CPPFLAGS=-I/usr/local/opt/openssl@3.0/include' >> ~vagrant/.bash_profile + echo 'export PKG_CONFIG_PATH=/usr/local/opt/openssl@3.0/lib/pkgconfig' >> ~vagrant/.bash_profile + echo 'export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA=openssl@3.0' >> ~vagrant/.bash_profile EOF end