From 59ba13b996ffef0d268f07f151d56e2deedb3e8a Mon Sep 17 00:00:00 2001 From: tb Date: Wed, 16 Jul 2025 15:21:45 +0000 Subject: [PATCH] rpki-client regress: use openssl 3.5 if available and fall back to 3.3. The packages will be updated from 3.3 to 3.5 automatically. No action needed for those running full regress. --- regress/usr.sbin/rpki-client/Makefile | 4 ++-- regress/usr.sbin/rpki-client/openssl/Makefile | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/regress/usr.sbin/rpki-client/Makefile b/regress/usr.sbin/rpki-client/Makefile index 4f0f70606a2..3de8c4f305d 100644 --- a/regress/usr.sbin/rpki-client/Makefile +++ b/regress/usr.sbin/rpki-client/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.15 2025/01/15 11:00:09 tb Exp $ +# $OpenBSD: Makefile,v 1.16 2025/07/16 15:21:45 tb Exp $ SUBDIR += libressl -.if exists(/usr/local/bin/eopenssl33) +.if exists(/usr/local/bin/eopenssl33) || exists(/usr/local/bin/eopenssl35) SUBDIR += openssl .endif diff --git a/regress/usr.sbin/rpki-client/openssl/Makefile b/regress/usr.sbin/rpki-client/openssl/Makefile index 14753880c08..9070cf10a3a 100644 --- a/regress/usr.sbin/rpki-client/openssl/Makefile +++ b/regress/usr.sbin/rpki-client/openssl/Makefile @@ -1,6 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2025/01/15 11:00:09 tb Exp $ +# $OpenBSD: Makefile,v 1.4 2025/07/16 15:21:45 tb Exp $ +.if exists(/usr/local/bin/eopenssl35) +EOPENSSL = eopenssl35 +.else EOPENSSL = eopenssl33 +.endif LDADD += -Wl,-rpath,/usr/local/lib/${EOPENSSL} -L/usr/local/lib/${EOPENSSL} CFLAGS += -I${.CURDIR}/ -I/usr/local/include/${EOPENSSL}/