Skip to contentSkip to conversation

syslog-ng: update version in config file

PATCH New Chris Packham 4 participants 7 messages Sep 9, 2019 – Sep 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 syslog-ng: update version in config file

syslog-ng warns when using a configuration from an older version. Update the version in the example config.

Fixes 9695f3e069 ("package/syslog-ng: bump version to 3.22.1")
---
 package/syslog-ng/syslog-ng.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/syslog-ng/syslog-ng.conf +1 -1
index 9a56a1302d..cab3a7e75a 100644
@@ -1,4 +1,4 @@
- at version: 3.19
+ at version: 3.22
 
 source s_sys {
 	file("/proc/kmsg" program_override("kernel"));
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/2 eventlog: remove package

Since syslog-ng 3.11.1 eventlog has been bundled with the sources. Remove the separate package.

---
 DEVELOPERS                     |  1 -
 package/Config.in              |  1 -
 package/eventlog/Config.in     |  8 --------
 package/eventlog/eventlog.hash |  2 --
 package/eventlog/eventlog.mk   | 15 ---------------
 package/syslog-ng/syslog-ng.mk |  2 +-
 6 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 package/eventlog/Config.in
 delete mode 100644 package/eventlog/eventlog.hash
 delete mode 100644 package/eventlog/eventlog.mk
DEVELOPERS +0 -1
index 5784843e33..bdf3565f65 100644
@@ -490,7 +490,6 @@ F:	configs/olimex_a13_olinuxino_defconfig
 F:	configs/orangepi_plus_defconfig
 
 N:	Chris Packham <[email protected]>
-F:	package/eventlog/
 F:	package/gstreamer1/gst1-shark/
 F:	package/micropython/
 F:	package/micropython-lib/
package/Config.in +0 -1
index 9336261c5d..ee17778c45 100644
@@ -1489,7 +1489,6 @@ menu "JSON/XML"
 endmenu
 
 menu "Logging"
-	source "package/eventlog/Config.in"
 	source "package/glog/Config.in"
 	source "package/liblog4c-localtime/Config.in"
 	source "package/liblogging/Config.in"
package/eventlog/Config.in deleted +0 -8
deleted file mode 100644
index f9442f6187..0000000000
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_EVENTLOG
-	bool "eventlog"
-	help
-	  eventlog is a library for creating structured events from
-	  applications, and is the workhorse behind syslog-ng's own
-	  messages.
-
-	  https://my.balabit.com/downloads/eventlog/
package/eventlog/eventlog.hash deleted +0 -2
deleted file mode 100644
index b8f2ec6141..0000000000
@@ -1,2 +0,0 @@
-# From https://my.balabit.com/downloads/eventlog/0.2/eventlog_0.2.12.dsc
-sha256 494dac8e01dc5ce323df2ad554d94874938dab51aa025987677b2bc6906a9c66 eventlog_0.2.12.tar.gz
package/eventlog/eventlog.mk deleted +0 -15
deleted file mode 100644
index 7253657165..0000000000
@@ -1,15 +0,0 @@
-################################################################################
-#
-# eventlog
-#
-################################################################################
-
-EVENTLOG_VERSION_MAJOR = 0.2
-EVENTLOG_VERSION = $(EVENTLOG_VERSION_MAJOR).12
-EVENTLOG_SOURCE = eventlog_$(EVENTLOG_VERSION).tar.gz
-EVENTLOG_SITE = https://my.balabit.com/downloads/eventlog/$(EVENTLOG_VERSION_MAJOR)
-EVENTLOG_LICENSE = BSD-3-Clause
-EVENTLOG_LICENSE_FILES = COPYING
-EVENTLOG_INSTALL_STAGING = YES
-
-$(eval $(autotools-package))
package/syslog-ng/syslog-ng.mk +1 -1
index 05ccd751e4..3885f0b942 100644
@@ -11,7 +11,7 @@ SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-n
 SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
 SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt
 SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
-	eventlog libglib2 openssl pcre
+	libglib2 openssl pcre
 # We're patching configure.ac
 SYSLOG_NG_AUTORECONF = YES
 SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
Signature · 1 line
2.23.0
#5 lore raw

PATCH 1/2 syslog-ng: update version in config file

In reply to Chris Packham
Quoted 21 lines · Chris Packham

syslog-ng warns when using a configuration from an older version. Update the version in the example config.

Fixes 9695f3e069 ("package/syslog-ng: bump version to 3.22.1")
---
 package/syslog-ng/syslog-ng.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/syslog-ng/syslog-ng.conf +1 -2
index 9a56a1302d..cab3a7e75a 100644
@@ -1,4 +1,4 @@
- at version: 3.19
+ at version: 3.22
 
 source s_sys {
        file("/proc/kmsg" program_override("kernel"));
--
Quoted 1 line

2.23.0

#6 lore raw

PATCH 1/2 syslog-ng: update version in config file

In reply to Chris Packham
Quoted 8 lines · On Mon, 9 Sep 2019 21:54:31 +1200 Chris Packham <[email protected]>…

syslog-ng warns when using a configuration from an older version. Update the version in the example config.

Fixes 9695f3e069 ("package/syslog-ng: bump version to 3.22.1")
---
 package/syslog-ng/syslog-ng.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 2/2 eventlog: remove package

In reply to Chris Packham
Quoted 4 lines · On Mon, 9 Sep 2019 21:54:32 +1200 Chris Packham <[email protected]>…

Since syslog-ng 3.11.1 eventlog has been bundled with the sources. Remove the separate package.

Quoted 11 lines
---
 DEVELOPERS                     |  1 -
 package/Config.in              |  1 -
 package/eventlog/Config.in     |  8 --------
 package/eventlog/eventlog.hash |  2 --
 package/eventlog/eventlog.mk   | 15 ---------------
 package/syslog-ng/syslog-ng.mk |  2 +-
 6 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 package/eventlog/Config.in
 delete mode 100644 package/eventlog/eventlog.hash
 delete mode 100644 package/eventlog/eventlog.mk

The question is whether we need Config.in.legacy handling for the removal of this package/option. Since it seems like the only user of eventlog was syslog-ng, then supposedly anyone having eventlog enabled also has syslog-ng enabled. If that's the case, then we probably can do without any Config.in.legacy handling, because silently dropping the BR2_PACKAGE_EVENTLOG=y when Buildroot gets updated is the right thing.

Chris, Arnout, any opinion on this ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/2 eventlog: remove package

Quoted 19 lines · Thomas Petazzoni
Quoted 4 lines · On Mon, 9 Sep 2019 21:54:32 +1200 Chris Packham <[email protected]>…

Since syslog-ng 3.11.1 eventlog has been bundled with the sources. Remove the separate package.

Quoted 11 lines
---
 DEVELOPERS                     |  1 -
 package/Config.in              |  1 -
 package/eventlog/Config.in     |  8 --------
 package/eventlog/eventlog.hash |  2 --
 package/eventlog/eventlog.mk   | 15 ---------------
 package/syslog-ng/syslog-ng.mk |  2 +-
 6 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 package/eventlog/Config.in
 delete mode 100644 package/eventlog/eventlog.hash
 delete mode 100644 package/eventlog/eventlog.mk
Quoted 4 lines

The question is whether we need Config.in.legacy handling for the removal of this package/option. Since it seems like the only user of eventlog was syslog-ng, then supposedly anyone having eventlog enabled also has syslog-ng enabled.

Well, theoretically it is possible that someone is using eventlog independently
in their own software...

Given how difficult it was to find that package, however, I doubt that this is
the case, so I'm OK with dropping legacy handling. It will make life easier for the (undoubtedly much more numerous) users who have syslog-ng enabled.

Regards,
Arnout

Quoted 8 lines

If that's the case, then we probably can do
without any Config.in.legacy handling, because silently dropping the BR2_PACKAGE_EVENTLOG=y when Buildroot gets updated is the right thing.

Chris, Arnout, any opinion on this ?

Thomas

#4 lore raw

PATCH 2/2 eventlog: remove package

In reply to Chris Packham
Quoted 4 lines · On Mon, 9 Sep 2019 21:54:32 +1200 Chris Packham <[email protected]>…

Since syslog-ng 3.11.1 eventlog has been bundled with the sources. Remove the separate package.

Quoted 11 lines
---
 DEVELOPERS                     |  1 -
 package/Config.in              |  1 -
 package/eventlog/Config.in     |  8 --------
 package/eventlog/eventlog.hash |  2 --
 package/eventlog/eventlog.mk   | 15 ---------------
 package/syslog-ng/syslog-ng.mk |  2 +-
 6 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 package/eventlog/Config.in
 delete mode 100644 package/eventlog/eventlog.hash
 delete mode 100644 package/eventlog/eventlog.mk

Applied to master after extending the commit log to explain why we don't have any Config.in.legacy handling for this package removal.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com