mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

rsyslog: upgrade 8.2502.0 -> 8.2504.0

Browse Source 
0001-tests-disable-the-check-for-inotify.patch
0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
use-pkgconfig-to-check-libgcrypt.patch
refreshed for 8.2504.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
2025-05-20 16:54:52 +08:00
committed by Khem Raj
parent d46fcd0149
commit d8be830dce
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From 640b191b9566a6c18af73bf9cc4b9366a76acf62 Mon Sep 17 00:00:00 2001 From 1b02236e84aaed5d80d4a67afb418eadb687d65f Mon Sep 17 00:00:00 2001
From: Yi Fan Yu <yifan.yu@windriver.com> From: Yi Fan Yu <yifan.yu@windriver.com>
Date: Sat, 27 Mar 2021 19:18:25 -0400 Date: Sat, 27 Mar 2021 19:18:25 -0400
Subject: [PATCH] tests: disable the check for inotify Subject: [PATCH] tests: disable the check for inotify
@@ -20,10 +20,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/diag.sh b/tests/diag.sh diff --git a/tests/diag.sh b/tests/diag.sh
index f4f3d86..497bb17 100755 index a9c2a75..0b017c5 100755
--- a/tests/diag.sh --- a/tests/diag.sh
+++ b/tests/diag.sh +++ b/tests/diag.sh
@@ -2950,7 +2950,7 @@ case $1 in @@ -2979,7 +2979,7 @@ case $1 in
fi fi
;; ;;
'check-inotify') # Check for inotify/fen support 'check-inotify') # Check for inotify/fen support
@@ -32,7 +32,7 @@ index f4f3d86..497bb17 100755
echo [inotify mode] echo [inotify mode]
elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then
grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h
@@ -2965,7 +2965,7 @@ case $1 in @@ -2994,7 +2994,7 @@ case $1 in
fi fi
;; ;;
'check-inotify-only') # Check for ONLY inotify support 'check-inotify-only') # Check for ONLY inotify support
meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From 1e0a77d8a5ae7cd0223afadf46cdbb540119774d Mon Sep 17 00:00:00 2001 From 59753fe14e9eef4909a535b6e00967e546cc29ea Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 11 May 2024 23:31:46 -0700 Date: Sat, 11 May 2024 23:31:46 -0700
Subject: [PATCH] tests/tcpflood.c: Pass correct parameter type to sendto() Subject: [PATCH] tests/tcpflood.c: Pass correct parameter type to sendto()
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/tcpflood.c b/tests/tcpflood.c diff --git a/tests/tcpflood.c b/tests/tcpflood.c
index bd8edaf..0feda23 100644 index 5e6f13a..09cedbb 100644
--- a/tests/tcpflood.c --- a/tests/tcpflood.c
+++ b/tests/tcpflood.c +++ b/tests/tcpflood.c
@@ -808,7 +808,7 @@ int sendMessages(struct instdata *inst) @@ -836,7 +836,7 @@ int sendMessages(struct instdata *inst)
} }
lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number); lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number);
} else if(transport == TP_UDP) { } else if(transport == TP_UDP) {
@@ -30,6 +30,3 @@ index bd8edaf..0feda23 100644
error_number = errno; error_number = errno;
} else if(transport == TP_TLS) { } else if(transport == TP_TLS) {
if(sockArray[socknum] == -1) { if(sockArray[socknum] == -1) {
--
2.45.0
meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From ceeaadb282531a416c1f605fa2100faa5de701e0 Mon Sep 17 00:00:00 2001 From d2dd13d930c91e45417c7361908f0af75e0e6c00 Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com> From: Roy Li <rongqing.li@windriver.com>
Date: Wed, 18 Jun 2014 13:46:52 +0800 Date: Wed, 18 Jun 2014 13:46:52 +0800
Subject: [PATCH] use pkgconfig to check libgcrypt Subject: [PATCH] use pkgconfig to check libgcrypt
@@ -15,10 +15,10 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
1 file changed, 1 insertion(+), 14 deletions(-) 1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 4af95c4..97e6282 100644 index f8c0ac8..794bfb3 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1200,20 +1200,7 @@ AC_ARG_ENABLE(libgcrypt, @@ -1217,20 +1217,7 @@ AC_ARG_ENABLE(libgcrypt,
[enable_libgcrypt=yes] [enable_libgcrypt=yes]
) )
if test "x$enable_libgcrypt" = "xyes"; then if test "x$enable_libgcrypt" = "xyes"; then
meta-oe/recipes-extended/rsyslog/rsyslog_8.2502.0.bb → meta-oe/recipes-extended/rsyslog/rsyslog_8.2504.0.bb
+1 -1
View File
@@ -32,7 +32,7 @@ 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] = "02fa197d21d519f5a25a928deb9397cd387ba7382b9b449782ba31d8f3118206" SRC_URI[sha256sum] = "5092a20ed40987c74cc604ebfcd6c749e47eb9fc34adc1c2637e6553e7f047ab"
UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"