rsyslog: upgrade 8.2404.0 -> 8.2406.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
2024-08-06 16:46:31 +08:00
committed by Khem Raj
parent 25bb110094
commit 7995813c13
3 changed files with 8 additions and 12 deletions
@@ -1,4 +1,4 @@
From 194e199ce08acc2192f6a63420ff24d9064666e5 Mon Sep 17 00:00:00 2001 From 9e36463b8a03e7de7468035e2dc63b36b5fd1965 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 6cd60ea88..7424f48c5 100755 index f30290c..2c4f6f0 100755
--- a/tests/diag.sh --- a/tests/diag.sh
+++ b/tests/diag.sh +++ b/tests/diag.sh
@@ -2672,7 +2672,7 @@ case $1 in @@ -2933,7 +2933,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 6cd60ea88..7424f48c5 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
@@ -2687,7 +2687,7 @@ case $1 in @@ -2948,7 +2948,7 @@ case $1 in
fi fi
;; ;;
'check-inotify-only') # Check for ONLY inotify support 'check-inotify-only') # Check for ONLY inotify support
@@ -41,6 +41,3 @@ index 6cd60ea88..7424f48c5 100755
echo [inotify mode] echo [inotify mode]
else else
echo [inotify not supported, skipping...] echo [inotify not supported, skipping...]
--
2.29.2
@@ -1,4 +1,4 @@
From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001 From 5d200bd8ccb6acb8636dadc47eefc6763c0001d0 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
@@ -10,16 +10,15 @@ libgcrypt does no longer provide libgcrypt-config, and provide
Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
--- ---
configure.ac | 15 +-------------- configure.ac | 15 +--------------
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 62178c3..b56c9c7 100644 index a4506ec..46013cc 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt, @@ -1181,20 +1181,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
@@ -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] = "30528d140ec1b1f079224081fa37df6e06587ff42b02e3e61f2daa0526c54d33" SRC_URI[sha256sum] = "1343e0269dd32166ffde04d7ceebfa0e7146cf1dbc6962c56bf428c61f01a7df"
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+)+)"