jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nrpe: update to 4.0.2.

Browse source
This commit is contained in:
Randy McCaskill 2020-03-18 21:46:32 -04:00 committed by Juan RP
parent efb347e69f
commit 2e01d65abf
3 changed files with 54 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
srcpkgs/nrpe/patches/nrpe-3.2.1-libressl.patch
View file

@ -1,20 +0,0 @@
--- src/nrpe.c 2017-09-01 09:59:54.000000000 -0400
+++ src/nrpe.c.new 2018-10-06 20:05:28.068549927 -0400
@@ -147,7 +147,7 @@
ClntCerts client_certs;
SslLogging log_opts;
} sslprm = {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
NULL, NULL, NULL, "ALL:!MD5:@STRENGTH:@SECLEVEL=0", TLSv1_plus, TRUE, 0, SSL_NoLogging};
#else
NULL, NULL, NULL, "ALL:!MD5:@STRENGTH", TLSv1_plus, TRUE, 0, SSL_NoLogging};
@@ -445,7 +445,7 @@
} else {
/* use anonymous DH ciphers */
if (sslprm.allowDH == 2) {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
strncpy(sslprm.cipher_list, "ADH@SECLEVEL=0", MAX_FILENAME_LENGTH - 1);
#else
strncpy(sslprm.cipher_list, "ADH", MAX_FILENAME_LENGTH - 1);

50
srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch Normal file
View file

@ -0,0 +1,50 @@
--- src/nrpe.c 2020-03-11 11:40:10.000000000 -0400
+++ src/nrpe.c.new 2020-03-18 19:29:00.770969682 -0400
@@ -147,7 +147,7 @@
ClntCerts client_certs;
SslLogging log_opts;
} sslprm = {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
NULL, NULL, NULL, "ALL:!MD5:@STRENGTH:@SECLEVEL=0", TLSv1_plus, TRUE, 0, SSL_NoLogging
#else
NULL, NULL, NULL, "ALL:!MD5:@STRENGTH", TLSv1_plus, TRUE, 0, SSL_NoLogging
@@ -356,11 +356,11 @@
switch(sslprm.ssl_proto_ver) {
case TLSv1_3:
-#if OPENSSL_VERSION_NUMBER >= 0x10101000
+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
#endif
case TLSv1_3_plus:
-#if OPENSSL_VERSION_NUMBER >= 0x10101000
+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
SSL_CTX_set_min_proto_version(ctx, TLS1_3_VERSION);
break;
#endif
@@ -463,7 +463,7 @@
} else {
/* use anonymous DH ciphers */
if (sslprm.allowDH == 2) {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
strncpy(sslprm.cipher_list, "ADH@SECLEVEL=0", MAX_FILENAME_LENGTH - 1);
#else
strncpy(sslprm.cipher_list, "ADH", MAX_FILENAME_LENGTH - 1);
--- src/check_nrpe.c 2020-03-11 11:40:10.000000000 -0400
+++ src/check_nrpe.c.new 2020-03-18 19:52:05.734304117 -0400
@@ -905,11 +905,11 @@
switch(sslprm.ssl_proto_ver) {
case TLSv1_3:
-#if OPENSSL_VERSION_NUMBER >= 0x10101000
+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
#endif
case TLSv1_3_plus:
-#if OPENSSL_VERSION_NUMBER >= 0x10101000
+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
SSL_CTX_set_min_proto_version(ctx, TLS1_3_VERSION);
break;
#endif

8
srcpkgs/nrpe/template
View file

@ -1,7 +1,7 @@
# Template file for 'nrpe'
pkgname=nrpe
version=3.2.1
revision=3
version=4.0.2
revision=1
build_style=gnu-configure
configure_args="--with-pkgsysconfdir=/etc/nagios
--with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@ -13,13 +13,13 @@ makedepends="libressl-devel"
depends="monitoring-plugins"
make_dirs="/etc/nagios 0775 _nagios _nagios"
conf_files="/etc/nagios/nrpe.cfg"
system_accounts="_nagios"
short_desc="Nagios Remote Plugin Executor"
maintainer="Randy McCaskill <randy@mccaskill.us>"
license="GPL-2.0-or-later"
homepage="https://github.com/NagiosEnterprises/nrpe"
distfiles="https://github.com/NagiosEnterprises/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
checksum=8ad2d1846ab9011fdd2942b8fc0c99dfad9a97e57f4a3e6e394a4ead99c0f1f0
checksum=c5d9d7023eaa49e6fe8cf95c6d101731f07972cf0f8818fa130c171bc9eabd55
system_accounts="_nagios"
post_install() {
vsv nrpe