From b954470fdaa0bcd8e23a295e452f97326394c2fc Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Mon, 2 Sep 2013 15:06:54 +0000 Subject: [PATCH 01/21] build against libfreeradius-client-dev --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3ee26c6..877fed6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ nagios-plugins (1.4.16+git20130827-1) UNRELEASED; urgency=low - Extend debian/README.source - Add debian/bin/repack.sh * Updating standards version to 3.9.4 (no changes needed) + * Add libfreeradius-client-dev to build-deps and remove libradiusclient-ng-dev + (Closes: #721621) -- Jan Wagner Fri, 23 Aug 2013 22:45:43 +0200 diff --git a/debian/control b/debian/control index 66d2016..5b98029 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: extra Maintainer: Debian Nagios Maintainer Group Uploaders: Jan Wagner , Alexander Wirt -Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), perl, autotools-dev, libdbi-dev, libldap2-dev, libpq-dev, libmysqlclient-dev | libmysqlclient16-dev | libmysqlclient15-dev, libradiusclient-ng-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk, hardening-wrapper +Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), perl, autotools-dev, libdbi-dev, libldap2-dev, libpq-dev, libmysqlclient-dev | libmysqlclient16-dev | libmysqlclient15-dev, libfreeradius-client-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk, hardening-wrapper Homepage: http://nagiosplug.sourceforge.net Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-nagios/nagios-plugins/ Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-plugins/trunk/ From d89094ad8df00624b3afcb1a7488893969481bb3 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Mon, 2 Sep 2013 20:11:33 +0000 Subject: [PATCH 02/21] contrib/ is dropped in latest upstream scm --- debian/bin/repack.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/bin/repack.sh b/debian/bin/repack.sh index b9d0937..a559386 100755 --- a/debian/bin/repack.sh +++ b/debian/bin/repack.sh @@ -27,10 +27,9 @@ srcdir="$tdir/$distdir" sed -i 's/perlmods\/Makefile\ //' $srcdir/configure sed -i '/perlmods\/Makefile/d' $srcdir/configure #echo "Adjusting $srcdir/Makefile*" -sed -i 's/\ contrib\ / /' $srcdir/Makefile* sed -i 's/perlmods\ //' $srcdir/Makefile* -#echo "Removing $srcdir/perlmods/ and $srcdir/contrib/" -rm -rf $srcdir/perlmods/ $srcdir/contrib/ +#echo "Removing $srcdir/perlmods/ +rm -rf $srcdir/perlmods/ #tarball=$(echo $tarball|sed 's/\.orig\.tar\.gz/+dfsg.orig.tar.gz/') tar -cof "${tarball/.gz}" -C $tdir/ $distdir From a2aa72a50749b736c56e7c170d20fcf6fa2a6067 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 3 Sep 2013 12:22:33 +0000 Subject: [PATCH 03/21] make backporting easier --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5b98029..bb9b230 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: extra Maintainer: Debian Nagios Maintainer Group Uploaders: Jan Wagner , Alexander Wirt -Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), perl, autotools-dev, libdbi-dev, libldap2-dev, libpq-dev, libmysqlclient-dev | libmysqlclient16-dev | libmysqlclient15-dev, libfreeradius-client-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk, hardening-wrapper +Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9), perl, autotools-dev, libdbi-dev, libldap2-dev, libpq-dev, libmysqlclient-dev | libmysqlclient16-dev | libmysqlclient15-dev, libfreeradius-client-dev | libradiusclient-ng-dev, libkrb5-dev, libnet-snmp-perl, procps, mawk | awk, hardening-wrapper Homepage: http://nagiosplug.sourceforge.net Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-nagios/nagios-plugins/ Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-plugins/trunk/ From a1cb4a65a28998a2bf1ca8b511eb530cef8887fd Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 3 Sep 2013 12:54:17 +0000 Subject: [PATCH 04/21] update to new snapshot --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 877fed6..433905d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nagios-plugins (1.4.16+git20130827-1) UNRELEASED; urgency=low +nagios-plugins (1.4.16+git20130902-1) UNRELEASED; urgency=low * New upstream git snapshot (5789548373) - Adjust debian/copyright From 4d4e3849e8045cd88864130167e5f09ee65d43a3 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 3 Sep 2013 12:57:10 +0000 Subject: [PATCH 05/21] contrib/ was removed upstream --- debian/changelog | 1 + debian/copyright | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 433905d..3000f73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ nagios-plugins (1.4.16+git20130902-1) UNRELEASED; urgency=low * Updating standards version to 3.9.4 (no changes needed) * Add libfreeradius-client-dev to build-deps and remove libradiusclient-ng-dev (Closes: #721621) + * Remove traces of contrib/ from debian/copyright -- Jan Wagner Fri, 23 Aug 2013 22:45:43 +0200 diff --git a/debian/copyright b/debian/copyright index ef88423..3ecad31 100644 --- a/debian/copyright +++ b/debian/copyright @@ -62,13 +62,6 @@ Files with different Licenses: build-aux/config.guess build-aux/config.sub build-aux/ltmain.sh - contrib/check_cpqarray.c - contrib/check_linux_raid.pl - contrib/check_traceroute-pure_perl.pl - contrib/check_cluster2.c - contrib/check_snmp_printer.pl - contrib/check_http-with-client-certificate.c - contrib/check_cluster.c plugins-scripts/check_mailq.pl This program is free software; you can redistribute it and/or modify From 810cf7dad3b2c3401101db8af6221e5dc21af867 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 3 Sep 2013 12:58:23 +0000 Subject: [PATCH 06/21] perlmods are removed from upstream tarball --- debian/copyright | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 3ecad31..2ab0def 100644 --- a/debian/copyright +++ b/debian/copyright @@ -171,8 +171,6 @@ Files with different Licenses: gl/Makefile.in lib/Makefile.in lib/tests/Makefile.in - perlmods/Makefile - perlmods/Makefile.in plugins/Makefile.in plugins-root/Makefile.in plugins-scripts/Makefile.in From de8a3f59e2bb8e1480a4c641193e654073ec943a Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 3 Sep 2013 13:09:53 +0000 Subject: [PATCH 07/21] command.cfg removed upstream --- debian/changelog | 2 ++ debian/nagios-plugins-common.examples | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3000f73..8172345 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ nagios-plugins (1.4.16+git20130902-1) UNRELEASED; urgency=low * Add libfreeradius-client-dev to build-deps and remove libradiusclient-ng-dev (Closes: #721621) * Remove traces of contrib/ from debian/copyright + * Remove command.cfg from examples in nagios-plugins-common, it was removed + upstream -- Jan Wagner Fri, 23 Aug 2013 22:45:43 +0200 diff --git a/debian/nagios-plugins-common.examples b/debian/nagios-plugins-common.examples index 25fc790..e69de29 100644 --- a/debian/nagios-plugins-common.examples +++ b/debian/nagios-plugins-common.examples @@ -1 +0,0 @@ -command.cfg From 02ee428065e26f248d9badeb3ebddfb8319b8ce4 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 3 Sep 2013 13:45:34 +0000 Subject: [PATCH 08/21] prepare release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8172345..6cb7ad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nagios-plugins (1.4.16+git20130902-1) UNRELEASED; urgency=low +nagios-plugins (1.4.16+git20130902-1) unstable; urgency=medium * New upstream git snapshot (5789548373) - Adjust debian/copyright @@ -21,7 +21,7 @@ nagios-plugins (1.4.16+git20130902-1) UNRELEASED; urgency=low * Remove command.cfg from examples in nagios-plugins-common, it was removed upstream - -- Jan Wagner Fri, 23 Aug 2013 22:45:43 +0200 + -- Jan Wagner Tue, 03 Sep 2013 15:13:11 +0200 nagios-plugins (1.4.16-3) unstable; urgency=medium From 7971270a6f49f7581d6b8178c14a0f2c417265cf Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 3 Sep 2013 13:47:13 +0000 Subject: [PATCH 09/21] new changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6cb7ad7..c831fd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nagios-plugins (1.4.16+git20130902-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Jan Wagner Tue, 03 Sep 2013 15:46:36 +0200 + nagios-plugins (1.4.16+git20130902-1) unstable; urgency=medium * New upstream git snapshot (5789548373) From e591e9446cca70f26a56a6f6940c856a4d142814 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 10 Sep 2013 12:02:17 +0000 Subject: [PATCH 10/21] new release --- debian/changelog | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c831fd1..4cae8ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -nagios-plugins (1.4.16+git20130902-2) UNRELEASED; urgency=low +nagios-plugins (1.4.16+git20130910-1) unstable; urgency=medium - * NOT RELEASED YET + * New upstream git snapshot (cfb50add53) + - check_tcp: Don't close connection too early + - check_http: s/--proxy_authorization/--proxy-authorization/ + - check_snmp: Initialize size_t value to 0, not NULL + - Update bundled libtool files + - check_icmp: Minor whitespace/indentation fixes + - check_icmp: Support "--help" and "--version" - -- Jan Wagner Tue, 03 Sep 2013 15:46:36 +0200 + -- Jan Wagner Tue, 10 Sep 2013 14:01:39 +0200 nagios-plugins (1.4.16+git20130902-1) unstable; urgency=medium From 0d2c622e6afb60bc05ea12272322ccf6505d867b Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 10 Sep 2013 14:21:04 +0000 Subject: [PATCH 11/21] new changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4cae8ab..308ab0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nagios-plugins (1.4.16+git20130910-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Jan Wagner Tue, 10 Sep 2013 16:13:28 +0200 + nagios-plugins (1.4.16+git20130910-1) unstable; urgency=medium * New upstream git snapshot (cfb50add53) From 014a8788e03310448305dfc502049366af54edc6 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 11 Sep 2013 10:53:38 +0000 Subject: [PATCH 12/21] new snapshot --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 308ab0d..08e86cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ -nagios-plugins (1.4.16+git20130910-2) UNRELEASED; urgency=low +nagios-plugins (1.4.16+git20130911-1) UNRELEASED; urgency=medium - * NOT RELEASED YET + * New upstream git snapshot (ca9ce71576) + - Don't mark SSL_METHOD variable as "const" + - Move global variables from .h to .c files + - Fix GCC's -Wimplicit-function-declaration warnings + - Fix GCC's -Wuninitialized warnings -- Jan Wagner Tue, 10 Sep 2013 16:13:28 +0200 From 71638fef2f6ad25acbbb010b6929905aa74d4d2d Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 11 Sep 2013 14:03:15 +0000 Subject: [PATCH 13/21] new changelog --- debian/changelog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08e86cf..494e306 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -nagios-plugins (1.4.16+git20130911-1) UNRELEASED; urgency=medium +nagios-plugins (1.4.16+git20130911-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Jan Wagner Wed, 11 Sep 2013 13:14:21 +0200 + +nagios-plugins (1.4.16+git20130911-1) unstable; urgency=medium * New upstream git snapshot (ca9ce71576) - Don't mark SSL_METHOD variable as "const" @@ -6,7 +12,7 @@ nagios-plugins (1.4.16+git20130911-1) UNRELEASED; urgency=medium - Fix GCC's -Wimplicit-function-declaration warnings - Fix GCC's -Wuninitialized warnings - -- Jan Wagner Tue, 10 Sep 2013 16:13:28 +0200 + -- Jan Wagner Wed, 11 Sep 2013 13:02:31 +0200 nagios-plugins (1.4.16+git20130910-1) unstable; urgency=medium From d18bce6b9be10f1b1e370cfaa4eadd1753fe4648 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 12 Sep 2013 23:04:30 +0000 Subject: [PATCH 14/21] new release --- debian/changelog | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 494e306..dc98c34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -nagios-plugins (1.4.16+git20130911-2) UNRELEASED; urgency=low +nagios-plugins (1.4.16+git20130912-1) unstable; urgency=medium - * NOT RELEASED YET + * New upstream git snapshot (4933146e00) (Closes: #722576) + - check_snmp: add timeout handler befor running snmpget + - check_tcp: only test ipv6 if ping6 works + - tests: sort cached settings before save + - tests: make sure tests don't hang + - check_tcp: Fix checks without --expect string + - check_tcp: Properly deal will partial recv(3)s + - Improve interface of np_expect_match() function - -- Jan Wagner Wed, 11 Sep 2013 13:14:21 +0200 + -- Jan Wagner Fri, 13 Sep 2013 00:24:22 +0200 nagios-plugins (1.4.16+git20130911-1) unstable; urgency=medium From 3a8b50890743cd9341bf08ec63de8a95f1cdcc03 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 12 Sep 2013 23:04:59 +0000 Subject: [PATCH 15/21] new changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index dc98c34..e9bffe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nagios-plugins (1.4.16+git20130912-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Jan Wagner Fri, 13 Sep 2013 01:04:28 +0200 + nagios-plugins (1.4.16+git20130912-1) unstable; urgency=medium * New upstream git snapshot (4933146e00) (Closes: #722576) From 234ee2e4fcc743c0b0618886d8f8c9b123dd4c27 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 19 Sep 2013 13:35:11 +0000 Subject: [PATCH 16/21] update changelog --- debian/changelog | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9bffe7..723400a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,14 @@ -nagios-plugins (1.4.16+git20130912-2) UNRELEASED; urgency=low +nagios-plugins (1.4.16+git20130919-1) UNRELEASED; urgency=medium - * NOT RELEASED YET + * New upstream git snapshot () + - check_pgsql: Don't exit UNKNOWN instead of OK (Closes: #723738) + - check_dhcp: fix mac address and interface number detection on solaris + - check_disk: get_fs_usage hasn't been run if using groups + - check_disk_smb: verify path to smbclient + - check_tcp: use receive timeout for checks that expect response + - check_load: add alternative uptime syntaxcheck_udp: try nc.traditional too + - check_udp: unified nc syntax + - check_fping: some fping versions set loss to 0% by mistake -- Jan Wagner Fri, 13 Sep 2013 01:04:28 +0200 From 64484aab166f83a083d9763c568cf617e0e5a953 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Fri, 20 Sep 2013 09:41:42 +0000 Subject: [PATCH 17/21] new release --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 723400a..efc6151 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -nagios-plugins (1.4.16+git20130919-1) UNRELEASED; urgency=medium +nagios-plugins (1.4.16+git20130919-1) unstable; urgency=medium - * New upstream git snapshot () + * New upstream git snapshot (6f0366c8b8) - check_pgsql: Don't exit UNKNOWN instead of OK (Closes: #723738) - check_dhcp: fix mac address and interface number detection on solaris - check_disk: get_fs_usage hasn't been run if using groups @@ -10,7 +10,7 @@ nagios-plugins (1.4.16+git20130919-1) UNRELEASED; urgency=medium - check_udp: unified nc syntax - check_fping: some fping versions set loss to 0% by mistake - -- Jan Wagner Fri, 13 Sep 2013 01:04:28 +0200 + -- Jan Wagner Fri, 20 Sep 2013 11:40:38 +0200 nagios-plugins (1.4.16+git20130912-1) unstable; urgency=medium From 0fe5192960f46faf93bbbf8254b335951def2eca Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Fri, 20 Sep 2013 09:48:00 +0000 Subject: [PATCH 18/21] new changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index efc6151..9737d66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nagios-plugins (1.4.16+git20130919-2) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Jan Wagner Fri, 20 Sep 2013 11:47:08 +0200 + nagios-plugins (1.4.16+git20130919-1) unstable; urgency=medium * New upstream git snapshot (6f0366c8b8) From d5c563aa3f91fe372a48ebc0ff0ac6687332baeb Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Fri, 27 Sep 2013 14:54:42 +0000 Subject: [PATCH 19/21] prepare release --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9737d66..b0928fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -nagios-plugins (1.4.16+git20130919-2) UNRELEASED; urgency=low +nagios-plugins (1.4.16+git20130926-1) unstable; urgency=medium - * NOT RELEASED YET + * New upstream git snapshot (d4c5730464) + - check_http: Die on SSL initialization errors + - several updates to the upstream README - -- Jan Wagner Fri, 20 Sep 2013 11:47:08 +0200 + -- Jan Wagner Fri, 27 Sep 2013 16:45:44 +0200 nagios-plugins (1.4.16+git20130919-1) unstable; urgency=medium From 700e626c42378a3461abff07c76225fa79f3297f Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Fri, 27 Sep 2013 15:16:37 +0000 Subject: [PATCH 20/21] new changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b0928fc..4a9878d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nagios-plugins (1.5.0-1) UNRELEASED; urgency=low + + * NOT RELEASED YET + + -- Jan Wagner Mon, 30 Sep 2013 16:54:18 +0200 + nagios-plugins (1.4.16+git20130926-1) unstable; urgency=medium * New upstream git snapshot (d4c5730464) From 73ce8b5d0664e7cd532b9faf94c49c548ffb6ffb Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 2 Oct 2013 18:14:10 +0000 Subject: [PATCH 21/21] new release --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4a9878d..f18b28e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -nagios-plugins (1.5.0-1) UNRELEASED; urgency=low +nagios-plugins (1.5-1) unstable; urgency=medium - * NOT RELEASED YET + * New upstream release - -- Jan Wagner Mon, 30 Sep 2013 16:54:18 +0200 + -- Jan Wagner Wed, 02 Oct 2013 20:03:31 +0200 nagios-plugins (1.4.16+git20130926-1) unstable; urgency=medium