* [Buildroot] [PATCH 2/2] package/syslog-ng: bump version to 4.2.0
2023-06-19 18:14 [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support Bernd Kuhls
@ 2023-06-19 18:14 ` Bernd Kuhls
2023-06-19 19:55 ` Chris Packham
2023-06-19 19:53 ` [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support Chris Packham
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2023-06-19 18:14 UTC (permalink / raw)
To: buildroot; +Cc: Chris Packham
Updated upstream URL of patch file.
Release notes:
https://axoflow.com/axosyslog-release-4-2/
https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-4.2.0
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
.checkpackageignore | 1 -
package/syslog-ng/0001-fix-build-on-uclibc.patch | 3 ++-
package/syslog-ng/syslog-ng.conf | 2 +-
package/syslog-ng/syslog-ng.hash | 2 +-
package/syslog-ng/syslog-ng.mk | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.checkpackageignore b/.checkpackageignore
index c78168e5ea..36ab2845d7 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1483,7 +1483,6 @@ package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch
package/suricata/S99suricata Shellcheck
package/swupdate/swupdate.sh Shellcheck
package/sylpheed/0001-harden-link-checker-before-accepting-click.patch Upstream
-package/syslog-ng/0001-fix-build-on-uclibc.patch Upstream
package/sysprof/0001-define-NT_GNU_BUILD_ID.patch Upstream
package/sysrepo/S51sysrepo-plugind Indent Shellcheck
package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch Upstream
diff --git a/package/syslog-ng/0001-fix-build-on-uclibc.patch b/package/syslog-ng/0001-fix-build-on-uclibc.patch
index dbb9b66b5c..07c3f0721c 100644
--- a/package/syslog-ng/0001-fix-build-on-uclibc.patch
+++ b/package/syslog-ng/0001-fix-build-on-uclibc.patch
@@ -9,8 +9,9 @@ pthread_spin_trylock so check for this function before using it
Fixes:
- http://autobuild.buildroot.org/results/0a6de11c030a4f39e402917809fc6d33fb463d1b
+Upstream: https://github.com/buytenh/ivykis/pull/22
+
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/buytenh/ivykis/pull/17]
---
configure.ac | 3 +++
src/spinlock.h | 4 ++++
diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf
index f4b74dc8c1..a3cfa8dacf 100644
--- a/package/syslog-ng/syslog-ng.conf
+++ b/package/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 4.1
+@version: 4.2
source s_sys {
file("/proc/kmsg" program_override("kernel"));
diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash
index 8ab4d5ac3b..a917331580 100644
--- a/package/syslog-ng/syslog-ng.hash
+++ b/package/syslog-ng/syslog-ng.hash
@@ -1,5 +1,5 @@
# Locally computed
-sha256 d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e syslog-ng-4.1.1.tar.gz
+sha256 092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda syslog-ng-4.2.0.tar.gz
sha256 c75dcbfc17ccf742f12042a370f825a40951085d2352dfc9d07e715dae3ca9bd COPYING
sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt
diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index ecc8eeddce..39433185b4 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -6,7 +6,7 @@
# When updating the version, please check at runtime if the version in
# syslog-ng.conf header needs to be updated
-SYSLOG_NG_VERSION = 4.1.1
+SYSLOG_NG_VERSION = 4.2.0
SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Buildroot] [PATCH 2/2] package/syslog-ng: bump version to 4.2.0
2023-06-19 18:14 ` [Buildroot] [PATCH 2/2] package/syslog-ng: bump version to 4.2.0 Bernd Kuhls
@ 2023-06-19 19:55 ` Chris Packham
0 siblings, 0 replies; 6+ messages in thread
From: Chris Packham @ 2023-06-19 19:55 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
[-- Attachment #1.1: Type: text/plain, Size: 3798 bytes --]
On Tue, 20 Jun 2023, 6:15 am Bernd Kuhls, <bernd@kuhls.net> wrote:
> Updated upstream URL of patch file.
>
> Release notes:
> https://axoflow.com/axosyslog-release-4-2/
> https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-4.2.0
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
> ---
> .checkpackageignore | 1 -
> package/syslog-ng/0001-fix-build-on-uclibc.patch | 3 ++-
> package/syslog-ng/syslog-ng.conf | 2 +-
> package/syslog-ng/syslog-ng.hash | 2 +-
> package/syslog-ng/syslog-ng.mk | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/.checkpackageignore b/.checkpackageignore
> index c78168e5ea..36ab2845d7 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1483,7 +1483,6 @@
> package/suricata/0002-configure.ac-allow-the-user-to-override-RUST_TARGET.patch
> package/suricata/S99suricata Shellcheck
> package/swupdate/swupdate.sh Shellcheck
> package/sylpheed/0001-harden-link-checker-before-accepting-click.patch
> Upstream
> -package/syslog-ng/0001-fix-build-on-uclibc.patch Upstream
> package/sysprof/0001-define-NT_GNU_BUILD_ID.patch Upstream
> package/sysrepo/S51sysrepo-plugind Indent Shellcheck
> package/system-config-printer/0001-Add-option-to-disable-xmlto-manual-generation.patch
> Upstream
> diff --git a/package/syslog-ng/0001-fix-build-on-uclibc.patch
> b/package/syslog-ng/0001-fix-build-on-uclibc.patch
> index dbb9b66b5c..07c3f0721c 100644
> --- a/package/syslog-ng/0001-fix-build-on-uclibc.patch
> +++ b/package/syslog-ng/0001-fix-build-on-uclibc.patch
> @@ -9,8 +9,9 @@ pthread_spin_trylock so check for this function before
> using it
> Fixes:
> -
> http://autobuild.buildroot.org/results/0a6de11c030a4f39e402917809fc6d33fb463d1b
>
> +Upstream: https://github.com/buytenh/ivykis/pull/22
> +
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status: https://github.com/buytenh/ivykis/pull/17]
> ---
> configure.ac | 3 +++
> src/spinlock.h | 4 ++++
> diff --git a/package/syslog-ng/syslog-ng.conf
> b/package/syslog-ng/syslog-ng.conf
> index f4b74dc8c1..a3cfa8dacf 100644
> --- a/package/syslog-ng/syslog-ng.conf
> +++ b/package/syslog-ng/syslog-ng.conf
> @@ -1,4 +1,4 @@
> -@version: 4.1
> +@version: 4.2
>
> source s_sys {
> file("/proc/kmsg" program_override("kernel"));
> diff --git a/package/syslog-ng/syslog-ng.hash
> b/package/syslog-ng/syslog-ng.hash
> index 8ab4d5ac3b..a917331580 100644
> --- a/package/syslog-ng/syslog-ng.hash
> +++ b/package/syslog-ng/syslog-ng.hash
> @@ -1,5 +1,5 @@
> # Locally computed
> -sha256 d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e
> syslog-ng-4.1.1.tar.gz
> +sha256 092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda
> syslog-ng-4.2.0.tar.gz
> sha256 c75dcbfc17ccf742f12042a370f825a40951085d2352dfc9d07e715dae3ca9bd
> COPYING
> sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2
> GPL.txt
> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551
> LGPL.txt
> diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/
> syslog-ng.mk
> index ecc8eeddce..39433185b4 100644
> --- a/package/syslog-ng/syslog-ng.mk
> +++ b/package/syslog-ng/syslog-ng.mk
> @@ -6,7 +6,7 @@
>
> # When updating the version, please check at runtime if the version in
> # syslog-ng.conf header needs to be updated
> -SYSLOG_NG_VERSION = 4.1.1
> +SYSLOG_NG_VERSION = 4.2.0
> SYSLOG_NG_SITE =
> https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
> SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
> SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt
> --
> 2.39.2
>
>
[-- Attachment #1.2: Type: text/html, Size: 5998 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support
2023-06-19 18:14 [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support Bernd Kuhls
2023-06-19 18:14 ` [Buildroot] [PATCH 2/2] package/syslog-ng: bump version to 4.2.0 Bernd Kuhls
@ 2023-06-19 19:53 ` Chris Packham
2023-07-01 14:41 ` Thomas Petazzoni via buildroot
2023-07-16 16:02 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Chris Packham @ 2023-06-19 19:53 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: buildroot
[-- Attachment #1.1: Type: text/plain, Size: 1911 bytes --]
Hi Bernd,
On Tue, 20 Jun 2023, 6:15 am Bernd Kuhls, <bernd@kuhls.net> wrote:
> Upstream added a list of python modules declared as runtime dependencies
>
> https://github.com/syslog-ng/syslog-ng/commit/f18345d2a16aea1a95d891ebb24a4ace9c652621
> most of them with fixed (and outdated) versions.
>
> Disable python support for the time being.
>
> Fixes:
>
> http://autobuild.buildroot.net/results/436/436e90bb1f77143b05cb98df78934555bbb7df35/
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
>
Thanks, I had hoped to find a way of avoiding disabling python support but
this seems like the best thing we can do right now.
Reviewed-by: Chris Packham <judge.packham@gmail.com>
> ---
> package/syslog-ng/syslog-ng.mk | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/
> syslog-ng.mk
> index 1c4cec6adb..ecc8eeddce 100644
> --- a/package/syslog-ng/syslog-ng.mk
> +++ b/package/syslog-ng/syslog-ng.mk
> @@ -16,7 +16,8 @@ SYSLOG_NG_DEPENDENCIES = host-bison host-flex
> host-pkgconf \
> # We're patching configure.ac
> SYSLOG_NG_AUTORECONF = YES
> SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
> - --disable-java --disable-java-modules --disable-mongodb
> + --disable-java --disable-java-modules --disable-mongodb \
> + --disable-python
> SYSLOG_NG_CFLAGS = $(TARGET_CFLAGS)
>
> ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101915),y)
> @@ -39,15 +40,6 @@ else
> SYSLOG_NG_CONF_OPTS += --disable-linux-caps
> endif
>
> -ifeq ($(BR2_PACKAGE_PYTHON3),y)
> -SYSLOG_NG_DEPENDENCIES += python3
> -SYSLOG_NG_CONF_OPTS += \
> - --enable-python \
> - --with-python=$(PYTHON3_VERSION_MAJOR)
> -else
> -SYSLOG_NG_CONF_OPTS += --disable-python
> -endif
> -
> ifeq ($(BR2_PACKAGE_LIBESMTP),y)
> SYSLOG_NG_DEPENDENCIES += libesmtp
> SYSLOG_NG_CONF_OPTS += --enable-smtp
> --
> 2.39.2
>
>
[-- Attachment #1.2: Type: text/html, Size: 3499 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support
2023-06-19 18:14 [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support Bernd Kuhls
2023-06-19 18:14 ` [Buildroot] [PATCH 2/2] package/syslog-ng: bump version to 4.2.0 Bernd Kuhls
2023-06-19 19:53 ` [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support Chris Packham
@ 2023-07-01 14:41 ` Thomas Petazzoni via buildroot
2023-07-16 16:02 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-07-01 14:41 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Chris Packham, buildroot
On Mon, 19 Jun 2023 20:14:57 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:
> Upstream added a list of python modules declared as runtime dependencies
> https://github.com/syslog-ng/syslog-ng/commit/f18345d2a16aea1a95d891ebb24a4ace9c652621
> most of them with fixed (and outdated) versions.
>
> Disable python support for the time being.
>
> Fixes:
> http://autobuild.buildroot.net/results/436/436e90bb1f77143b05cb98df78934555bbb7df35/
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> package/syslog-ng/syslog-ng.mk | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
Both applied, thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support
2023-06-19 18:14 [Buildroot] [PATCH 1/2] package/syslog-ng: disable python support Bernd Kuhls
` (2 preceding siblings ...)
2023-07-01 14:41 ` Thomas Petazzoni via buildroot
@ 2023-07-16 16:02 ` Peter Korsgaard
3 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2023-07-16 16:02 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Chris Packham, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
> Upstream added a list of python modules declared as runtime dependencies
> https://github.com/syslog-ng/syslog-ng/commit/f18345d2a16aea1a95d891ebb24a4ace9c652621
> most of them with fixed (and outdated) versions.
> Disable python support for the time being.
> Fixes:
> http://autobuild.buildroot.net/results/436/436e90bb1f77143b05cb98df78934555bbb7df35/
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Committed to 2023.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread