* [ptxdist] [PATCH] syslogng: version bump 4.8.1 -> 4.10.2 @ 2026-02-19 20:54 Ladislav Michl 2026-03-06 17:48 ` Michael Olbrich 0 siblings, 1 reply; 3+ messages in thread From: Ladislav Michl @ 2026-02-19 20:54 UTC (permalink / raw) To: ptxdist From: Ladislav Michl <ladis@triops.cz> 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> --- projectroot/etc/syslog-ng.conf | 39 ---------------------------------- rules/syslogng.make | 11 +++++++--- 2 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 projectroot/etc/syslog-ng.conf diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf deleted file mode 100644 index 0235b9857..000000000 --- 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 0264ddba6..947042623 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) @@ -87,6 +87,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 +137,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) -- 2.47.3 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] syslogng: version bump 4.8.1 -> 4.10.2 2026-02-19 20:54 [ptxdist] [PATCH] syslogng: version bump 4.8.1 -> 4.10.2 Ladislav Michl @ 2026-03-06 17:48 ` Michael Olbrich 2026-03-08 18:11 ` Ladislav Michl 0 siblings, 1 reply; 3+ messages in thread From: Michael Olbrich @ 2026-03-06 17:48 UTC (permalink / raw) To: Ladislav Michl; +Cc: ptxdist On Thu, Feb 19, 2026 at 09:54:40PM +0100, Ladislav Michl wrote: > From: Ladislav Michl <ladis@triops.cz> > > 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> > --- > projectroot/etc/syslog-ng.conf | 39 ---------------------------------- > rules/syslogng.make | 11 +++++++--- > 2 files changed, 8 insertions(+), 42 deletions(-) > delete mode 100644 projectroot/etc/syslog-ng.conf > > diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf > deleted file mode 100644 > index 0235b9857..000000000 > --- 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 0264ddba6..947042623 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) > @@ -87,6 +87,8 @@ SYSLOGNG_CONF_OPT := \ > --disable-java-modules \ > --enable-native \ > --disable-afsnmp \ > + --disable-colored-log \ > + --disable-stackdump \ Are there any other new options? It now uses liburing if found. Michael > --disable-all-modules \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --disable-valgrind \ > @@ -135,6 +137,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) > -- > 2.47.3 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] syslogng: version bump 4.8.1 -> 4.10.2 2026-03-06 17:48 ` Michael Olbrich @ 2026-03-08 18:11 ` Ladislav Michl 0 siblings, 0 replies; 3+ messages in thread From: Ladislav Michl @ 2026-03-08 18:11 UTC (permalink / raw) To: ptxdist On Fri, Mar 06, 2026 at 06:48:31PM +0100, Michael Olbrich wrote: > On Thu, Feb 19, 2026 at 09:54:40PM +0100, Ladislav Michl wrote: > > From: Ladislav Michl <ladis@triops.cz> > > > > 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> > > --- > > projectroot/etc/syslog-ng.conf | 39 ---------------------------------- > > rules/syslogng.make | 11 +++++++--- > > 2 files changed, 8 insertions(+), 42 deletions(-) > > delete mode 100644 projectroot/etc/syslog-ng.conf > > > > diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf > > deleted file mode 100644 > > index 0235b9857..000000000 > > --- 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 0264ddba6..947042623 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) > > @@ -87,6 +87,8 @@ SYSLOGNG_CONF_OPT := \ > > --disable-java-modules \ > > --enable-native \ > > --disable-afsnmp \ > > + --disable-colored-log \ > > + --disable-stackdump \ > > Are there any other new options? It now uses liburing if found. Not that I'm aware of. Used configure_helper, but this one slipped though. It is a bit tricky (autoconf fragment): if test "x$with_ivykis" = "xinternal"; then if $IVYKIS_INTERNAL_SOURCE_EXISTS; then # these can only be used in lib as it assumes # the current directory just one below ivykis IVYKIS_CFLAGS="-isystem \$(top_srcdir)/lib/ivykis/src/include -isystem \$(top_builddir)/lib/ivykis/src/include" IVYKIS_LIBS="-Wl,${WHOLE_ARCHIVE_OPT} -L\$(top_builddir)/lib/ivykis/src -livykis -Wl,${NO_WHOLE_ARCHIVE_OPT}" INTERNAL_IVYKIS_CFLAGS="-isystem \${includedir}/syslog-ng/ivykis" IVYKIS_VERSION_UPDATED="yes" # LIBS to use when libtool is not applicable (when linking the main syslog-ng executable in mixed linking mode) IVYKIS_NO_LIBTOOL_LIBS="-Wl,${WHOLE_ARCHIVE_OPT} -L\$(top_builddir)/lib/ivykis/src/.libs -livykis -Wl,${NO_WHOLE_ARCHIVE_OPT}" # internal ivykis is linked statically, io_uring might be available and linked against too, we have to use it as well AC_SEARCH_LIBS([io_uring_queue_init], [uring], [IO_URING_LIBS="-luring"]) # internal version surely has iv_work_pool_submit_continuation AC_DEFINE(HAVE_IV_WORK_POOL_SUBMIT_CONTINUATION, 1) else AC_MSG_ERROR([Internal ivykis sources not found in lib/ivykis. This is a hard dependency, unable to build syslog-ng without them.]) fi else ... Since $IVYKIS_INTERNAL_SOURCE_EXISTS (it is part of tarball), liburing is searched for. So we disable it with ac_cv_search_io_uring_queue_init=no which gives nice: checking for library containing io_uring_queue_init... (cached) no I will send v2. > Michael > > > --disable-all-modules \ > > $(GLOBAL_LARGE_FILE_OPTION) \ > > --disable-valgrind \ > > @@ -135,6 +137,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) > > -- > > 2.47.3 > > > > > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-03-08 18:11 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2026-02-19 20:54 [ptxdist] [PATCH] syslogng: version bump 4.8.1 -> 4.10.2 Ladislav Michl 2026-03-06 17:48 ` Michael Olbrich 2026-03-08 18:11 ` Ladislav Michl
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox