[Pkg-nagios-changes] [pkg-nagios] r1996 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

tags 647020 pending
thanks

Author: waja
Date: 2012-02-24 00:52:05 +0000 (Fri, 24 Feb 2012)
New Revision: 1996

Added:
   nagios-plugins/trunk/debian/patches/04_check_snmp_labels.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
fix multiple labels

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2012-02-23 22:37:16 UTC (rev 1995)
+++ nagios-plugins/trunk/debian/changelog	2012-02-24 00:52:05 UTC (rev 1996)
@@ -11,6 +11,8 @@
   * 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
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2012-02-23 22:37:16 UTC (rev 1995)
+++ nagios-plugins/trunk/debian/patches/00list	2012-02-24 00:52:05 UTC (rev 1996)
@@ -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

Added: nagios-plugins/trunk/debian/patches/04_check_snmp_labels.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/04_check_snmp_labels.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/04_check_snmp_labels.dpatch	2012-02-24 00:52:05 UTC (rev 1996)
@@ -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;


Property changes on: nagios-plugins/trunk/debian/patches/04_check_snmp_labels.dpatch
___________________________________________________________________
Added: svn:executable
   + *