[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#929776: marked as done (unblock: rrdtool/1.7.1-2)

Your message dated Sat, 1 Jun 2019 21:15:48 +0200
with message-id <e19fa6f7-351b-2dca-1928-742a808fda8a@debian.org>
and subject line Re: Bug#929776: unblock: rrdtool/1.7.1-2
has caused the Debian Bug report #929776,
regarding unblock: rrdtool/1.7.1-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
929776: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=929776
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
User: release.debian.org@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 <nirgal@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 <themylogin@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 <tobi@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

Attachment: signature.asc
Description: This is a digitally signed message part.


--- End Message ---
--- Begin Message --- 
Hi,

On Fri, 31 May 2019 12:27:51 +0200 Jean-Michel
=?ISO-8859-1?Q?Vourg=E8re?= <nirgal@debian.org> wrote:
> Control: tags -1 -moreinfo
> 
> Version 1.7.1-2 is now installed on all major architectures.
Unblocked, thanks.

Paul

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
Reply to: