Imported Debian patch 3.1.1-1

debian/README.Debian

@@ -1,9 +1,9 @@
-nrpe
+NRPE
 ----
 
 Put any local check command you need into /etc/nagios/nrpe_local.cfg or
 as a *.cfg file in /etc/nagios/nrpe.d/
-This files are included from the /etc/nagios/nrpe.cfg
+These files are included from the /etc/nagios/nrpe.cfg
 
 This package is built without support for command argument processing. If you
 want to enable it, you will have to rebuild this package with

debian/changelog

@@ -1,3 +1,31 @@
+nagios-nrpe (3.1.1-1) unstable; urgency=medium
+
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 18 Jun 2017 13:39:05 +0200
+
+nagios-nrpe (3.1.1-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Drop format-security.patch, applied upstream.
+  * Use --with-need-dh=no configure option instead of patch.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 27 May 2017 10:57:03 +0200
+
+nagios-nrpe (3.1.0-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+    (closes: #849417, #445976, #691328)
+  * Fix typo in manpage.
+    (closes: #856658)
+  * Drop 10_reproducible_build.patch, applied upstream.
+    Refresh remaining patches.
+  * Update build dependency for OpenSSL 1.1.0.
+    (closes: #859223)
+  * Add patch to fix FTBFS with -Werror=format-security.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 19 Apr 2017 19:28:05 +0200
+
 nagios-nrpe (3.0.1-3) unstable; urgency=medium
 
   * Add reload command to systemd service file.

debian/control

@@ -6,7 +6,7 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                dh-systemd,
-               libssl1.0-dev | libssl-dev,
+               libssl-dev,
                libwrap0-dev,
                openssl
 Standards-Version: 3.9.8

debian/nrpe.8

@@ -45,7 +45,7 @@ command execution requests from the check_nrpe plugin on the Nagios host.
 .TP
   \fB\-d \-s\fR          =    Run as a subsystem under AIX
 .TP
-  \fB\-d\fR             =    Don't fork() for systemd, launchd, etc.
+  \fB\-f\fR             =    Don't fork() for systemd, launchd, etc.
 .PP
 Notes:
 This program is designed to process requests from the check_nrpe

debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch

@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/sample-config/nrpe.cfg.in
 +++ b/sample-config/nrpe.cfg.in
-@@ -301,3 +301,14 @@ command[check_total_procs]=@pluginsdir@/
+@@ -317,3 +317,14 @@ command[check_total_procs]=@pluginsdir@/
  #command[check_load]=@pluginsdir@/check_load -w $ARG1$ -c $ARG2$
  #command[check_disk]=@pluginsdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
  #command[check_procs]=@pluginsdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$

debian/patches/10_reproducible_build.patch

@@ -1,24 +0,0 @@
-Description: Make the build reproducible.
-Author: Chris Lamb <lamby@debian.org>
-Bug-Debian: https://bugs.debian.org/834857
-Forwarded: https://github.com/NagiosEnterprises/nrpe/pull/78
-Applied-Upstream: https://github.com/NagiosEnterprises/nrpe/commit/c6ca9766cae19bc194efa68ed85999e9c9756422
-
---- a/update-version
-+++ b/update-version
-@@ -20,11 +20,11 @@ fi
- 
- # Get date (two formats)
- if [ -n "$2" ]; then
--    LONGDATE=`date -d "$2" "+%B %d, %Y"`
--    SHORTDATE=`date -d "$2" "+%m-%d-%Y"`
-+    LONGDATE=$(LC_ALL=C date -u -d "$2" "+%B %d, %Y")
-+    SHORTDATE=$(date -u -d "$2" "+%m-%d-%Y")
- else
--    LONGDATE=`date "+%B %d, %Y"`
--    SHORTDATE=`date "+%m-%d-%Y"`
-+    LONGDATE=$(LC_ALL=C date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%B %d, %Y")
-+    SHORTDATE=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%m-%d-%Y")
- fi
- 
- # Current version number

debian/patches/11_reproducible_dh.h.patch

@@ -1,60 +0,0 @@
-Description: Use pre-generated dh.h for reproducible builds.
-Author: Bas Couwenberg <sebastic@debian.org>
-Bug-Debian: https://bugs.debian.org/834857
-Forwarded: not-needed
-
---- /dev/null
-+++ b/include/dh.h
-@@ -0,0 +1,41 @@
-+#ifndef HEADER_DH_H
-+#include <openssl/dh.h>
-+#endif
-+DH *get_dh2048()
-+	{
-+	static unsigned char dh2048_p[]={
-+		0xE9,0x3C,0xF4,0xCE,0x63,0x0A,0x57,0x9A,0xD1,0x34,0x74,0xA1,
-+		0x3E,0xC3,0x93,0xB5,0x50,0x36,0x56,0x87,0x9F,0x8F,0xBC,0x74,
-+		0x15,0x03,0x1D,0x00,0x45,0xB0,0x2F,0xA3,0x2C,0xC1,0x13,0xFF,
-+		0x6C,0xF1,0xDB,0x36,0xB5,0xB5,0x49,0x2D,0x6A,0x8D,0x55,0xA1,
-+		0xE6,0x4C,0xD1,0xA9,0x07,0x24,0xC4,0xDF,0x3A,0x2A,0x9E,0xDB,
-+		0x4A,0x23,0xAD,0x56,0x79,0xA3,0x3D,0xC4,0xAD,0xE0,0x3E,0x17,
-+		0x3B,0x43,0x0F,0xB6,0x83,0xE4,0x52,0xFD,0x6D,0x74,0x03,0xB3,
-+		0x29,0x26,0xF2,0x29,0x0A,0xA2,0x33,0x56,0x0C,0x16,0xF7,0x81,
-+		0xBF,0xDC,0xB8,0xCE,0x78,0xC1,0x73,0xD6,0x48,0x54,0x2D,0x98,
-+		0xA5,0x7A,0xE3,0x38,0x8E,0x3D,0x75,0xDB,0x92,0x4D,0x76,0xC1,
-+		0xCD,0xE7,0x27,0xEE,0x09,0x89,0xFA,0xCE,0x7A,0xD6,0xDC,0x5B,
-+		0x08,0x6B,0xE8,0x7E,0x37,0x7B,0x40,0x89,0x72,0xBD,0x4E,0xF4,
-+		0x9A,0xDC,0x94,0xA3,0x7D,0x4C,0x15,0xE4,0xE1,0xA8,0x8D,0xF9,
-+		0xB2,0xF0,0x02,0x40,0x39,0x6C,0xDD,0x37,0x08,0xC1,0xE8,0x0B,
-+		0xAD,0x16,0x24,0x81,0x5F,0x24,0xD9,0x65,0x71,0x34,0x78,0xF3,
-+		0xFE,0x35,0xE0,0x20,0xFF,0x6D,0x41,0xE7,0xC8,0x8E,0x58,0x59,
-+		0x24,0x01,0x9A,0xC8,0xA7,0x8D,0x48,0x43,0x8E,0x34,0x7C,0xC1,
-+		0xB4,0xC8,0xD0,0x9C,0xBD,0xEA,0x83,0xC7,0xC9,0x86,0xFC,0xD1,
-+		0xA7,0xAF,0x5C,0x99,0x98,0xD1,0x82,0x78,0xE4,0xA4,0x1C,0xB5,
-+		0x87,0x72,0xD8,0x38,0x48,0x60,0xAE,0xCB,0x92,0xA2,0x79,0xFC,
-+		0x8F,0x1D,0x94,0xB5,0x88,0xA5,0xA4,0xE1,0xF5,0x98,0xBA,0xB2,
-+		0x06,0x22,0xA8,0x1B,
-+		};
-+	static unsigned char dh2048_g[]={
-+		0x02,
-+		};
-+	DH *dh;
-+
-+	if ((dh=DH_new()) == NULL) return(NULL);
-+	dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-+	dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-+	if ((dh->p == NULL) || (dh->g == NULL))
-+		{ DH_free(dh); return(NULL); }
-+	return(dh);
-+	}
---- a/configure.ac
-+++ b/configure.ac
-@@ -307,7 +307,7 @@ AC_ARG_ENABLE([ssl],
- 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
- 

debian/patches/series

@@ -1,4 +1,2 @@
 02_nrpe.cfg_local-include_support_nrpe.d.patch
 07_warn_ssloption.patch
-10_reproducible_build.patch
-11_reproducible_dh.h.patch

debian/rules

@@ -14,9 +14,6 @@ export AUTOHEADER=true
 	    dh $@ --with autoreconf,systemd --parallel
 
 override_dh_auto_configure:
-	# Save deterministic "openssl dhparam" output.
-	cp include/dh.h include/dh.h.orig
-
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -24,12 +21,9 @@ override_dh_auto_configure:
 		--libexecdir=/usr/lib/nagios/plugins \
 		--localstatedir=/var \
 		--enable-ssl \
+		--with-need-dh=no \
 		--with-ssl-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		--with-piddir=/var/run/nagios \
-		--enable-command-args
-
-	# Restore deterministic "openssl dhparam" output.
-	cp include/dh.h.orig include/dh.h
+		--with-piddir=/var/run/nagios
 
 override_dh_auto_build:
 	dh_auto_build -- all