Package: nagios-nrpe Version: 2.15-1 Severity: wishlist Tags: patch Hi,
I fixed some lintian warnings, enabled hardening, and ran wrap-and-sort. The individual patches are attached. Feel free to pick the patches you like and drop the others. Cheers, Benjamin
>From b4dd0ea94d6597406e5225f995370c01f66bc32a Mon Sep 17 00:00:00 2001 From: Benjamin Drung <benjamin.dr...@profitbricks.com> Date: Tue, 29 Jul 2014 18:04:22 +0200 Subject: [PATCH 4/4] Run wrap-and-sort --- debian/control | 15 ++++++++++----- debian/copyright | 8 +++----- debian/nagios-nrpe-plugin.install | 2 +- debian/nagios-nrpe-server.install | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/control b/debian/control index 50b154a..e2b9246 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,20 @@ Source: nagios-nrpe Section: net Priority: optional Maintainer: Debian Nagios Maintainer Group <pkg-nagios-de...@lists.alioth.debian.org> -Uploaders: sean finney <sean...@debian.org>, Jason Thomas <ja...@debian.org>, Alexander Wirt <formo...@debian.org> -Build-Depends: debhelper (>= 9), openssl, libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1) +Uploaders: sean finney <sean...@debian.org>, + Jason Thomas <ja...@debian.org>, + Alexander Wirt <formo...@debian.org> +Build-Depends: autotools-dev (>= 20100122.1), + debhelper (>= 9), + libssl-dev, + libwrap0-dev, + openssl Standards-Version: 3.9.5 Homepage: http://www.nagios.org Package: nagios-nrpe-server Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-3) +Depends: lsb-base (>= 3.0-3), ${misc:Depends}, ${shlibs:Depends} Pre-Depends: adduser Conflicts: nagios-nrpe-doc Recommends: nagios-plugins-basic | nagios-plugins @@ -24,7 +30,7 @@ Description: Nagios Remote Plugin Executor Server Package: nagios-nrpe-plugin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: nagios-nrpe-doc Description: Nagios Remote Plugin Executor Plugin Nagios is a host/service/network monitoring and management system. @@ -34,4 +40,3 @@ Description: Nagios Remote Plugin Executor Plugin . This is a plugin that is run on the Nagios host and is used to contact the NRPE process on remote hosts. - diff --git a/debian/copyright b/debian/copyright index 7a99a91..463059f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,10 +6,10 @@ It was downloaded from http://www.nagios.org/download/extras.php Current Debian Maintainers: The nagios packaging team http://alioth.debian.org/projects/pkg-nagios/ -Mailing-List: +Mailing-List: pkg-nagios-de...@lists.alioth.debian.org -Upstream Author: Ethan Galstad (nag...@nagios.org) +Upstream Author: Ethan Galstad (nag...@nagios.org) Copyright (c) 1999-2009 Ethan Galstad (nag...@nagios.org) @@ -23,7 +23,7 @@ the Free Software Foundation; either version 2 of the License, or On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2. -There is an exception in the sourcecode for linking against openssl: +There is an exception in the sourcecode for linking against openssl: This program is released under the GPL (see below) with the additional exemption that compiling, linking, and/or using OpenSSL is allowed. @@ -33,5 +33,3 @@ The file src/snprintf.c is Copyright 1995 by Patrick Powell This code is based on code written by Patrick Powell (papow...@astart.com) It may be used for any purpose as long as this notice remains intact on all source code distributions - - diff --git a/debian/nagios-nrpe-plugin.install b/debian/nagios-nrpe-plugin.install index 83318b8..638b4b5 100644 --- a/debian/nagios-nrpe-plugin.install +++ b/debian/nagios-nrpe-plugin.install @@ -1,2 +1,2 @@ -src/check_nrpe usr/lib/nagios/plugins/ debian/check_nrpe.cfg etc/nagios-plugins/config/ +src/check_nrpe usr/lib/nagios/plugins/ diff --git a/debian/nagios-nrpe-server.install b/debian/nagios-nrpe-server.install index 2da4764..d76d397 100644 --- a/debian/nagios-nrpe-server.install +++ b/debian/nagios-nrpe-server.install @@ -1,3 +1,3 @@ -src/nrpe usr/sbin -sample-config/nrpe.cfg etc/nagios debian/nrpe_local.cfg etc/nagios +sample-config/nrpe.cfg etc/nagios +src/nrpe usr/sbin -- 1.9.1
>From f11700356c7af0479b2695523d211b0421e29db7 Mon Sep 17 00:00:00 2001 From: Benjamin Drung <benjamin.dr...@profitbricks.com> Date: Tue, 29 Jul 2014 18:02:46 +0200 Subject: [PATCH 3/4] Set Homepage field --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 5ddef55..50b154a 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian Uploaders: sean finney <sean...@debian.org>, Jason Thomas <ja...@debian.org>, Alexander Wirt <formo...@debian.org> Build-Depends: debhelper (>= 9), openssl, libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1) Standards-Version: 3.9.5 +Homepage: http://www.nagios.org Package: nagios-nrpe-server Architecture: any -- 1.9.1
>From bb026fecde89ab03e33f49037a5ddc8fa0479588 Mon Sep 17 00:00:00 2001 From: Benjamin Drung <benjamin.dr...@profitbricks.com> Date: Tue, 29 Jul 2014 17:59:50 +0200 Subject: [PATCH 2/4] Fix copyright-refers-to-symlink-license --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 757e990..7a99a91 100644 --- a/debian/copyright +++ b/debian/copyright @@ -21,7 +21,7 @@ the Free Software Foundation; either version 2 of the License, or (at your option) any later version. On Debian systems, the complete text of the GNU General Public -License can be found in /usr/share/common-licenses/GPL. +License can be found in /usr/share/common-licenses/GPL-2. There is an exception in the sourcecode for linking against openssl: -- 1.9.1
>From b41f9659a14c782cc50a7a69bd346a3554c12797 Mon Sep 17 00:00:00 2001 From: Benjamin Drung <benjamin.dr...@profitbricks.com> Date: Tue, 29 Jul 2014 17:58:32 +0200 Subject: [PATCH 1/4] Use dh_auto_configure to enable default hardening flags. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index df0de2e..d6605cd 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) dh $@ --with autotools_dev override_dh_auto_configure: - ./configure \ + dh_auto_configure -- \ --prefix=/usr \ --enable-ssl \ --with-ssl-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \ -- 1.9.1
