On Wed, Jul 09, 2025 at 08:54:48PM +0200, Bjorn Ketelaars wrote:
> On Wed 09/07/2025 20:27, Theo Buehler wrote:
> > 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.
> 
> Instead of patching setup.py I would prefer to use "MAKE_ENV =
> BORG_OPENSSL_NAME=eopenssl35". See diff below.

Sure. That seems better. Please commit once you're happy with your
testing.

Thanks

> 
> 
> diff --git sysutils/borgbackup/2.0/Makefile sysutils/borgbackup/2.0/Makefile
> index b713ed8fe05..23c48cfab98 100644
> --- sysutils/borgbackup/2.0/Makefile
> +++ sysutils/borgbackup/2.0/Makefile
> @@ -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,14 +7,16 @@ 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 \
>  			sysutils/py-platformdirs
>  
> +MAKE_ENV =		BORG_OPENSSL_NAME=eopenssl35
> +
>  .include <bsd.port.mk>