diff --git a/net-mgmt/nrpe/Makefile b/net-mgmt/nrpe/Makefile index 31b1019347f5..011ab87d0645 100644 --- a/net-mgmt/nrpe/Makefile +++ b/net-mgmt/nrpe/Makefile @@ -1,72 +1,72 @@ PORTNAME= nrpe DISTVERSIONPREFIX= nrpe- -DISTVERSION= 4.1.2 +DISTVERSION= 4.1.3 CATEGORIES= net-mgmt MAINTAINER= bofh@FreeBSD.org COMMENT?= Nagios Remote Plugin Executor WWW= https://www.nagios.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= perl5 USE_GITHUB= yes GH_ACCOUNT= NagiosEnterprises USE_PERL5= build USE_RC_SUBR= nrpe GNU_CONFIGURE= yes CONFIGURE_ARGS+=--bindir=${PREFIX}/sbin \ --libexecdir=${PREFIX}/libexec/nagios \ --sysconfdir=${PREFIX}/etc \ --with-inetd-type=inetd \ --with-nrpe-user=${NAGIOSUSER} \ --with-nrpe-group=${NAGIOSGROUP} \ --with-piddir=${NRPE_PIDDIR} SUB_FILES= pkg-message SUB_LIST+= PIDDIR=${NRPE_PIDDIR} USERS= ${NAGIOSUSER} GROUPS= ${NAGIOSGROUP} PLIST_SUB= NAGIOSUSER=${NAGIOSUSER} \ NAGIOSGROUP=${NAGIOSGROUP} \ NRPE_PIDDIR=${NRPE_PIDDIR} OPTIONS_DEFINE= SSL ARGS OPTIONS_DEFAULT=NAGPLUGINS SSL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS ARGS_DESC= Enable command argument processing MONPLUGINS_DESC=Use net-mgmt/monitoring-plugins NAGPLUGINS_DESC=Use net-mgmt/nagios-plugins ARGS_CONFIGURE_ENABLE= command-args MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins SSL_USES= ssl SSL_CONFIGURE_ENABLE= ssl SSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} ssl-inc=${OPENSSLINC} ssl-lib=${OPENSSLLIB} SSL_CFLAGS= -I${OPENSSLINC} NAGIOSUSER?= nagios NAGIOSGROUP?= nagios NRPE_PIDDIR?= /var/run/nrpe post-patch: @${REINPLACE_CMD} -e 's|/var/run/nrpe.pid|${NRPE_PIDDIR}/nrpe.pid|g' \ -e 's|/usr/lib/nagios/plugins/|${LOCALBASE}/libexec/nagios/|g' \ -e 's|/usr/bin/sudo|${LOCALBASE}/bin/sudo|g' \ ${WRKSRC}/sample-config/nrpe.cfg.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${STAGEDIR}${PREFIX}/sbin/nrpe ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios ${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${STAGEDIR}${PREFIX}/libexec/nagios/check_nrpe ${INSTALL_DATA} ${WRKSRC}/sample-config/nrpe.cfg ${STAGEDIR}${PREFIX}/etc/nrpe.cfg.sample .include diff --git a/net-mgmt/nrpe/distinfo b/net-mgmt/nrpe/distinfo index d8f5c56c462e..fac6624f160f 100644 --- a/net-mgmt/nrpe/distinfo +++ b/net-mgmt/nrpe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734685107 -SHA256 (NagiosEnterprises-nrpe-nrpe-4.1.2_GH0.tar.gz) = 6ec51ab8367db5255ed3838b16592fe989cf192ec35e7a6e8a2ec977386093f4 -SIZE (NagiosEnterprises-nrpe-nrpe-4.1.2_GH0.tar.gz) = 527136 +TIMESTAMP = 1734924763 +SHA256 (NagiosEnterprises-nrpe-nrpe-4.1.3_GH0.tar.gz) = 5e8947f61e1a4c41b6895c4d64c2dcd70cab32815cb4b49770e1c702b79ed5ed +SIZE (NagiosEnterprises-nrpe-nrpe-4.1.3_GH0.tar.gz) = 526967 diff --git a/net-mgmt/nrpe/files/patch-src_ssl.c b/net-mgmt/nrpe/files/patch-src_nrpe-ssl.c similarity index 91% rename from net-mgmt/nrpe/files/patch-src_ssl.c rename to net-mgmt/nrpe/files/patch-src_nrpe-ssl.c index 3a66e8d90072..8dbb9fbd4569 100644 --- a/net-mgmt/nrpe/files/patch-src_ssl.c +++ b/net-mgmt/nrpe/files/patch-src_nrpe-ssl.c @@ -1,20 +1,20 @@ ---- src/ssl.c.orig 2024-12-20 09:06:19 UTC -+++ src/ssl.c +--- src/nrpe-ssl.c.orig 2024-12-23 03:34:53 UTC ++++ src/nrpe-ssl.c @@ -33,7 +33,7 @@ void ssl_set_protocol_version(SslVer ssl_proto_ver, un void ssl_set_protocol_version(SslVer ssl_proto_ver, unsigned long *ssl_opts) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000 +#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) SSL_CTX_set_max_proto_version(ctx, 0); @@ -126,7 +126,7 @@ void ssl_log_startup(int server) if (server) { logit(LOG_INFO, "SSL Client Certs: %s", - sslprm.client_certs == 0 ? "Don't Ask" : + sslprm.client_certs == 0 ? "Don't Ask" : (sslprm.client_certs == 1 ? "Accept" : "Require")); } logit(LOG_INFO, "SSL Log Options: 0x%02x", sslprm.log_opts);