[Pkg-nagios-changes] [pkg-nrpe] 01/04: Fix 11_reproducible_dh.h.patch to not leave USE_SSL_DH undefined.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pkg-nrpe.

commit ea007978455c897544894369f8a51086e6730355
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 6 14:31:04 2017 +0200

    Fix 11_reproducible_dh.h.patch to not leave USE_SSL_DH undefined.
    
    Thanks to Johan Carlquist for pointing out this issue.
---
 debian/changelog                          |  7 +++++++
 debian/patches/11_reproducible_dh.h.patch | 27 +++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a56f6d0..505a7b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nagios-nrpe (3.2.0-2) UNRELEASED; urgency=medium
+
+  * Fix 11_reproducible_dh.h.patch to not leave USE_SSL_DH undefined.
+    Thanks to Johan Carlquist for pointing out this issue.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 06 Jul 2017 14:29:25 +0200
+
 nagios-nrpe (3.2.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/11_reproducible_dh.h.patch b/debian/patches/11_reproducible_dh.h.patch
index 7eb4a22..605fb1a 100644
--- a/debian/patches/11_reproducible_dh.h.patch
+++ b/debian/patches/11_reproducible_dh.h.patch
@@ -59,14 +59,21 @@ Forwarded: not-needed
 +    }
 +    return dh;
 +}
---- a/configure.ac
-+++ b/configure.ac
-@@ -313,7 +313,7 @@ AC_ARG_WITH([need_dh],
- dnl Optional SSL library and include paths
- if test x$check_for_ssl = xyes; then
- 	# need_dh should only be set for NRPE
--	need_dh=yes
-+	need_dh=no
- 	AC_NAGIOS_GET_SSL
- fi
+--- a/macros/ax_nagios_get_ssl
++++ b/macros/ax_nagios_get_ssl
+@@ -288,15 +288,7 @@ if test x$SSL_TYPE != xNONE; then
+ 		# Find the openssl program
  
+ 		if test x$need_dh = xyes; then
+-			AC_PATH_PROG(sslbin,openssl,value-if-not-found,$ssl_dir/sbin$PATH_SEPARATOR$ssl_dir/bin$PATH_SEPARATOR$PATH)
+ 			AC_DEFINE(USE_SSL_DH)
+-			# Generate DH parameters
+-			if test -f "$sslbin"; then
+-				echo ""
+-				echo "*** Generating DH Parameters for SSL/TLS ***"
+-				# awk to strip off meta data at bottom of dhparam output
+-				$sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h
+-			fi
+ 		fi
+ 	fi
+ fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nrpe.git