From nobody Sat Dec 21 01:25:12 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YFRRY1grxz5hKpS; Sat, 21 Dec 2024 01:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YFRRX1fgpz4sSM; Sat, 21 Dec 2024 01:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734744312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1MLmiT92UAsRFtNTGfe/D2s2+Hn7O1YlNr0wFzwf/i0=; b=UtiJZ1CZecWsFOw3VPw3DyDNcUECByyo1tUM73XNRTXaMU/dO9lF5VkLpimqg/ZtVLnr6U EZ0zBF+pgFJJWfJFso9QuSwsH+kOS8GuyHip7XYY7GAK1PqvPByo8xjGzqv3LH6xj9vKwQ qU9dK0dEeIHUvzr8WAyDY7uGXytxJmhcCZSswZjjxE6X9QcFI/G/saUrdTyORPa8RhBgta bBlDBziiwU7FPW3LxA0UescRwlwmQujvkWBcDzQ+wwJ57WLhQc8kZ+rYEo9nNi8hvQGpm3 89xmsrFTJEWQDiahyJuRwnyHQY1bGzSDmEkC1Ise63Eilf2sb2GMIcokOPuQUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734744312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1MLmiT92UAsRFtNTGfe/D2s2+Hn7O1YlNr0wFzwf/i0=; b=MSkqeWK6RlB7+zP6m+tN8KRrvq4zeQRfxt2R4kzSrz7cmTqPVPdIebiG9LwOYfWjSQz93N PvYcj/XfNkBA85E2wn1SCAruPj/V7Qd76tIN7qyFrQ+daulFzsqy5KzAjRbeLHBUZPRiwF IOJp2Tw2yWpDp4oEKEvoc5ds7YjKw2ejQxMVVw7NeBq5rkVXdml3SOrVePs5rf/xegwGGH 2qsm8tF/IJa0FsLGeuz97TLlJtE/NB3XHDsWtvSnaQ/tM/LXJ8D3qxlOEYDZ73DTQoskEL NdqxgqrKklXnJUSSLUrdZod4oqV14pnUAxNrEqfArs3ccENJsGB2QIzkzwVGVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734744312; a=rsa-sha256; cv=none; b=iATcFk63XA3N+GpVdXp0W81zYoKTlyh6QRnybFuvLao4oBWy/075sUKdTnotZD3xkEJTP4 idc7XzBSaKR/NLvEbY9sE3e5mb68OoNwWcgNTgu5I1/OhgsGrb6i2IaWgN8+ixDz3/JGs8 NRIp2ScDyBOenlBWYD+GsizXvTVLgk5tcXx+RjKfNnCkkH5VV+jXuHadAJp1n8sWTUl+Lv rkQQHBKcDKH9Zh3sITqhi2yL7EK98tgbEIbX/b79QGoi/9Wl1GVKt8n5fqBgsKqRQjydzO VU7m7vuMTqbXuBvHDkt7ktsa00UybBHYeRFNszFZ8NLF5ASl3AuCT6VOSEg1iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YFRRX1FYhz12Wd; Sat, 21 Dec 2024 01:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BL1PChh010442; Sat, 21 Dec 2024 01:25:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BL1PCrH010439; Sat, 21 Dec 2024 01:25:12 GMT (envelope-from git) Date: Sat, 21 Dec 2024 01:25:12 GMT Message-Id: <202412210125.4BL1PCrH010439@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 341271f44b9d - main - net-mgmt/nrpe: Update version 4.1.1=>4.1.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 341271f44b9d2daac042de27e5acce669481cddb Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=341271f44b9d2daac042de27e5acce669481cddb commit 341271f44b9d2daac042de27e5acce669481cddb Author: Muhammad Moinur Rahman AuthorDate: 2024-12-20 09:08:56 +0000 Commit: Muhammad Moinur Rahman 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);