[meta-oe][PATCH 11/18] rsyslog: upgrade 8.2604.0 -> 8.2606.0

Changes:
- imtcp/omfwd: add experimental TCP stream compression (zlib/zstd), distinct
  from TLS-native compression.
- core: fix negated exact-priority filters such as local4.!=debug so they
  match all documented priorities except the negated one.
- rainerscript: preserve embedded NULs at C-string boundaries; warn on
  constant boolean AND/OR operands.
- imfile: deliver same-file monitors independently; RFC3164 parser honors
  parser.parseHostnameAndTag at runtime; invalidate the cached programname
  when a message tag changes.
- General hardening and testbench de-flaking across many commits.

8.2606.0 makes libyaml an explicit configure feature (previously
auto-detected) that is enabled by default.

Added PACKAGECONFIG for libyaml and keep it disabled

Signed-off-by: Khem Raj <[email protected]>
---
 .../0001-tests-disable-the-check-for-inotify.patch        | 8 +++++---
 .../rsyslog/{rsyslog_8.2604.0.bb => rsyslog_8.2606.0.bb}  | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-extended/rsyslog/{rsyslog_8.2604.0.bb => rsyslog_8.2606.0.bb} (96%)

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 728cdace0c..bf9a41c303 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
@@ -15,6 +15,8 @@ since 2.6.13 [1].
 Upstream-Status: Inappropriate [OE-specific]
 
 Signed-off-by: Yi Fan Yu <[email protected]>
+
+Rebased for rsyslog 8.2606.0 (line offset only, no context changes).
 ---
  tests/diag.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -23,7 +25,7 @@ diff --git a/tests/diag.sh b/tests/diag.sh
 index a9c2a75..0b017c5 100755
 --- a/tests/diag.sh
 +++ b/tests/diag.sh
-@@ -3683,7 +3683,7 @@
+@@ -5449,7 +5449,7 @@
  		fi
  		;;
  	'check-inotify') # Check for inotify/fen support
@@ -31,8 +33,8 @@ index a9c2a75..0b017c5 100755
 +		if true; then
  			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
-@@ -3698,7 +3698,7 @@
+ 			if ! grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h; then
+@@ -5463,7 +5463,7 @@
  		fi
  		;;
  	'check-inotify-only') # Check for ONLY inotify support
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2604.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2606.0.bb
similarity index 96%
rename from meta-oe/recipes-extended/rsyslog/rsyslog_8.2604.0.bb
rename to meta-oe/recipes-extended/rsyslog/rsyslog_8.2606.0.bb
index 1019db69cb..0487259c9f 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2604.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2606.0.bb
@@ -30,7 +30,7 @@ SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \
 SRC_URI:append:libc-musl = " \
     file://disable-omfile-outchannel.patch \
 "
-SRC_URI[sha256sum] = "2a04b1cd6f0a5e2b60eec231acce3cf9927c4ed02bc5fbbe5dc4c35fcf887b64"
+SRC_URI[sha256sum] = "2574b3f3068e6955eb94ef5643e2b6a5b8585cc8eaa77209ff5cbc1e2e5f71e5"
 
 UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
@@ -71,6 +71,10 @@ PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,,"
 PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux,"
 PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt,"
 PACKAGECONFIG[testbench] = "--enable-testbench --enable-omstdout,--disable-testbench --disable-omstdout,,"
+# libyaml became enabled-by-default in 8.2606.0; 8.2604.0 did not build it, so
+# leave it out of the default PACKAGECONFIG to pass --disable-libyaml and
+# preserve prior behavior.
+PACKAGECONFIG[libyaml] = "--enable-libyaml,--disable-libyaml,libyaml,"
 
 # default no in configure
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"