From 643c7923b5dde24c0ef3353af14d97a5bfc8846a Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Thu, 18 Jul 2019 13:00:45 +0200 Subject: [PATCH 01/17] Drop icinga from Suggests. --- debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 9e781f3..d8b93c4 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Standards-Version: 4.3.0 Package: monitoring-plugins Architecture: all Depends: monitoring-plugins-basic, monitoring-plugins-standard, ${misc:Depends} -Suggests: icinga | icinga2, nagios-plugins-contrib +Suggests: icinga2, nagios-plugins-contrib Provides: nagios-plugins Description: Plugins for nagios compatible monitoring systems (metapackage) Plugins for nagios compatible monitoring systems like Naemon and Icinga. @@ -38,7 +38,7 @@ Description: Plugins for nagios compatible monitoring systems (metapackage) Package: monitoring-plugins-common Architecture: any Depends: ucf, ${misc:Depends}, ${shlibs:Depends} -Suggests: icinga | icinga2 +Suggests: icinga2 Description: Common files for plugins for nagios compatible monitoring Common files for plugins for nagios compatible monitoring systems like Naemon and Icinga. @@ -55,7 +55,7 @@ Depends: inetutils-ping (>= 2:1.9-1~) [kfreebsd-any hurd-any], ${misc:Depends}, ${shlibs:Depends} Recommends: libcap2-bin [linux-any] -Suggests: icinga | icinga2 +Suggests: icinga2 Provides: nagios-plugins-basic Description: Plugins for nagios compatible monitoring systems (basic) Plugins for nagios compatible monitoring systems like Naemon and Icinga. It @@ -91,7 +91,7 @@ Recommends: bind9-host | host, sudo, ${shlibs:Recommends} Suggests: fping, - icinga | icinga2, + icinga2, postfix | sendmail-bin | exim4-daemon-heavy | exim4-daemon-light, qstat Provides: nagios-plugins-standard From ab5d5b972c9de8a2e00c05218375ed98f0328085 Mon Sep 17 00:00:00 2001 From: "Christopher Huhn, GSI" Date: Wed, 8 Apr 2020 20:41:11 +0200 Subject: [PATCH 02/17] Fix OID for snmp_users check --- debian/pluginconfig/snmp.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/pluginconfig/snmp.cfg b/debian/pluginconfig/snmp.cfg index 2be8f8e..21442ed 100644 --- a/debian/pluginconfig/snmp.cfg +++ b/debian/pluginconfig/snmp.cfg @@ -50,7 +50,7 @@ define command{ # 'snmp_users' command definition define command{ command_name snmp_users - command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemNumUsers -w :'$ARG2$' -c :'$ARG3$' -l users + command_line /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemNumUsers.0 -w :'$ARG2$' -c :'$ARG3$' -l users } From 50e7b48e3db6f666ac4d749de4a543cf58200a52 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 2 May 2020 13:37:34 +0000 Subject: [PATCH 03/17] Trim trailing whitespace. Fixes: lintian: file-contains-trailing-whitespace See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 791681b..d59b4f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ monitoring-plugins (2.2-7~1.gbp30673c) UNRELEASED; urgency=medium + [ Jan Wagner ] * UNRELEASED + [ Debian Janitor ] + * Trim trailing whitespace. + -- Jan Wagner Wed, 17 Apr 2019 08:17:55 +0200 monitoring-plugins (2.2-6) unstable; urgency=medium @@ -1543,4 +1547,3 @@ nagios-plugins (1.3.1-1) unstable; urgency=low is not so terrible -- Guido Trotter Sun, 1 Feb 2004 10:32:04 +0100 - From 9909d60aa873ba99fad9c52917bbc76fc027975e Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 2 May 2020 13:38:14 +0000 Subject: [PATCH 04/17] Wrap long lines in changelog entries: 1.4-1. Fixes: lintian: debian-changelog-line-too-long See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d59b4f5..139547c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ monitoring-plugins (2.2-7~1.gbp30673c) UNRELEASED; urgency=medium [ Debian Janitor ] * Trim trailing whitespace. + * Wrap long lines in changelog entries: 1.4-1. -- Jan Wagner Wed, 17 Apr 2019 08:17:55 +0200 @@ -1380,7 +1381,8 @@ nagios-plugins (1.4-1) unstable; urgency=low * Add check_dig command (closes: #281020) * Add check_breeze command (closes: #281019) * Add dummy commands (closes: #281018) - * Add check_mailq_ commands for all supported mtas (closes: #281016, #282015) + * Add check_mailq_ commands for all supported mtas (closes: #281016, + #282015) * Add check_spop and check_simap commands (closes: #280700) * Add check_nt command (closes: #294299) * Fix check_load command (closes: #294298) From 9ae7e55e3e3196c5634b33e039186aed9b6223fd Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 2 May 2020 13:38:52 +0000 Subject: [PATCH 05/17] Bump debhelper from deprecated 5 to 10. Fixes: lintian: package-uses-deprecated-debhelper-compat-version See-also: https://lintian.debian.org/tags/package-uses-deprecated-debhelper-compat-version.html --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 139547c..2d5e492 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ monitoring-plugins (2.2-7~1.gbp30673c) UNRELEASED; urgency=medium [ Debian Janitor ] * Trim trailing whitespace. * Wrap long lines in changelog entries: 1.4-1. + * Bump debhelper from deprecated 5 to 10. -- Jan Wagner Wed, 17 Apr 2019 08:17:55 +0200 diff --git a/debian/compat b/debian/compat index 7ed6ff8..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +10 diff --git a/debian/control b/debian/control index d8b93c4..bfe18c7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Nagios Maintainer Group Uploaders: Jan Wagner , Alexander Wirt Build-Depends: autotools-dev, - debhelper (>= 5), + debhelper (>= 10~), libdbi-dev, libradcli-dev | libfreeradius-client-dev | libradiusclient-ng-dev, libkrb5-dev, From 9cb0c3cf69802354286b6bc17487a981bbcce409 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 2 May 2020 13:39:33 +0000 Subject: [PATCH 06/17] Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from ./configure), Repository, Repository-Browse. Fixes: lintian: upstream-metadata-file-is-missing See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html Fixes: lintian: upstream-metadata-missing-bug-tracking See-also: https://lintian.debian.org/tags/upstream-metadata-missing-bug-tracking.html Fixes: lintian: upstream-metadata-missing-repository See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html --- debian/changelog | 2 ++ debian/upstream/metadata | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 2d5e492..2088db5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ monitoring-plugins (2.2-7~1.gbp30673c) UNRELEASED; urgency=medium * Trim trailing whitespace. * Wrap long lines in changelog entries: 1.4-1. * Bump debhelper from deprecated 5 to 10. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from + ./configure), Repository, Repository-Browse. -- Jan Wagner Wed, 17 Apr 2019 08:17:55 +0200 diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..a11336b --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,5 @@ +Name: monitoring-plugins +Bug-Database: https://github.com/monitoring-plugins/monitoring-plugins/issues +Bug-Submit: https://github.com/monitoring-plugins/monitoring-plugins/issues/new +Repository: https://github.com/monitoring-plugins/monitoring-plugins.git +Repository-Browse: https://github.com/monitoring-plugins/monitoring-plugins From 50e341775b8708729d4028ed45d17586846d86d4 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 2 May 2020 13:40:14 +0000 Subject: [PATCH 07/17] Rely on pre-initialized dpkg-architecture variables. Fixes: lintian: debian-rules-sets-dpkg-architecture-variable See-also: https://lintian.debian.org/tags/debian-rules-sets-dpkg-architecture-variable.html --- debian/changelog | 1 + debian/rules | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2088db5..4be3a4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ monitoring-plugins (2.2-7~1.gbp30673c) UNRELEASED; urgency=medium * Bump debhelper from deprecated 5 to 10. * Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from ./configure), Repository, Repository-Browse. + * Rely on pre-initialized dpkg-architecture variables. -- Jan Wagner Wed, 17 Apr 2019 08:17:55 +0200 diff --git a/debian/rules b/debian/rules index 72f2ac7..d613aae 100755 --- a/debian/rules +++ b/debian/rules @@ -14,9 +14,7 @@ PACKAGE = monitoring-plugins # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +include /usr/share/dpkg/architecture.mk CFLAGS = -Wall -g From f2b2a43365dba99b7435f0e01287ce4beb53efff Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 2 May 2020 13:40:52 +0000 Subject: [PATCH 08/17] Fix day-of-week for changelog entry 1.5-2. Fixes: lintian: debian-changelog-has-wrong-day-of-week See-also: https://lintian.debian.org/tags/debian-changelog-has-wrong-day-of-week.html --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4be3a4c..1421ce1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ monitoring-plugins (2.2-7~1.gbp30673c) UNRELEASED; urgency=medium * Set upstream metadata fields: Bug-Database, Bug-Submit, Name (from ./configure), Repository, Repository-Browse. * Rely on pre-initialized dpkg-architecture variables. + * Fix day-of-week for changelog entry 1.5-2. -- Jan Wagner Wed, 17 Apr 2019 08:17:55 +0200 @@ -337,7 +338,7 @@ nagios-plugins (1.5-2) unstable; urgency=medium - libfreeradius-client-dev is actually not supported by upstream - check_radius - -- Jan Wagner Thu, 02 Feb 2014 22:11:48 +0100 + -- Jan Wagner Sun, 02 Feb 2014 22:11:48 +0100 nagios-plugins (1.5-1) unstable; urgency=medium From c852ee9514a8d5c9fc497a944c8d7e4801223dca Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Sat, 2 May 2020 13:41:30 +0000 Subject: [PATCH 09/17] Update standards version to 4.5.0, no changes needed. Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1421ce1..134ffa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ monitoring-plugins (2.2-7~1.gbp30673c) UNRELEASED; urgency=medium ./configure), Repository, Repository-Browse. * Rely on pre-initialized dpkg-architecture variables. * Fix day-of-week for changelog entry 1.5-2. + * Update standards version to 4.5.0, no changes needed. -- Jan Wagner Wed, 17 Apr 2019 08:17:55 +0200 diff --git a/debian/control b/debian/control index bfe18c7..b782349 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: autotools-dev, Homepage: https://www.monitoring-plugins.org Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins Vcs-Git: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins.git -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Package: monitoring-plugins Architecture: all From 122d9b769863c9cad7cd4adc9d4125c661e01edb Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 6 Nov 2020 20:05:45 +0100 Subject: [PATCH 10/17] Bump watch file version to 4. --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index 111ca35..534f948 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 https://www.monitoring-plugins.org/download/.*-plugins-(\d+\.[\d\.a-z]+)\.tar\.gz \ debian debian/bin/repack.sh From 3c972467df91d2dd24ca7868ca473620aea7725e Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 20 Nov 2020 10:37:40 +0100 Subject: [PATCH 11/17] Update gbp.conf to use --source-only-changes by default. --- debian/gbp.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/gbp.conf b/debian/gbp.conf index 5d84e2e..b4d4e1c 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,5 @@ [git-buildpackage] postbuild = lintian --info --display-info --display-experimental --pedantic --show-overrides $GBP_CHANGES_FILE + +[buildpackage] +pbuilder-options = --source-only-changes From ed928307e433d4a5412081dee02a048128a25b23 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 20 Nov 2020 10:52:33 +0100 Subject: [PATCH 12/17] Update gbp.conf for deprecated section. --- debian/gbp.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index b4d4e1c..b5fd342 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,3 @@ -[git-buildpackage] -postbuild = lintian --info --display-info --display-experimental --pedantic --show-overrides $GBP_CHANGES_FILE - [buildpackage] +postbuild = lintian --info --display-info --display-experimental --pedantic --show-overrides $GBP_CHANGES_FILE pbuilder-options = --source-only-changes From 4890f23aa58e174c1dda070887cc6a4cc3449073 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 20 Nov 2020 10:56:30 +0100 Subject: [PATCH 13/17] Drop obsolete symlinks for icinga 1.x. --- debian/monitoring-plugins-common.links | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 debian/monitoring-plugins-common.links diff --git a/debian/monitoring-plugins-common.links b/debian/monitoring-plugins-common.links deleted file mode 100644 index 4ccd699..0000000 --- a/debian/monitoring-plugins-common.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/nagios/plugins/utils.pm usr/lib/icinga/utils.pm -usr/lib/nagios/plugins/utils.sh usr/lib/icinga/utils.sh From 6086187c0e2f5b9ddaa21755b14e00de0f8f0605 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 20 Nov 2020 10:58:00 +0100 Subject: [PATCH 14/17] Drop obsolete autotools-dev build dependency. --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index b782349..ee079ae 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: net Priority: optional Maintainer: Debian Nagios Maintainer Group Uploaders: Jan Wagner , Alexander Wirt -Build-Depends: autotools-dev, - debhelper (>= 10~), +Build-Depends: debhelper (>= 10~), libdbi-dev, libradcli-dev | libfreeradius-client-dev | libradiusclient-ng-dev, libkrb5-dev, From 1407082cddd973c8198b84a3ae457472aa3d580c Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 20 Nov 2020 10:59:34 +0100 Subject: [PATCH 15/17] Don't set CFLAGS from noopt. --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index d613aae..6add2d1 100755 --- a/debian/rules +++ b/debian/rules @@ -16,8 +16,6 @@ PACKAGE = monitoring-plugins # from having to guess our platform (since we know it already) include /usr/share/dpkg/architecture.mk -CFLAGS = -Wall -g - DEBIANDIR=$(CURDIR)/debian NP_LIBEXEC:=/usr/lib/nagios/plugins NP_COMMON_DIR:=$(DEBIANDIR)/monitoring-plugins-common From 94db0e324ed3d1ca0e5ee03b7c5d1fdba12c0741 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 20 Nov 2020 11:00:24 +0100 Subject: [PATCH 16/17] Drop obsolete ORed build dependency. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ee079ae..4c1c472 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10~), libradcli-dev | libfreeradius-client-dev | libradiusclient-ng-dev, libkrb5-dev, libldap2-dev, - default-libmysqlclient-dev | libmysqlclient-dev, + default-libmysqlclient-dev, libnet-snmp-perl, libpq-dev, libssl-dev, From 4ddc077376aa5370c5774b4fbf0efb9c7cea0b10 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sat, 28 Nov 2020 14:34:56 +0100 Subject: [PATCH 17/17] Bump Standards-Version to 4.5.1, no changes. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4c1c472..c4f9933 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10~), Homepage: https://www.monitoring-plugins.org Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins Vcs-Git: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins.git -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Package: monitoring-plugins Architecture: all