[Pkg-nagios-changes] [pkg-nagios-plugins] 292/413: fix multiple labels

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins.

commit 117e9973f7639dfb134c7c563f52053f55aa38ba
Author: Jan Wagner <waja at cyconet.org>
Date:   Fri Feb 24 00:52:05 2012 +0000

    fix multiple labels
---
 debian/changelog                           |  2 ++
 debian/patches/00list                      |  1 +
 debian/patches/04_check_snmp_labels.dpatch | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 599646b..6e6a630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ nagios-plugins (1.4.15-6) UNRELEASED; urgency=low
   * Add build-arch and build-indep targets to debian/rules
   * Add 03_check_disk_smb_perfdata.dpatch to add perfdata to check_disk_smb
    (Closes: #654259), thanks to G. Leimua
+  * Add 04_check_snmp_labels.dpatch to fix multiple labels in check_snmp
+   (Closes: #647020), thanks to Oskar Liljeblad
 
  -- Jan Wagner <waja at cyconet.org>  Wed, 07 Sep 2011 15:33:55 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index d1bc21d..cae78e8 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,6 @@
 01_subst.in.dpatch
 02_check_icmp_links.dpatch
+04_check_snmp_labels.dpatch
 # commited upstream
 05_check_linux_raid_fix_striped.dpatch
 10_check_disk_smb_spaces.dpatch
diff --git a/debian/patches/04_check_snmp_labels.dpatch b/debian/patches/04_check_snmp_labels.dpatch
new file mode 100755
index 0000000..88a1d31
--- /dev/null
+++ b/debian/patches/04_check_snmp_labels.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_check_snmp_labels.dpatch by Oskar Liljeblad <oskar at osk.mine.nu>
+##
+## DP: check_snmp: fix multiple labels. (http://bugs.debian.org/647020)
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-plugins-1.4.15~/plugins/check_snmp.c nagios-plugins-1.4.15/plugins/check_snmp.c
+--- nagios-plugins-1.4.15~/plugins/check_snmp.c	2010-07-27 22:47:16.000000000 +0200
++++ nagios-plugins-1.4.15/plugins/check_snmp.c	2012-02-24 01:08:16.000000000 +0100
+@@ -753,7 +753,7 @@
+ 					if (labels == NULL)
+ 						die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
+ 				}
+-				labels++;
++				nlabels++;
+ 				ptr = thisarg (ptr);
+ 				if (strstr (ptr, "'") == ptr)
+ 					labels[nlabels - 1] = ptr + 1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git