Re: [ptxdist] [APPLIED] syslogng: version bump 4.8.1 -> 4.10.2

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as fe0bc04d4a91659df21fa1787ed97158b5ab56da.

Michael

[sent from post-receive hook]

On Fri, 13 Mar 2026 08:29:13 +0100, Ladislav Michl <oss-lists@triops.cz> wrote:
> Additionally install required smart-multi-line.fsm and remove
> local configuration file, which is obsolete anyway. Package
> comes with its own example syslog-ng.conf.
> 
> Signed-off-by: Ladislav Michl <ladis@triops.cz>
> Message-Id: <aa2_JTuTy5B7bRXB@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
> deleted file mode 100644
> index 0235b9857b37..000000000000
> --- a/projectroot/etc/syslog-ng.conf
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -#
> -# syslog-ng configuration
> -#
> -
> -@version: 3.25
> -
> -#
> -# Options
> -#
> -
> -# sync every 0 lines
> -options { chain_hostnames(off); flush_lines(0); };
> -
> -#
> -# Sources
> -#
> -
> -# log source is /dev/log only
> -source src { unix-stream("/dev/log"); internal(); };
> -# source net { udp(); };
> -
> -#
> -# Destinations
> -#
> -
> -destination syslog { file("/var/log/syslog"); };
> -
> -#
> -# Filters
> -#
> -
> -#filter f_auth { facility(auth); };
> -
> -#
> -# Logs
> -#
> -
> -log { source(src); destination(syslog); };
> -
> diff --git a/rules/syslogng.make b/rules/syslogng.make
> index 0264ddba62d1..4eee40dc43c5 100644
> --- a/rules/syslogng.make
> +++ b/rules/syslogng.make
> @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
>  #
>  # Paths and names
>  #
> -SYSLOGNG_VERSION	:= 4.8.1
> -SYSLOG_LIBVERSION	:= 4.8
> -SYSLOGNG_MD5		:= 6a5852343f9a34449c3812b474728aa7
> +SYSLOGNG_VERSION	:= 4.10.2
> +SYSLOG_LIBVERSION	:= 4.10
> +SYSLOGNG_MD5		:= 0c97637b266efcf932b5fdea5f40235e
>  SYSLOGNG		:= syslog-ng-$(SYSLOGNG_VERSION)
>  SYSLOGNG_SUFFIX		:= tar.gz
>  SYSLOGNG_URL		:= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
> @@ -33,6 +33,7 @@ SYSLOGNG_LICENSE	:= GPL-2.0-or-later AND LGPL-2.1-only
>  SYSLOGNG_CONF_ENV	:= \
>  	$(CROSS_ENV) \
>  	ac_cv_lib_nsl_gethostbyname=no \
> +	ac_cv_search_io_uring_queue_init=no \
>  	am_cv_python_version=$(PYTHON3_MAJORMINOR) \
>  	ac_cv_path_PYTHON=$(CROSS_PYTHON3)
>  
> @@ -87,6 +88,8 @@ SYSLOGNG_CONF_OPT	:= \
>  	--disable-java-modules \
>  	--enable-native \
>  	--disable-afsnmp \
> +	--disable-colored-log \
> +	--disable-stackdump \
>  	--disable-all-modules \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--disable-valgrind \
> @@ -135,6 +138,9 @@ $(STATEDIR)/syslogng.targetinstall:
>  	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
>  	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)
>  
> +	@$(call install_copy, syslogng, 0, 0, 0644, -, \
> +		/usr/share/syslog-ng/smart-multi-line.fsm)
> +
>  #	# config
>  ifdef PTXCONF_SYSLOGNG_CONFIG
>  	@$(call install_alternative, syslogng, 0, 0, 0644, /etc/syslog-ng.conf, n)