diff mbox series

[meta-python,43/46] rsyslog: upgrade 8.2406.0 -> 8.2408.0

Message ID 1724833525-2162-42-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-gnome,01/46] colord-gtk: upgrade 0.3.0 -> 0.3.1 | expand

Commit Message

Mingyu Wang (Fujitsu) Aug. 28, 2024, 8:25 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
============
- omkafka enhance: write Kafka log with level ERROR or higher into errorfile
- net subsusytem bugfix: some config statemens were not accepted
- new "ossl" crypto provider
- imtcp: improve connection error messages

0001-tests-disable-the-check-for-inotify.patch
use-pkgconfig-to-check-libgcrypt.patch
refreshed for 8.2408.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-tests-disable-the-check-for-inotify.patch        | 8 ++++----
 .../rsyslog/use-pkgconfig-to-check-libgcrypt.patch        | 8 ++++----
 .../rsyslog/{rsyslog_8.2406.0.bb => rsyslog_8.2408.0.bb}  | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-extended/rsyslog/{rsyslog_8.2406.0.bb => rsyslog_8.2408.0.bb} (98%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
index 4c41da518..13d1a7814 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
@@ -1,4 +1,4 @@ 
-From 9e36463b8a03e7de7468035e2dc63b36b5fd1965 Mon Sep 17 00:00:00 2001
+From 640b191b9566a6c18af73bf9cc4b9366a76acf62 Mon Sep 17 00:00:00 2001
 From: Yi Fan Yu <yifan.yu@windriver.com>
 Date: Sat, 27 Mar 2021 19:18:25 -0400
 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(-)
 
 diff --git a/tests/diag.sh b/tests/diag.sh
-index f30290c..2c4f6f0 100755
+index f4f3d86..497bb17 100755
 --- a/tests/diag.sh
 +++ b/tests/diag.sh
-@@ -2933,7 +2933,7 @@ case $1 in
+@@ -2950,7 +2950,7 @@ case $1 in
  		fi
  		;;
  	'check-inotify') # Check for inotify/fen support 
@@ -32,7 +32,7 @@  index f30290c..2c4f6f0 100755
  			echo [inotify mode]
  		elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then
  			grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h
-@@ -2948,7 +2948,7 @@ case $1 in
+@@ -2965,7 +2965,7 @@ case $1 in
  		fi
  		;;
  	'check-inotify-only') # Check for ONLY inotify support 
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
index cda2d99c0..45359a166 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
@@ -1,4 +1,4 @@ 
-From 5d200bd8ccb6acb8636dadc47eefc6763c0001d0 Mon Sep 17 00:00:00 2001
+From ceeaadb282531a416c1f605fa2100faa5de701e0 Mon Sep 17 00:00:00 2001
 From: Roy Li <rongqing.li@windriver.com>
 Date: Wed, 18 Jun 2014 13:46:52 +0800
 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(-)
 
 diff --git a/configure.ac b/configure.ac
-index a4506ec..46013cc 100644
+index 4af95c4..97e6282 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1181,20 +1181,7 @@ AC_ARG_ENABLE(libgcrypt,
+@@ -1200,20 +1200,7 @@ AC_ARG_ENABLE(libgcrypt,
          [enable_libgcrypt=yes]
  )
  if test "x$enable_libgcrypt" = "xyes"; then
@@ -39,4 +39,4 @@  index a4506ec..46013cc 100644
 +	PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
  fi
  AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
- AC_SUBST(LIBGCRYPT_CFLAGS)
+ AM_CONDITIONAL(ENABLE_RSCRYUTIL, test x$enable_libgcrypt = xyes || test x$enable_openssl_crypto_provider = xyes)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2406.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb
similarity index 98%
rename from meta-oe/recipes-extended/rsyslog/rsyslog_8.2406.0.bb
rename to meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb
index b0c2fb298..41e396358 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2406.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb
@@ -32,7 +32,7 @@  SRC_URI:append:libc-musl = " \
     file://0001-Include-sys-time-h.patch \
     file://disable-omfile-outchannel.patch \
 "
-SRC_URI[sha256sum] = "1343e0269dd32166ffde04d7ceebfa0e7146cf1dbc6962c56bf428c61f01a7df"
+SRC_URI[sha256sum] = "8bb2f15f9bf9bb7e635182e3d3e370bfc39d08bf35a367dce9714e186f787206"
 
 UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"