helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-16 20:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsyslog: Upgrade to 8.2404.0

Browse Source 
Add a patch to fix build with gcc14+musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2024-05-11 23:36:03 -07:00
parent 9e91609444
commit 61d407ad59
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch Normal file
View File

@ -0,0 +1,35 @@
From 1e0a77d8a5ae7cd0223afadf46cdbb540119774d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 11 May 2024 23:31:46 -0700
Subject: [PATCH] tests/tcpflood.c: Pass correct parameter type to sendto()
Fixes build with GCC-14 and musl
../../rsyslog-8.2404.0/tests/tcpflood.c:811:70: error: passing argument 5 of 'sendto' from incompatible pointer type [-Wincompatible-pointer-types]
811 | lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr));
| ^~~~~~~~
| |
| struct sockaddr_in *
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tests/tcpflood.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/tcpflood.c b/tests/tcpflood.c
index bd8edaf..0feda23 100644
--- a/tests/tcpflood.c
+++ b/tests/tcpflood.c
@@ -808,7 +808,7 @@ int sendMessages(struct instdata *inst)
}
lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number);
} else if(transport == TP_UDP) {
- lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr));
+ lenSend = sendto(udpsockout, buf, lenBuf, 0, (const struct sockaddr *)&udpRcvr, sizeof(udpRcvr));
error_number = errno;
} else if(transport == TP_TLS) {
if(sockArray[socknum] == -1) {
--
2.45.0

4
meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb → meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb
View File

@ -25,14 +25,14 @@ SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \
file://use-pkgconfig-to-check-libgcrypt.patch \ file://use-pkgconfig-to-check-libgcrypt.patch \
file://run-ptest \ file://run-ptest \
file://0001-tests-disable-the-check-for-inotify.patch \ file://0001-tests-disable-the-check-for-inotify.patch \
file://0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch \
" "
SRC_URI:append:libc-musl = " \ SRC_URI:append:libc-musl = " \
file://0001-Include-sys-time-h.patch \ file://0001-Include-sys-time-h.patch \
file://disable-omfile-outchannel.patch \ file://disable-omfile-outchannel.patch \
" "
SRC_URI[sha256sum] = "30528d140ec1b1f079224081fa37df6e06587ff42b02e3e61f2daa0526c54d33"
SRC_URI[sha256sum] = "acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba"
UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"