Package: collectd Version: 5.1.0-3 Severity: normal Tags: fixed-upstream Dear maintainer,
I've prepared an NMU for collectd (versioned as 5.1.0-4). It's a bug fix for ethstat plugin fixed in upstream (ver 5.1.1). Regards. Laurent Barbe diff -u collectd-5.1.0/debian/changelog collectd-5.1.0/debian/changelog --- collectd-5.1.0/debian/changelog +++ collectd-5.1.0/debian/changelog @@ -1,3 +1,10 @@ +collectd (5.1.0-4) unstable; urgency=low + + * debian/patches/ethstat_plugin_segfault.dpatch + - Apply upstream patch from 5.1.1 (cf. #698584) + + -- Laurent Barbe <laur...@ksperis.com> Fri, 07 Jun 2013 16:07:12 +0200 + collectd (5.1.0-3) unstable; urgency=low * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst: diff -u collectd-5.1.0/debian/patches/00list collectd-5.1.0/debian/patches/00list --- collectd-5.1.0/debian/patches/00list +++ collectd-5.1.0/debian/patches/00list @@ -5,0 +6 @@ +ethstat_plugin_segfault.dpatch only in patch2: unchanged: --- collectd-5.1.0.orig/debian/patches/ethstat_plugin_segfault.dpatch +++ collectd-5.1.0/debian/patches/ethstat_plugin_segfault.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ethstat_plugin_segfault.dpatch by <r...@wheezy.lan35.benchmark.fr> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-5.1.0~/src/ethstat.c collectd-5.1.0/src/ethstat.c +--- collectd-5.1.0~/src/ethstat.c 2012-04-02 10:04:58.000000000 +0200 ++++ collectd-5.1.0/src/ethstat.c 2013-06-07 17:12:04.638229682 +0200 +@@ -66,6 +66,7 @@ + if (tmp == NULL) + return (-1); + interfaces = tmp; ++ interfaces[interfaces_num] = NULL; + + status = cf_util_get_string (ci, interfaces + interfaces_num); + if (status != 0) +@@ -104,7 +105,7 @@ + memset (map, 0, sizeof (*map)); + + sstrncpy (map->type, ci->values[1].value.string, sizeof (map->type)); +- if (ci->values_num == 2) ++ if (ci->values_num == 3) + sstrncpy (map->type_instance, ci->values[2].value.string, + sizeof (map->type_instance)); + -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
