svn commit: r439625 - in head/net-mgmt/nrpe: . files

[Bernard Spil]

Author: brnrd
Date: Fri Apr 28 19:33:27 2017
New Revision: 439625
URL: https://svnweb.freebsd.org/changeset/ports/439625

Log:
  net-mgmt/nrpe: Use 2048-bit DH params
  
   - Add patch for DH-param generation in configure
   - Update patch switching dh512 to dh2048 for server
   - Add LICENSE
   - Fixes runtime issue when nrpe-ssl built with LibreSSL 2.5
  
  PR:		218930
  Approved by:	zeising (maintainer)

Added:
  head/net-mgmt/nrpe/files/patch-configure   (contents, props changed)
Modified:
  head/net-mgmt/nrpe/Makefile
  head/net-mgmt/nrpe/files/patch-src-nrpe.c

Modified: head/net-mgmt/nrpe/Makefile
==============================================================================
--- head/net-mgmt/nrpe/Makefile	Fri Apr 28 19:10:55 2017	(r439624)
+++ head/net-mgmt/nrpe/Makefile	Fri Apr 28 19:33:27 2017	(r439625)
@@ -10,6 +10,8 @@ MASTER_SITES=	SF/nagios/${PORTNAME}-2.x/
 MAINTAINER=	zeising at FreeBSD.org
 COMMENT?=	Nagios Remote Plugin Executor
 
+LICENSE=	GPLv2
+
 CONFLICTS=	nrpe-ssl-2.*
 
 USES=		perl5

Added: head/net-mgmt/nrpe/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/nrpe/files/patch-configure	Fri Apr 28 19:33:27 2017	(r439625)
@@ -0,0 +1,11 @@
+--- configure.orig	2013-09-06 15:27:13 UTC
++++ configure
+@@ -6745,7 +6745,7 @@ _ACEOF
+ 				sslbin=$ssldir/bin/openssl
+ 			fi
+ 			# awk to strip off meta data at bottom of dhparam output
+-			$sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h
++			$sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+ 		fi
+ 	fi
+ 

Modified: head/net-mgmt/nrpe/files/patch-src-nrpe.c
==============================================================================
--- head/net-mgmt/nrpe/files/patch-src-nrpe.c	Fri Apr 28 19:10:55 2017	(r439624)
+++ head/net-mgmt/nrpe/files/patch-src-nrpe.c	Fri Apr 28 19:33:27 2017	(r439625)
@@ -1,5 +1,5 @@
---- ./src/nrpe.c.orig	2013-09-06 17:27:13.000000000 +0200
-+++ ./src/nrpe.c	2013-10-05 17:15:33.000000000 +0200
+--- src/nrpe.c.orig	2013-09-06 15:27:13 UTC
++++ src/nrpe.c
 @@ -30,6 +30,8 @@
  #include "utils.h"
  #include "acl.h"
@@ -19,6 +19,15 @@
  
  
  int main(int argc, char **argv){
+@@ -266,7 +270,7 @@ int main(int argc, char **argv){
+ 
+ 		/* use anonymous DH ciphers */
+ 		SSL_CTX_set_cipher_list(ctx,"ADH");
+-		dh=get_dh512();
++		dh=get_dh2048();
+ 		SSL_CTX_set_tmp_dh(ctx,dh);
+ 		DH_free(dh);
+ 		if(debug==TRUE)
 @@ -969,8 +973,14 @@
  					continue;