git: 341271f44b9d - main - net-mgmt/nrpe: Update version 4.1.1=>4.1.2

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=341271f44b9d2daac042de27e5acce669481cddb

commit 341271f44b9d2daac042de27e5acce669481cddb
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-12-20 09:08:56 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-12-21 01:08:10 +0000

    net-mgmt/nrpe: Update version 4.1.1=>4.1.2
    
    - Pet portlint
    
    Changelog: https://github.com/NagiosEnterprises/nrpe/releases/tag/nrpe-4.1.2
---
 net-mgmt/nrpe/Makefile                        |  2 +-
 net-mgmt/nrpe/distinfo                        |  6 +++---
 net-mgmt/nrpe/files/patch-include_common.h.in |  9 +++++----
 net-mgmt/nrpe/files/patch-src_check__nrpe.c   | 11 -----------
 net-mgmt/nrpe/files/patch-src_nrpe.c          | 11 -----------
 net-mgmt/nrpe/files/patch-src_ssl.c           | 20 ++++++++++++++++++++
 6 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/net-mgmt/nrpe/Makefile b/net-mgmt/nrpe/Makefile
index 24fcfe850693..31b1019347f5 100644
--- a/net-mgmt/nrpe/Makefile
+++ b/net-mgmt/nrpe/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nrpe
-DISTVERSION=	4.1.1
 DISTVERSIONPREFIX=	nrpe-
+DISTVERSION=	4.1.2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/net-mgmt/nrpe/distinfo b/net-mgmt/nrpe/distinfo
index a9c2087be995..d8f5c56c462e 100644
--- a/net-mgmt/nrpe/distinfo
+++ b/net-mgmt/nrpe/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722626850
-SHA256 (NagiosEnterprises-nrpe-nrpe-4.1.1_GH0.tar.gz) = ba97734d39cf67a70a7c517d7d62c57df08395df643984cac827819b5d179dae
-SIZE (NagiosEnterprises-nrpe-nrpe-4.1.1_GH0.tar.gz) = 528280
+TIMESTAMP = 1734685107
+SHA256 (NagiosEnterprises-nrpe-nrpe-4.1.2_GH0.tar.gz) = 6ec51ab8367db5255ed3838b16592fe989cf192ec35e7a6e8a2ec977386093f4
+SIZE (NagiosEnterprises-nrpe-nrpe-4.1.2_GH0.tar.gz) = 527136
diff --git a/net-mgmt/nrpe/files/patch-include_common.h.in b/net-mgmt/nrpe/files/patch-include_common.h.in
index 00616801dbfc..89c5cc1e2f3a 100644
--- a/net-mgmt/nrpe/files/patch-include_common.h.in
+++ b/net-mgmt/nrpe/files/patch-include_common.h.in
@@ -1,14 +1,15 @@
---- include/common.h.in.orig	2022-07-18 19:27:53 UTC
+--- include/common.h.in.orig	2024-12-09 19:48:48 UTC
 +++ include/common.h.in
-@@ -34,10 +34,15 @@
- # define OPENSSL_NO_DEPRECATED
- #endif
+@@ -30,11 +30,16 @@
+ 
+ #ifdef HAVE_SSL
  #include <@SSL_INC_PREFIX@@SSL_HDR@>
 +#include <@SSL_INC_PREFIX@crypto.h>
  # ifdef SSL_TYPE_openssl
  #  include <@SSL_INC_PREFIX@err.h>
  #  include <@SSL_INC_PREFIX@rand.h>
  #  include <@SSL_INC_PREFIX@engine.h>
+ #  include <@SSL_INC_PREFIX@evp.h>
 +#  include <@SSL_INC_PREFIX@crypto.h>
 +#  if defined (LIBRESSL_VERSION_NUMBER)
 +#   include <@SSL_INC_PREFIX@opensslfeatures.h>
diff --git a/net-mgmt/nrpe/files/patch-src_check__nrpe.c b/net-mgmt/nrpe/files/patch-src_check__nrpe.c
deleted file mode 100644
index 4e3fe9480fed..000000000000
--- a/net-mgmt/nrpe/files/patch-src_check__nrpe.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/check_nrpe.c.orig	2022-07-18 19:27:53 UTC
-+++ src/check_nrpe.c
-@@ -899,7 +899,7 @@ void setup_ssl()
- 			exit(timeout_return_code);
- 		}
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- 
- 	SSL_CTX_set_max_proto_version(ctx, 0);
- 
diff --git a/net-mgmt/nrpe/files/patch-src_nrpe.c b/net-mgmt/nrpe/files/patch-src_nrpe.c
deleted file mode 100644
index 912e70f7e3ea..000000000000
--- a/net-mgmt/nrpe/files/patch-src_nrpe.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/nrpe.c.orig	2022-07-18 19:27:53 UTC
-+++ src/nrpe.c
-@@ -357,7 +357,7 @@ void init_ssl(void)
- 		exit(STATE_CRITICAL);
- 	}
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- 
- 	SSL_CTX_set_max_proto_version(ctx, 0);
- 
diff --git a/net-mgmt/nrpe/files/patch-src_ssl.c b/net-mgmt/nrpe/files/patch-src_ssl.c
new file mode 100644
index 000000000000..3a66e8d90072
--- /dev/null
+++ b/net-mgmt/nrpe/files/patch-src_ssl.c
@@ -0,0 +1,20 @@
+--- src/ssl.c.orig	2024-12-20 09:06:19 UTC
++++ src/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);