Package: release.debian.org User: release.debian....@packages.debian.org Usertags: unblock Severity: normal
Please allow me to add an upstream patch in order to fix segfaults in rrdtool daemon, that occurs when xport'ing an non-existent RRD file. unblock rrdtool/1.7.1-2
diff -Nru rrdtool-1.7.1/debian/changelog rrdtool-1.7.1/debian/changelog --- rrdtool-1.7.1/debian/changelog 2019-02-07 17:08:22.000000000 +0100 +++ rrdtool-1.7.1/debian/changelog 2019-05-30 22:28:06.000000000 +0200 @@ -1,3 +1,9 @@ +rrdtool (1.7.1-2) unstable; urgency=medium + + * Cherry pick commit from 1.7.2 to prevent daemon segfault. + + -- Jean-Michel Vourgère <nir...@debian.org> Thu, 30 May 2019 22:28:06 +0200 + rrdtool (1.7.1-1) unstable; urgency=medium * New upstream version (Closes: #891491, #898184): diff -Nru rrdtool-1.7.1/debian/patches/segfault-xport rrdtool-1.7.1/debian/patches/segfault-xport --- rrdtool-1.7.1/debian/patches/segfault-xport 1970-01-01 01:00:00.000000000 +0100 +++ rrdtool-1.7.1/debian/patches/segfault-xport 2019-05-30 22:28:06.000000000 +0200 @@ -0,0 +1,21 @@ +From: themylogin <themylo...@gmail.com> +Subject: fix segfault on non-existent RRD file when using rrdcached + fix segfault on non-existent RRD file when using rrdcached + rrdtool xport + (like 814ca69 does for rrdtool graph) +Applied-Upstream: https://github.com/oetiker/rrdtool-1.x/commit/24b922a2eae193d5d44c01a75786aca4b277a4db +Date: Wed, 27 Mar 2019 18:09:55 +0100 +Reviewed-by: Tobias Oetiker <t...@oetiker.ch> + +Index: rrdtool/src/rrd_xport.c +=================================================================== +--- rrdtool.orig/src/rrd_xport.c ++++ rrdtool/src/rrd_xport.c +@@ -231,7 +231,7 @@ static int rrd_xport_fn( + + + /* pull the data from the rrd files ... */ +- if (data_fetch(im) == -1) ++ if (data_fetch(im) != 0) + return -1; + + /* evaluate CDEF operations ... */ diff -Nru rrdtool-1.7.1/debian/patches/series rrdtool-1.7.1/debian/patches/series --- rrdtool-1.7.1/debian/patches/series 2019-02-07 16:21:22.000000000 +0100 +++ rrdtool-1.7.1/debian/patches/series 2019-05-30 22:28:06.000000000 +0200 @@ -1,2 +1,3 @@ no-rpath-for-ruby breaks-long-man-lines +segfault-xport
signature.asc
Description: This is a digitally signed message part.
