Index | Thread | Search

From:
Theo Buehler <tb@theobuehler.org>
Subject:
switch nsca-ng to openssl 3.2
To:
ports@openbsd.org
Date:
Thu, 17 Oct 2024 20:22:03 +0200

Download raw body.

Thread
Straightforward diff, tests pass. A test by someone who knows what this
is good for would be nice.

OpenSSL 1.1 is pining for the fjords^Wattic and this removes its last
consumer in the ports tree. It can be removed once a few regress tests
in base are adjusted.

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nagios/nsca-ng/Makefile,v
diff -u -p -r1.23 Makefile
--- Makefile	27 Sep 2023 14:18:21 -0000	1.23
+++ Makefile	17 Oct 2024 18:12:18 -0000
@@ -2,7 +2,7 @@ COMMENT-main=	server to accept passive c
 COMMENT-client=	client to send passive check results to Nagios/Icinga
 
 V=		1.6
-REVISION=	2
+REVISION=	3
 DISTNAME=	nsca-ng-$V
 PKGNAME-main=	nsca-ng-$V
 PKGNAME-client=	nsca-ng-client-$V
@@ -13,21 +13,21 @@ HOMEPAGE=	https://www.nsca-ng.org/
 # BSD
 PERMIT_PACKAGE=	Yes
 
-WANTLIB=	c ev lib/eopenssl11/crypto lib/eopenssl11/ssl
+WANTLIB=	c ev lib/eopenssl32/crypto lib/eopenssl32/ssl
 WANTLIB-main=	${WANTLIB} confuse
 
 SITES=			https://github.com/weiss/nsca-ng/releases/download/v$V/
 
 # OpenSSL used for PSK (SSL_get_psk_identity)
 LIB_DEPENDS=		devel/libev \
-			security/openssl/1.1
+			security/openssl/3.2
 LIB_DEPENDS-main=	${LIB_DEPENDS} \
 			devel/libconfuse
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--enable-server
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/eopenssl11" \
-			LDFLAGS="-L${LOCALBASE}/lib/eopenssl11 -Wl,-rpath,${LOCALBASE}/lib/eopenssl11"
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/eopenssl32" \
+			LDFLAGS="-L${LOCALBASE}/lib/eopenssl32 -Wl,-rpath,${LOCALBASE}/lib/eopenssl32"
 SEPARATE_BUILD=		Yes
 
 MULTI_PACKAGES=		-main -client