Diff below switches sysutils/borgbackup/2.0 from OpenSSL-1.1 to
OpenSSL-3.0. Reason to switch is the EOL status of OpenSSL-1.1.1.
It should be noted that OpenSSL is used for EVP_aes_256_ocb, and is
linked statically to avoid conflicting with shared libcrypto from the
base OS pulled in via dependencies.
Passes all tests, and run tested on amd64.
Comments/OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/2.0/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 11 Sep 2023 17:59:47 -0000 1.14
+++ Makefile 11 Sep 2023 19:34:04 -0000
@@ -4,11 +4,11 @@ USE_NOEXECONLY= Yes
.endif
MODPY_EGG_VERSION = 2.0.0b6
-REVISION = 2
+REVISION = 3
# 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/1.1
+BUILD_DEPENDS = security/openssl/3.0
RUN_DEPENDS = security/py-argon2-cffi${MODPY_FLAVOR} \
sysutils/py-platformdirs${MODPY_FLAVOR}>=3.8.1
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 11 Sep 2023 19:34:04 -0000
@@ -0,0 +1,14 @@
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -161,8 +161,8 @@ if not on_rtd:
+ # Use openssl (not libressl) because we need AES-OCB via EVP api. Link
+ # it statically to avoid conflicting with shared libcrypto from the
base
+ # OS pulled in via dependencies.
+- crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl11"]}
+- crypto_extra_objects += ["/usr/local/lib/eopenssl11/libcrypto.a"]
++ crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl30"]}
++ crypto_extra_objects += ["/usr/local/lib/eopenssl30/libcrypto.a"]
+ else:
+ crypto_ext_lib = lib_ext_kwargs(pc, "BORG_OPENSSL_PREFIX", "crypto",
"libcrypto", ">=1.1.1")
+
