From fee12741695f7934a7d9dc047db9c62f2185b68e Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Thu, 27 Mar 2025 16:49:30 -0400 Subject: [PATCH] syslog-ng: upgrade 4.7.0 -> 4.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Release notes: https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-4.8.1 https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-4.8.0 Update the syslog-ng.conf.[systemd|sysvinit] files to align with upstream's 4.8 version. This involved changing from stats_freq(0) to stats(freq(0)) to avoid: > WARNING: Your configuration file uses an obsoleted keyword, ... as was done in: 2d3a8c783 packaging: Update the sample Debian config to not throw warning The comments and the greater authentication/encryption defaults kept. Note that the latter are comment lines. Also kept a line from the 'Sources' section: file("/proc/kmsg" program_override("kernel")); but it's not clear if that's needed. It was in the original meta-oe version of the file from 2018, version 3.15 but not the upstream syslog-ng-3.15.1. With systemd enabled using poky-altcfg, there's a warning: /etc/tmpfiles.d/syslog-ng.conf:1: Line references path below legacy directory /var/run/, updating /var/run/syslog-ng → /run/syslog-ng; please update the tmpfiles.d/ drop-in file accordingly. but that was present in the previous version and I won't take time to fix it right now since systemd + syslog-ng isn't a common combination. Signed-off-by: Randy MacLeod Signed-off-by: Khem Raj --- .../syslog-ng/files/syslog-ng.conf.systemd | 11 ++++++----- .../syslog-ng/files/syslog-ng.conf.sysvinit | 8 ++++---- .../{syslog-ng_4.7.0.bb => syslog-ng_4.8.1.bb} | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) rename meta-oe/recipes-support/syslog-ng/{syslog-ng_4.7.0.bb => syslog-ng_4.8.1.bb} (98%) diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd index 851bf252b7..d3f3730105 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -1,5 +1,6 @@ -@version: 3.36 -# +@version: 4.8 +@include "scl.conf" + # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) # Revised, and rewrited by me (SZALAY Attila ) @@ -10,9 +11,9 @@ # Joe Slater # First, set some global options. -options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); + dns_cache(no); owner("root"); group("adm"); perm(0640); + stats(freq(0)); bad_hostname("^gconfd$"); }; ######################## diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index 70afd0da84..2b18dce89c 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,4 +1,4 @@ -@version: 3.36 +@version: 4.8 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) @@ -10,9 +10,9 @@ # Joe Slater # First, set some global options. -options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); +options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); + dns_cache(no); owner("root"); group("adm"); perm(0640); + stats(freq(0)); bad_hostname("^gconfd$"); }; ######################## diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.8.1.bb similarity index 98% rename from meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb rename to meta-oe/recipes-support/syslog-ng/syslog-ng_4.8.1.bb index e489287c5a..94f74d1eef 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.8.1.bb @@ -26,7 +26,7 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta " SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" -SRC_URI[sha256sum] = "b601265362c633a25f26c497a7e57592739d5a583b7963b722ff58f01b853506" +SRC_URI[sha256sum] = "e8b8b98c60a5b68b25e3462c4104c35d05b975e6778d38d8a81b8ff7c0e64c5b" UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"