Message ID | 20210922094113.1166868-1-judge.packham@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | package/syslog-ng: Bump version to 3.34.1 | expand |
On 22/09/2021 11:41, Chris Packham wrote: > Update to syslog-ng-3.34.1. Drop patch that has been applied upstream. > Update version in config file. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Applied to master, thanks. Regards, Arnout > --- > ...ules-diskq-dqtool.c-fix-static-build.patch | 33 ------------------- > package/syslog-ng/syslog-ng.conf | 2 +- > package/syslog-ng/syslog-ng.hash | 2 +- > package/syslog-ng/syslog-ng.mk | 2 +- > 4 files changed, 3 insertions(+), 36 deletions(-) > delete mode 100644 package/syslog-ng/0002-modules-diskq-dqtool.c-fix-static-build.patch > > diff --git a/package/syslog-ng/0002-modules-diskq-dqtool.c-fix-static-build.patch b/package/syslog-ng/0002-modules-diskq-dqtool.c-fix-static-build.patch > deleted file mode 100644 > index 3332b12e9e..0000000000 > --- a/package/syslog-ng/0002-modules-diskq-dqtool.c-fix-static-build.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -From 04c8fe720d09bd6e53c4bcea9ad72ff131925ce6 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Date: Fri, 23 Jul 2021 18:41:29 +0200 > -Subject: [PATCH] modules/diskq/dqtool.c: fix static build > - > -Fix the following static build failure: > - > -/data/buildroot-autobuilder/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.2.0/../../../../riscv64-buildroot-linux-musl/bin/ld: ./lib/.libs/libsyslog-ng.a(lib_libsyslog_ng_la-messages.o):(.sbss+0x2c): multiple definition of `verbose_flag'; modules/diskq/dqtool.o:(.sbss+0x4): first defined here > -/data/buildroot-autobuilder/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.2.0/../../../../riscv64-buildroot-linux-musl/bin/ld: ./lib/.libs/libsyslog-ng.a(lib_libsyslog_ng_la-messages.o):(.sbss+0x30): multiple definition of `debug_flag'; modules/diskq/dqtool.o:(.sbss+0x8): first defined here > - > -Fixes: > - - http://autobuild.buildroot.org/results/ccd0a954f6e0676db67026f8b8c89823f3e5c510 > - > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -[Retrieved from: > -https://github.com/syslog-ng/syslog-ng/commit/04c8fe720d09bd6e53c4bcea9ad72ff131925ce6] > ---- > - modules/diskq/dqtool.c | 2 -- > - 1 file changed, 2 deletions(-) > - > -diff --git a/modules/diskq/dqtool.c b/modules/diskq/dqtool.c > -index 6105f2ec68..50be452453 100644 > ---- a/modules/diskq/dqtool.c > -+++ b/modules/diskq/dqtool.c > -@@ -49,8 +49,6 @@ gchar *persist_file_path; > - gchar *assign_persist_name; > - gboolean relocate_all; > - gboolean display_version; > --gboolean debug_flag; > --gboolean verbose_flag; > - gboolean assign_help; > - > - static GOptionEntry cat_options[] = > diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf > index 4d1526b812..55d01501cb 100644 > --- a/package/syslog-ng/syslog-ng.conf > +++ b/package/syslog-ng/syslog-ng.conf > @@ -1,4 +1,4 @@ > -@version: 3.33 > +@version: 3.34 > > 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 df8002341c..99ed363eca 100644 > --- a/package/syslog-ng/syslog-ng.hash > +++ b/package/syslog-ng/syslog-ng.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 0b786a06077b9150191d714f45a1b4b3792952cb58163a3af336f074da9fb14b syslog-ng-3.33.2.tar.gz > +sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz > sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b 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 765e886b12..f37e7c2ea5 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 = 3.33.2 > +SYSLOG_NG_VERSION = 3.34.1 > 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 >
diff --git a/package/syslog-ng/0002-modules-diskq-dqtool.c-fix-static-build.patch b/package/syslog-ng/0002-modules-diskq-dqtool.c-fix-static-build.patch deleted file mode 100644 index 3332b12e9e..0000000000 --- a/package/syslog-ng/0002-modules-diskq-dqtool.c-fix-static-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 04c8fe720d09bd6e53c4bcea9ad72ff131925ce6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Fri, 23 Jul 2021 18:41:29 +0200 -Subject: [PATCH] modules/diskq/dqtool.c: fix static build - -Fix the following static build failure: - -/data/buildroot-autobuilder/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.2.0/../../../../riscv64-buildroot-linux-musl/bin/ld: ./lib/.libs/libsyslog-ng.a(lib_libsyslog_ng_la-messages.o):(.sbss+0x2c): multiple definition of `verbose_flag'; modules/diskq/dqtool.o:(.sbss+0x4): first defined here -/data/buildroot-autobuilder/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv64-buildroot-linux-musl/10.2.0/../../../../riscv64-buildroot-linux-musl/bin/ld: ./lib/.libs/libsyslog-ng.a(lib_libsyslog_ng_la-messages.o):(.sbss+0x30): multiple definition of `debug_flag'; modules/diskq/dqtool.o:(.sbss+0x8): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/ccd0a954f6e0676db67026f8b8c89823f3e5c510 - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -[Retrieved from: -https://github.com/syslog-ng/syslog-ng/commit/04c8fe720d09bd6e53c4bcea9ad72ff131925ce6] ---- - modules/diskq/dqtool.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/modules/diskq/dqtool.c b/modules/diskq/dqtool.c -index 6105f2ec68..50be452453 100644 ---- a/modules/diskq/dqtool.c -+++ b/modules/diskq/dqtool.c -@@ -49,8 +49,6 @@ gchar *persist_file_path; - gchar *assign_persist_name; - gboolean relocate_all; - gboolean display_version; --gboolean debug_flag; --gboolean verbose_flag; - gboolean assign_help; - - static GOptionEntry cat_options[] = diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index 4d1526b812..55d01501cb 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.33 +@version: 3.34 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 df8002341c..99ed363eca 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 0b786a06077b9150191d714f45a1b4b3792952cb58163a3af336f074da9fb14b syslog-ng-3.33.2.tar.gz +sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b 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 765e886b12..f37e7c2ea5 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 = 3.33.2 +SYSLOG_NG_VERSION = 3.34.1 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
Update to syslog-ng-3.34.1. Drop patch that has been applied upstream. Update version in config file. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- ...ules-diskq-dqtool.c-fix-static-build.patch | 33 ------------------- package/syslog-ng/syslog-ng.conf | 2 +- package/syslog-ng/syslog-ng.hash | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 4 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/syslog-ng/0002-modules-diskq-dqtool.c-fix-static-build.patch