[ptxdist] [PATCH 0/2] Remove syslogng from staging

[ptxdist] [PATCH 0/2] Remove syslogng from staging

[Ladislav Michl]

Tested on armv7 with gcc-13.2.1 and mips64 with gcc-12.3.1

Ladislav Michl (2):
  syslogng: version bump 3.25.1 -> 4.8.1
  Revert "syslogng: move to staging"

 rules/syslogng.in   |  8 +-------
 rules/syslogng.make | 27 +++++++++++++++++----------
 2 files changed, 18 insertions(+), 17 deletions(-)

-- 
2.39.5

[ptxdist] [PATCH 1/2] syslogng: version bump 3.25.1 -> 4.8.1

[Ladislav Michl]

From: Ladislav Michl <ladis@triops.cz>

Signed-off-by: Ladislav Michl <ladis@triops.cz>
---
 rules/syslogng.make | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/rules/syslogng.make b/rules/syslogng.make
index 0786b68f7..05fbef142 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
 #
 # Paths and names
 #
-SYSLOGNG_VERSION	:= 3.25.1
-SYSLOG_LIBVERSION	:= 3.25
-SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
+SYSLOGNG_VERSION	:= 4.8.1
+SYSLOG_LIBVERSION	:= 4.8
+SYSLOGNG_MD5		:= 6a5852343f9a34449c3812b474728aa7
 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)
@@ -42,11 +42,9 @@ SYSLOGNG_CONF_ENV	:= \
 SYSLOGNG_CONF_TOOL	:= autoconf
 SYSLOGNG_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--localstatedir=/var/run \
-	--with-module-dir=/usr/lib/syslog-ng \
-	--with-module-path=/usr/lib/syslog-ng \
 	--enable-forced-server-mode \
 	--disable-debug \
+	--disable-example-modules \
 	--enable-force-gnu99 \
 	--disable-extra-warnings \
 	--disable-env-wrapper \
@@ -54,39 +52,48 @@ SYSLOGNG_CONF_OPT	:= \
 	--disable-memtrace \
 	--enable-dynamic-linking \
 	--disable-mixed-linking \
+	--disable-force-classic-linking \
 	$(GLOBAL_IPV6_OPTION) \
 	--disable-tcp-wrapper \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
 	--disable-sun-streams \
+	--disable-darwin-osl \
 	--disable-openbsd-system-source \
 	--disable-sql \
 	--disable-pacct \
 	--disable-linux-caps \
+	--disable-ebpf \
 	--disable-gcov \
 	--disable-mongodb \
-	--disable-legacy-mongodb-options \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_JSON)-json \
 	--disable-amqp \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_STOMP_DESTINATION)-stomp \
 	--disable-smtp \
+	--disable-mqtt \
+	--disable-grpc \
+	--disable-cloud-auth \
+	--disable-cpp \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_HTTP)-http \
 	--disable-redis \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
 	--disable-geoip2 \
 	--disable-riemann \
-	--with-python=auto \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
 	--disable-kafka \
+	--with-python=auto \
+	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python-modules \
 	--disable-manpages \
+	--disable-manpages-install \
 	--disable-java \
 	--disable-java-modules \
 	--enable-native \
-	--disable-snmp-dest \
+	--disable-afsnmp \
 	--disable-all-modules \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-valgrind \
 	--with-libnet=$(SYSROOT)/usr/bin \
 	--without-net-snmp \
+	--with-pidfile-dir=/var/run \
+	--with-module-dir=/usr/lib/syslog-ng \
 	--with-systemdsystemunitdir=/usr/lib/systemd/system \
 	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
 	--with-ivykis=internal \
-- 
2.39.5

[ptxdist] [PATCH 2/2] Revert "syslogng: move to staging"

[Ladislav Michl]

From: Ladislav Michl <ladis@triops.cz>

Package has been updated.

This reverts commit 6a96a1358212a24ffd7a2a5ace852ab681851a67.

Signed-off-by: From: Ladislav Michl <ladis@triops.cz>
---
 rules/syslogng.in | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/rules/syslogng.in b/rules/syslogng.in
index 910398420..0044905db 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=networking
+## SECTION=networking
 # syslog-ng configuration
 
 menuconfig SYSLOGNG
@@ -19,10 +17,6 @@ menuconfig SYSLOGNG
 	help
 	  The next generation syslog daemon.
 
-	  STAGING: remove in PTXdist 2026.03.0
-	  Unmaintained in PTXdist and fails to build with current toolchains.
-	  Needs updating to the latest version.
-
 if SYSLOGNG
 
 config SYSLOGNG_SPOOF_SOURCE
-- 
2.39.5

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

[Michael Olbrich]

Thanks, applied as ef1bcf6579c139a64d51751da91429400bcebdbe.

Michael

[sent from post-receive hook]

On Mon, 07 Apr 2025 18:02:53 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> Signed-off-by: Ladislav Michl <ladis@triops.cz>
> Message-Id: <Z-6cVTJcNnsTOyA2@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/syslogng.make b/rules/syslogng.make
> index 0786b68f7ea8..05fbef142cf2 100644
> --- a/rules/syslogng.make
> +++ b/rules/syslogng.make
> @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
>  #
>  # Paths and names
>  #
> -SYSLOGNG_VERSION	:= 3.25.1
> -SYSLOG_LIBVERSION	:= 3.25
> -SYSLOGNG_MD5		:= 07c2ebb712ddacd201b24b265b857b0d
> +SYSLOGNG_VERSION	:= 4.8.1
> +SYSLOG_LIBVERSION	:= 4.8
> +SYSLOGNG_MD5		:= 6a5852343f9a34449c3812b474728aa7
>  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)
> @@ -42,11 +42,9 @@ SYSLOGNG_CONF_ENV	:= \
>  SYSLOGNG_CONF_TOOL	:= autoconf
>  SYSLOGNG_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> -	--localstatedir=/var/run \
> -	--with-module-dir=/usr/lib/syslog-ng \
> -	--with-module-path=/usr/lib/syslog-ng \
>  	--enable-forced-server-mode \
>  	--disable-debug \
> +	--disable-example-modules \
>  	--enable-force-gnu99 \
>  	--disable-extra-warnings \
>  	--disable-env-wrapper \
> @@ -54,39 +52,48 @@ SYSLOGNG_CONF_OPT	:= \
>  	--disable-memtrace \
>  	--enable-dynamic-linking \
>  	--disable-mixed-linking \
> +	--disable-force-classic-linking \
>  	$(GLOBAL_IPV6_OPTION) \
>  	--disable-tcp-wrapper \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
>  	--disable-sun-streams \
> +	--disable-darwin-osl \
>  	--disable-openbsd-system-source \
>  	--disable-sql \
>  	--disable-pacct \
>  	--disable-linux-caps \
> +	--disable-ebpf \
>  	--disable-gcov \
>  	--disable-mongodb \
> -	--disable-legacy-mongodb-options \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_JSON)-json \
>  	--disable-amqp \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_STOMP_DESTINATION)-stomp \
>  	--disable-smtp \
> +	--disable-mqtt \
> +	--disable-grpc \
> +	--disable-cloud-auth \
> +	--disable-cpp \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_HTTP)-http \
>  	--disable-redis \
>  	--$(call ptx/endis, PTXCONF_SYSLOGNG_SYSTEMD)-systemd \
>  	--disable-geoip2 \
>  	--disable-riemann \
> -	--with-python=auto \
> -	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python \
>  	--disable-kafka \
> +	--with-python=auto \
> +	--$(call ptx/endis, PTXCONF_SYSLOGNG_PYTHON_DESTINATION)-python-modules \
>  	--disable-manpages \
> +	--disable-manpages-install \
>  	--disable-java \
>  	--disable-java-modules \
>  	--enable-native \
> -	--disable-snmp-dest \
> +	--disable-afsnmp \
>  	--disable-all-modules \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--disable-valgrind \
>  	--with-libnet=$(SYSROOT)/usr/bin \
>  	--without-net-snmp \
> +	--with-pidfile-dir=/var/run \
> +	--with-module-dir=/usr/lib/syslog-ng \
>  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
>  	--with-jsonc=$(if $(PTXCONF_SYSLOGNG_JSON),system,no) \
>  	--with-ivykis=internal \

Re: [ptxdist] [APPLIED] Revert "syslogng: move to staging"

[Michael Olbrich]

Thanks, applied as 8ffeba70649eb55b9ae353bb4bced7ebff530b42.

Michael

[sent from post-receive hook]

On Mon, 07 Apr 2025 18:02:54 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> Package has been updated.
> 
> This reverts commit 6a96a1358212a24ffd7a2a5ace852ab681851a67.
> 
> Signed-off-by: Ladislav Michl <ladis@triops.cz>
> Message-Id: <Z-6cbsRuZlDs8DpM@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/syslogng.in b/rules/syslogng.in
> index 910398420116..0044905dbe02 100644
> --- a/rules/syslogng.in
> +++ b/rules/syslogng.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=networking
> +## SECTION=networking
>  # syslog-ng configuration
>  
>  menuconfig SYSLOGNG
> @@ -19,10 +17,6 @@ menuconfig SYSLOGNG
>  	help
>  	  The next generation syslog daemon.
>  
> -	  STAGING: remove in PTXdist 2026.03.0
> -	  Unmaintained in PTXdist and fails to build with current toolchains.
> -	  Needs updating to the latest version.
> -
>  if SYSLOGNG
>  
>  config SYSLOGNG_SPOOF_SOURCE