From 9c88e2a4e842fed05021c45a7c0ed12f080b80c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ketelaars?= Date: Tue, 19 Nov 2024 20:55:21 +0100 Subject: [PATCH 1/2] Fix OpenBSD Vagrant This should address #8506. Unfortunately I'm unable to test. #8506 is likely caused by the Vagrant box having a mirror in its `etc/installurl`, which does not offer 7.4 packages. There are other mirrors out there who do, e.g., https://ftp.eu.openbsd.org/pub/OpenBSD/. Proposed 'fix' is to replace the mirror in `/etc/installurl`. --- Vagrantfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Vagrantfile b/Vagrantfile index 06a62f544..7c4ce7651 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -73,6 +73,7 @@ end def packages_openbsd return <<-EOF + echo "https://ftp.eu.openbsd.org/pub/OpenBSD" > /etc/installurl pkg_add bash chsh -s bash vagrant pkg_add xxhash From 33834c419fde6611789557a84ec80fd9eabf2181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ketelaars?= Date: Wed, 20 Nov 2024 05:57:00 +0100 Subject: [PATCH 2/2] Filter test output with LibreSSL related warnings on OpenBSD We do not want that urllib spoils test output with LibreSSL related warnings on OpenBSD. `NotOpenSSLWarning: urllib3 v2 only supports OpenSSL 1.1.1+, currently the 'ssl' module is compiled with 'LibreSSL 3.8.2'`. --- src/borg/logger.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/borg/logger.py b/src/borg/logger.py index 471092921..b3fdb5be0 100644 --- a/src/borg/logger.py +++ b/src/borg/logger.py @@ -117,6 +117,12 @@ class JSONProgressFormatter(logging.Formatter): # warnings.filterwarnings('ignore', r'... regex for warning message to ignore ...') +# we do not want that urllib spoils test output with LibreSSL related warnings on OpenBSD. +# NotOpenSSLWarning: urllib3 v2 only supports OpenSSL 1.1.1+, +# currently the 'ssl' module is compiled with 'LibreSSL 3.8.2'. +warnings.filterwarnings("ignore", message=r".*urllib3 v2 only supports OpenSSL.*") + + def _log_warning(message, category, filename, lineno, file=None, line=None): # for warnings, we just want to use the logging system, not stderr or other files msg = f"{filename}:{lineno}: {category.__name__}: {message}"