diffstat of debian/ for nagios-nrpe_2.15-1 nagios-nrpe_2.15-1ubuntu1 changelog | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ control | 5 +- rules | 7 ++- 3 files changed, 150 insertions(+), 3 deletions(-) diff -u nagios-nrpe-2.15/debian/changelog nagios-nrpe-2.15/debian/changelog --- nagios-nrpe-2.15/debian/changelog +++ nagios-nrpe-2.15/debian/changelog @@ -1,3 +1,22 @@ +nagios-nrpe (2.15-1ubuntu1) utopic; urgency=low + + [ Liam Young ] + LP: #1348142 + * Merge from Debian unstable (2.15-1). Remaining changes: + - debian/{rules,control}: Add hardening-includes to gain PIE security + builds. + * Changes gained from Debian: + - 01_nodevrandom-and-docoptions.dpatch: Patch dropped. Debian are + no longer carrying this patch and it does not seem to be needed. + 'l' is now listed as a doc option and it seems that using urandom + for seeding srand is unlikely to realistically exhaust a machines + entropy as was mentioned in Debian Bug #333552. + - debian/patches/00list: 04_weird_output.dpatch dropped + - debian/patches/05_pid_privileges.dpatch: Patch now matches debian + - debian/patches/09_noremove_pid.dpatch: Patch now matches debian + + -- Liam Young Thu, 24 Jul 2014 12:39:39 +0100 + nagios-nrpe (2.15-1) unstable; urgency=high * [f2cea9f] Imported Upstream version 2.15 @@ -18,6 +37,19 @@ -- Alexander Wirt Tue, 15 Jul 2014 18:30:36 +0200 +nagios-nrpe (2.15-0ubuntu1) trusty; urgency=medium + + * New upstream release (2.15). + * Updated patches: + - 01_nodevrandom-and-docoptions.dpatch + - 04_weird_output.dpatch + - 05_pid_privileges.dpatch + - 09_noremove_pid.dpatch + * Dropped patches (upstream): + - 08_CVE-2013-1362.dpatch + + -- Stéphane Graber Mon, 13 Jan 2014 11:34:11 -0500 + nagios-nrpe (2.13-4) unstable; urgency=low * [dcffec6] Do not remove the PID file after a connection error. @@ -25,6 +57,45 @@ -- Bernd Zeimetz Mon, 15 Jul 2013 16:07:54 +0200 +nagios-nrpe (2.13-3.1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/{rules,control}: Add hardening-includes to gain PIE security + builds. + - debian/rules: Use dpkg-buildflags. + + -- Michael Terry Tue, 29 Oct 2013 09:14:34 -0700 + +nagios-nrpe (2.13-3.1) unstable; urgency=low + + [ Ivo De Decker ] + * Non-maintainer upload. + * Remove Luk Claes from uploaders (Closes: #719636) + + [ KURASHIKI Satoru ] + * debian/patches/09_noremove_pid.dpatch: + - Do not remove the PID file after a connection error + (original patch from Hiren Patel). (Closes: #716949) + + -- Ivo De Decker Sat, 05 Oct 2013 20:23:24 +0200 + +nagios-nrpe (2.13-3ubuntu2) saucy; urgency=low + + * debian/patches/09_noremove_pid.dpatch: + - Do not remove the PID file after a connection error + (original patch from Hiren Patel). (LP: #1126890) + + -- Michael Terry Fri, 24 May 2013 17:01:05 -0400 + +nagios-nrpe (2.13-3ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/{rules,control}: Add hardening-includes to gain PIE security + builds. + - debian/rules: Use dpkg-buildflags. + + -- Michael Terry Tue, 30 Apr 2013 09:24:13 -0700 + nagios-nrpe (2.13-3) unstable; urgency=high * [e55afd1] Add 08_CVE-2013-1362.dpatch patch. @@ -36,6 +107,15 @@ -- Alexander Wirt Sat, 09 Mar 2013 08:42:05 +0100 +nagios-nrpe (2.13-2ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/{rules,control}: Add hardening-includes to gain PIE security + builds. + - debian/rules: Use dpkg-buildflags. + + -- Logan Rosen Sun, 24 Feb 2013 15:29:43 -0500 + nagios-nrpe (2.13-2) unstable; urgency=high [ Thijs Kinkhorst ] @@ -43,6 +123,15 @@ -- Alexander Wirt Mon, 11 Feb 2013 17:45:20 +0100 +nagios-nrpe (2.13-1ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/{rules,control}: Add hardening-includes to gain PIE security + builds. + - debian/rules: Use dpkg-buildflags. + + -- Logan Rosen Sat, 02 Feb 2013 18:16:48 -0500 + nagios-nrpe (2.13-1) unstable; urgency=low * [3e113b5] Imported Upstream version 2.13 @@ -52,6 +141,29 @@ -- Alexander Wirt Sat, 30 Jun 2012 11:08:22 +0200 +nagios-nrpe (2.12-6ubuntu2) quantal; urgency=low + + * Fixed compiler hardening configuration. (LP: #1000379) + + -- Bryan D. Payne Wed, 16 May 2012 17:29:52 +0000 + +nagios-nrpe (2.12-6ubuntu1) quantal; urgency=low + + [ Dmitrijs Ledkovs ] + * Merge with Debian; remaining changes: + - debian/{rules,control}: add hardening-includes to gain PIE + security builds. + - Use dpkg-buildflags. + * Changes gained from Debian: + - [4dc53fb] Use retry argument for start-stop-daemon when stopping nrpe + (LP: #896388) + + [ Stéphane Graber ] + * Drop useless diff file in source package (xxx) that was added by + mistake in a previous merge. + + -- Stéphane Graber Thu, 03 May 2012 09:55:10 -0400 + nagios-nrpe (2.12-6) unstable; urgency=low * [36b1062] Add add icinga to the list of recommends @@ -61,6 +173,15 @@ -- Alexander Wirt Mon, 30 Apr 2012 09:25:45 +0200 +nagios-nrpe (2.12-5ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + - debian/{rules,control}: add hardening-includes to gain PIE + security builds. + * Use dpkg-buildflags. + + -- Matthias Klose Tue, 18 Oct 2011 15:09:21 +0200 + nagios-nrpe (2.12-5) unstable; urgency=low [ Alexander Wirt ] @@ -85,6 +206,26 @@ -- Alexander Wirt Sun, 25 Sep 2011 08:35:48 +0200 +nagios-nrpe (2.12-4ubuntu3) oneiric; urgency=low + + * Configure with --with-ssl-lib=. LP: #829434. + + -- Matthias Klose Thu, 25 Aug 2011 21:10:45 +0200 + +nagios-nrpe (2.12-4ubuntu2) oneiric; urgency=low + + * Rebuild for OpenSSL 1.0.0. + + -- Colin Watson Tue, 17 May 2011 12:16:15 +0100 + +nagios-nrpe (2.12-4ubuntu1) lucid; urgency=low + + * debian/{rules,control}: add hardening-includes to gain PIE + security builds. + * debian/control: Update maintainer according to spec. + + -- Chuck Short Thu, 07 Jan 2010 14:31:00 -0500 + nagios-nrpe (2.12-4) unstable; urgency=low * Build against libwrap0-dev (Closes: #412705) diff -u nagios-nrpe-2.15/debian/control nagios-nrpe-2.15/debian/control --- nagios-nrpe-2.15/debian/control +++ nagios-nrpe-2.15/debian/control @@ -1,9 +1,10 @@ Source: nagios-nrpe Section: net Priority: optional -Maintainer: Debian Nagios Maintainer Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Nagios Maintainer Group Uploaders: sean finney , Jason Thomas , Alexander Wirt -Build-Depends: debhelper (>= 9), openssl, dpatch (>= 2.0.32~), libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1) +Build-Depends: debhelper (>= 9), openssl, dpatch (>= 2.0.32~), libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1), hardening-includes Standards-Version: 3.9.5 Package: nagios-nrpe-server diff -u nagios-nrpe-2.15/debian/rules nagios-nrpe-2.15/debian/rules --- nagios-nrpe-2.15/debian/rules +++ nagios-nrpe-2.15/debian/rules @@ -6,11 +6,16 @@ # Include dpatch stuff. include /usr/share/dpatch/dpatch.make +include /usr/share/hardening-includes/hardening.make +CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(HARDENING_CFLAGS) +CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(HARDENING_CFLAGS) +LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) $(HARDENING_LDFLAGS) + %: dh $@ --with dpatch,autotools_dev override_dh_auto_configure: - ./configure \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \ --prefix=/usr \ --enable-ssl \ --with-ssl-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \