Index | Thread | Search

From:
Theo Buehler <tb@theobuehler.org>
Subject:
borgbackup/2.0: switch to openssl/3.5
To:
ports@openbsd.org
Cc:
bket@openbsd.org
Date:
Wed, 9 Jul 2025 20:27:50 +0200

Download raw body.

Thread
I'm going to move us to openssl/3.5 as default, so all consumers have to
switch. The setup.py patch is a bit different from last time.

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/2.0/Makefile,v
diff -u -p -r1.48 Makefile
--- Makefile	1 Jul 2025 16:37:43 -0000	1.48
+++ Makefile	9 Jul 2025 18:21:12 -0000
@@ -1,4 +1,4 @@
-# Static linking with OpenSSL 3.3
+# Static linking with OpenSSL 3.5
 .if ${MACHINE_ARCH} != aarch64 && ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != riscv64
 USE_NOEXECONLY=		Yes
 .endif
@@ -7,11 +7,11 @@ MODPY_DISTV =		2.0.0b18
 PKGNAME =		borgbackup-${MODPY_DISTV:S/b/beta/}
 EPOCH =			0
 
-REVISION =		1
+REVISION =		2
 
 # OpenSSL used for EVP_aes_256_ocb. It is linked statically to avoid conflicting
 # with shared libcrypto from the base OS pulled in via dependencies.
-BUILD_DEPENDS =		security/openssl/3.3
+BUILD_DEPENDS =		security/openssl/3.5
 RUN_DEPENDS =		databases/py-borgstore>=0.3.0 \
 			devel/py-borghash>=0.1.0 \
 			security/py-argon2-cffi \
Index: patches/patch-setup_py
===================================================================
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_py	8 Jul 2025 10:17:08 -0000
@@ -0,0 +1,12 @@
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -143,7 +143,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")],