From b35a76dd3ce37bda834e0f12eba54cf60168a154 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 13 Mar 2026 00:39:13 +0100 Subject: [PATCH] adapt for OpenBSD 7.8 (CI and setup.py) --- .github/workflows/ci.yml | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1acda1fd8..2bc5851cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -400,7 +400,7 @@ jobs: do_binaries: false - os: openbsd - version: '7.7' + version: '7.8' display_name: OpenBSD do_binaries: false @@ -529,10 +529,10 @@ jobs: openbsd) sudo -E pkg_add lz4 git sudo -E pkg_add rust - sudo -E pkg_add openssl%3.4 + sudo -E pkg_add openssl%3.5 sudo -E pkg_add py3-pip py3-virtualenv py3-tox - export BORG_OPENSSL_NAME=eopenssl34 + export BORG_OPENSSL_NAME=eopenssl35 tox -e py312-none ;; diff --git a/setup.py b/setup.py index 1c2ea3def..07b763515 100644 --- a/setup.py +++ b/setup.py @@ -145,7 +145,7 @@ if not on_rtd: # it statically to avoid conflicting with shared libcrypto from the base # OS pulled in via dependencies. openssl_prefix = os.environ.get("BORG_OPENSSL_PREFIX", "/usr/local") - openssl_name = os.environ.get("BORG_OPENSSL_NAME", "eopenssl33") + openssl_name = os.environ.get("BORG_OPENSSL_NAME", "eopenssl35") crypto_ext_lib = dict( include_dirs=[os.path.join(openssl_prefix, "include", openssl_name)], extra_objects=[os.path.join(openssl_prefix, "lib", openssl_name, "libcrypto.a")],