Index | Thread | Search

From:
Theo Buehler <tb@theobuehler.org>
Subject:
borgbackup: switch to openssl/3.2
To:
ports@openbsd.org
Cc:
bket@openbsd.org
Date:
Sun, 14 Apr 2024 23:48:17 +0100

Download raw body.

Thread
I'd like to remove openssl/3.1, so switch borgbackup to using 3.2.

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/2.0/Makefile,v
diff -u -p -r1.24 Makefile
--- Makefile	25 Feb 2024 10:15:34 -0000	1.24
+++ Makefile	14 Apr 2024 22:37:57 -0000
@@ -1,10 +1,10 @@
-# Static linking with OpenSSL 3.1
+# Static linking with OpenSSL 3.2
 .if ${MACHINE_ARCH} != aarch64 && ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != riscv64
 USE_NOEXECONLY=		Yes
 .endif
 
 MODPY_EGG_VERSION =	2.0.0b8
-REVISION =		0
+REVISION =		1
 
 # 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.
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/sysutils/borgbackup/2.0/patches/patch-setup_py,v
diff -u -p -r1.4 patch-setup_py
--- patches/patch-setup_py	25 Feb 2024 06:28:18 -0000	1.4
+++ patches/patch-setup_py	14 Apr 2024 21:59:00 -0000
@@ -7,8 +7,8 @@ Index: setup.py
          # OS pulled in via dependencies.
 -        crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl30"]}
 -        crypto_extra_objects += ["/usr/local/lib/eopenssl30/libcrypto.a"]
-+        crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl31"]}
-+        crypto_extra_objects += ["/usr/local/lib/eopenssl31/libcrypto.a"]
++        crypto_ext_lib = {"include_dirs": ["/usr/local/include/eopenssl32"]}
++        crypto_extra_objects += ["/usr/local/lib/eopenssl32/libcrypto.a"]
      else:
          crypto_ext_lib = lib_ext_kwargs(pc, "BORG_OPENSSL_PREFIX", "crypto", "libcrypto", ">=1.1.1")