rasdaemon: Upgrade to 0.6.8

Fix build on musl while here
Drop unneeded header include patch which is fixed upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2022-08-30 19:59:32 -07:00
parent 42818f4d8f
commit f7a8fbf8f0
3 changed files with 37 additions and 50 deletions
@@ -1,44 +0,0 @@
From 18786db1ad03716267927d983c83275469a1478a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 8 May 2020 12:27:19 -0700
Subject: [PATCH] Fix system header includes
Use poll.h instead of sys/poll.h
Fixes
warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
Include limits.h for PATH_MAX
Fixes
ras-events.c:359:16: error: 'PATH_MAX' undeclared (first use in this function)
359 | char pipe_raw[PATH_MAX];
| ^~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ras-events.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ras-events.c b/ras-events.c
index 511c93d..400e740 100644
--- a/ras-events.c
+++ b/ras-events.c
@@ -18,13 +18,14 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
+#include <poll.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/poll.h>
#include <signal.h>
#include <sys/signalfd.h>
#include "libtrace/kbuffer.h"
--
2.26.2
@@ -0,0 +1,35 @@
From e415152b51eacab8705b6b3274cc0d1a274772e0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 30 Aug 2022 19:54:35 -0700
Subject: [PATCH] libtrace: Use XSI version of strerror_r on non glibc systems
The version used is glibc specific therefore make it so
and provide a fallback for non-glibc systems
Upstream-Status: Submitted [https://github.com/mchehab/rasdaemon/pull/70]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libtrace/event-parse.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libtrace/event-parse.c b/libtrace/event-parse.c
index 6c705c3..6b651d5 100644
--- a/libtrace/event-parse.c
+++ b/libtrace/event-parse.c
@@ -5071,7 +5071,13 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum,
const char *msg;
if (errnum >= 0) {
+#if defined(__GLIBC__)
msg = strerror_r(errnum, buf, buflen);
+#else
+ if (strerror_r(errnum, buf, buflen) != 0)
+ snprintf(buf, buflen, "unknown error %i", errnum);
+ msg = buf;
+#endif
if (msg != buf) {
size_t len = strlen(msg);
memcpy(buf, msg, min(buflen - 1, len));
--
2.37.3
@@ -4,11 +4,11 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc"
SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \
file://0001-Fix-system-header-includes.patch \
file://0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch \
file://rasdaemon.service \
file://init"
SRCREV = "aa96737648d867a3d73e4151d05b54bbab494605"
SRCREV = "c2255178a49f62c53009a456bc37dd5e37332f09"
S = "${WORKDIR}/git"
@@ -32,10 +32,6 @@ PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report"
DEPENDS:append:libc-musl = " argp-standalone"
LDFLAGS:append:libc-musl = " -largp"
do_configure:prepend () {
( cd ${S}; autoreconf -vfi )
}
do_install:append() {
install -d ${D}${sysconfdir}/init.d
install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon