Re: rrdtool version 1.5.0 is out

On 2015-04-20, Stuart Henderson <[email protected]> wrote:
> On 2015-04-16, Tobias Oetiker <[email protected]> wrote:
>> Finally! RRDtool 1.5.0 is out.
>
> I'm seeing a couple of issues with this update on OpenBSD (-current, amd64).
>
> Firstly rrdcached is failing to start; segfault after startup, with the
> following backtrace.
>
> #0  sigwait (set=0xffffffff, sig=0x3ba61203744) at signal.h:88
> 88		*__set &= ~(1U << ((__signo)-1));	/* sigmask(__signo) */
..
> Thread 1 (process 7573):
> #0  sigwait (set=0xffffffff, sig=0x3ba61203744) at signal.h:88
> #1  0x000003b7aa604c26 in signal_receiver (args=Variable "args" is not available.) at rrd_daemon.c:347
> #2  0x000003ba6f812c6e in _rthread_start (v=Variable "v" is not available.) at /usr/src/lib/librthread/rthread.c:145
> #3  0x000003ba77eaa8fb in __tfork_thread () at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75
> #4  0x0000000000000000 in ?? ()
> Current language:  auto; currently c

I finally got around to looking at this one again. I think it's as simple as this.

--- src/rrd_daemon.c.orig	Mon Nov 23 10:51:22 2015
+++ src/rrd_daemon.c	Mon Nov 23 10:51:00 2015
@@ -344,7 +344,7 @@ static void* signal_receiver (void UNUSED(*args))
     status = sigwaitinfo(&signal_set, &signal_info);
 #elif defined(HAVE_SIGWAIT)
     status = -1;
-    if (sigwait(signal_set, &status) < 0 ){
+    if (sigwait(&signal_set, &status) < 0 ){
        status = -1;
     }
 #else