| Message ID | 20200812160843.24064-1-andreas.hilse@googlemail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] package/sysklogd: bump to version 2.1.2 | expand |
Hello Andreas, Thanks for the patch. On Wed, 12 Aug 2020 18:08:43 +0200 Andreas Hilse <andreas.hilse@googlemail.com> wrote: > - fixes: sysklogd 1.6 klogd with newer glibcs: kernel messages are logged to user facility I'd like to understand how disruptive/important this issue is. I.e, should we have this sysklogd version bump be considered as a bug fix? > - sysklogd removed klogd, functionality has been moved to syslogd > - now supports config fragments in /etc/syslog.d > - disabled sysklogd logger to not interfere with other loggers I think the license change should also be mentioned in the commit log, but that can be added when applying. Best regards, Thomas
Hello Thomas, > > - fixes: sysklogd 1.6 klogd with newer glibcs: kernel messages are logged to user facility > > I'd like to understand how disruptive/important this issue is. I.e, > should we have this sysklogd version bump be considered as a bug fix? You would only notice it when you changed the default syslog.conf to filter user.* messages to somewhere else than /var/log/messages. But yes, in our case I would see this as a bug fix as we suddenly saw kernel messages written to our user.log after switching from buildroot 2016.08 to 2020.02. > I think the license change should also be mentioned in the commit log, > but that can be added when applying. Ok. Best regards Andreas
Hello Andreas, On Wed, 12 Aug 2020 18:08:43 +0200 Andreas Hilse <andreas.hilse@googlemail.com> wrote: > - fixes: sysklogd 1.6 klogd with newer glibcs: kernel messages are logged to user facility > - sysklogd removed klogd, functionality has been moved to syslogd > - now supports config fragments in /etc/syslog.d > - disabled sysklogd logger to not interfere with other loggers > > Signed-off-by: Andreas Hilse <andreas.hilse@googlemail.com> I think the commit log should mention that the license has changed, with a link to https://github.com/troglobit/sysklogd/releases/tag/v2.1. However, I was about to apply, but got a build failure: syslogd.c: In function ‘opensys’: syslogd.c:486:42: error: ‘O_CLOEXEC’ undeclared (first use in this function) fd = open(file, O_RDONLY | O_NONBLOCK | O_CLOEXEC, 0); ^ syslogd.c:486:42: note: each undeclared identifier is reported only once for each function it appears in make[3]: *** [Makefile:646: syslogd-syslogd.o] Error 1 make[3]: *** Waiting for unfinished jobs.... syslog.c: In function ‘vsyslogp_r’: syslog.c:448:27: error: ‘O_CLOEXEC’ undeclared (first use in this function) O_WRONLY | O_NONBLOCK | O_CLOEXEC, 0)) >= 0) { ^ which happens with the following defconfig: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_SYSKLOGD=y # BR2_TARGET_ROOTFS_TAR is not set Could you have a look ? Thanks a lot! Thomas
Hello Thomas, > I think the commit log should mention that the license has changed, > with a link to https://github.com/troglobit/sysklogd/releases/tag/v2.1. Will do when I find out how to update the patch (have to read doc again). > syslog.c:448:27: error: ‘O_CLOEXEC’ undeclared (first use in this function) > O_WRONLY | O_NONBLOCK | O_CLOEXEC, 0)) >= 0) { This is fixable by CFLAGS="-D_GNU_SOURCE" e.g. in MAKE_OPTS. I contacted the sysklogd maintainer through github. Waiting on a response. Best regards Andreas
Hello, On Tue, 8 Dec 2020 21:41:27 +0100 Andreas Hilse <andreas.hilse@googlemail.com> wrote: > Hello Thomas, > > > I think the commit log should mention that the license has changed, > > with a link to https://github.com/troglobit/sysklogd/releases/tag/v2.1. > Will do when I find out how to update the patch (have to read doc again). git commit --amend will allow you to update the commit log of the top-most commit. Otherwise, I suggest you to document yourself about "git interactive rebase", this is really the key functionality to understand to be able to prepare patch series with Git. > > syslog.c:448:27: error: ‘O_CLOEXEC’ undeclared (first use in this > function) > > O_WRONLY | O_NONBLOCK | O_CLOEXEC, 0)) >= 0) { > This is fixable by CFLAGS="-D_GNU_SOURCE" e.g. in MAKE_OPTS. > I contacted the sysklogd maintainer through github. Waiting on a response. Then the particular file using O_CLOEXEC should probably #define _GNU_SOURCE before including any header file. Thomas
Hello Thomas, Hello Joachim, Joachim is the maintainer/developer of sysklogd. He already integrated the newer sysklogd as an external package in his project "netbox": https://github.com/westermo/netbox/tree/master/package/sysklogd2 The mentioned bug also has been fixed already by him (but not in a release). For my correspondence with Joachim please refer to https://github.com/troglobit/sysklogd/issues/24 Would it be useful for buildroot users to have the choice between the old and the new version of sysklogd? Best regards Andreas
Hello, On Tue, 29 Dec 2020 16:03:18 +0100 Andreas Hilse via buildroot <buildroot@busybox.net> wrote: > Joachim is the maintainer/developer of sysklogd. He already integrated the > newer sysklogd as an external package in his project "netbox": > https://github.com/westermo/netbox/tree/master/package/sysklogd2 > The mentioned bug also has been fixed already by him (but not in a release). > For my correspondence with Joachim please refer to > https://github.com/troglobit/sysklogd/issues/24 > > Would it be useful for buildroot users to have the choice between the old > and the new version of sysklogd? Well, in this very thread, you simply bumped the sysklogd package to this new 2.x version, which is fine for me. There were just a few issues to resolve, but other than that on the principle, I'm fine with package/sysklogd simply using the 2.x version of the project. Best regards, Thomas
diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index fda58e020e..996c46ffa1 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_SYSKLOGD - bool "syslogd & klogd" + bool "sysklogd" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS help - System log daemons syslogd and klogd. + System log daemon syslogd. https://github.com/troglobit/sysklogd/ diff --git a/package/sysklogd/S02klogd b/package/sysklogd/S02klogd deleted file mode 100644 index ba728aa99a..0000000000 --- a/package/sysklogd/S02klogd +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -DAEMON="klogd" -PIDFILE="/var/run/$DAEMON.pid" - -KLOGD_ARGS="" - -KLOGD_RELOAD="0" - -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" - -start() { - printf 'Starting %s: ' "$DAEMON" - # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" \ - -- $KLOGD_ARGS - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -stop() { - printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - start -} - -# SIGUSR1 makes klogd reload kernel module symbols -# SIGUSR2 makes klogd reload static kernel symbols and kernel module symbols -reload() { - printf 'Reloading %s: ' "$DAEMON" - start-stop-daemon -K -s "$KLOGD_RELOAD" -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -case "$1" in - start|stop|restart|reload) - "$1";; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/sysklogd/klogd.service b/package/sysklogd/klogd.service deleted file mode 100644 index b5dbb93d7d..0000000000 --- a/package/sysklogd/klogd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Kernel Log Daemon - -[Service] -ExecStart=/sbin/klogd -n -StandardOutput=null -Restart=on-failure - -[Install] -WantedBy=multi-user.target -WantedBy=syslogd.service diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 6f7ab6ece8..88ae0c745d 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1e9e18564c5bba474954d55ea6e2a0e3dc1bc145d8973c5fd098b088a9be9ceb sysklogd-1.6.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 09fe1edca882a9ae976cdbf516786edc1629347b9507d45dc005d9d969f94702 sysklogd-2.1.2.tar.gz +sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 7a25d0eb6f..cd013f658c 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,13 +4,13 @@ # ################################################################################ -SYSKLOGD_VERSION = 1.6 +SYSKLOGD_VERSION = 2.1.2 SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION)) -SYSKLOGD_LICENSE = GPL-2.0+ -SYSKLOGD_LICENSE_FILES = COPYING +SYSKLOGD_LICENSE = BSD-3-Clause +SYSKLOGD_LICENSE_FILES = LICENSE # From git SYSKLOGD_AUTORECONF = YES -SYSKLOGD_CONF_OPTS = --exec-prefix=/ +SYSKLOGD_CONF_OPTS = --exec-prefix=/ --without-logger define SYSKLOGD_INSTALL_SAMPLE_CONFIG $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ @@ -22,15 +22,11 @@ SYSKLOGD_POST_INSTALL_TARGET_HOOKS += SYSKLOGD_INSTALL_SAMPLE_CONFIG define SYSKLOGD_INSTALL_INIT_SYSV $(INSTALL) -m 755 -D package/sysklogd/S01syslogd \ $(TARGET_DIR)/etc/init.d/S01syslogd - $(INSTALL) -m 755 -D package/sysklogd/S02klogd \ - $(TARGET_DIR)/etc/init.d/S02klogd endef define SYSKLOGD_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/syslogd.service \ $(TARGET_DIR)/usr/lib/systemd/system/syslogd.service - $(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/klogd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/klogd.service endef $(eval $(autotools-package)) diff --git a/package/sysklogd/syslog.conf b/package/sysklogd/syslog.conf index 3184139052..db81da8868 100644 --- a/package/sysklogd/syslog.conf +++ b/package/sysklogd/syslog.conf @@ -1,5 +1,7 @@ # /etc/syslog.conf - Configuration file for syslogd +include /etc/syslog.d/*.conf + auth,authpriv.* /var/log/auth.log *.*;auth,authpriv.none /var/log/messages user.* /var/log/user.log diff --git a/package/sysklogd/syslogd.service b/package/sysklogd/syslogd.service index adaac679f2..1bf1bb3bd9 100644 --- a/package/sysklogd/syslogd.service +++ b/package/sysklogd/syslogd.service @@ -1,10 +1,9 @@ [Unit] Description=System Logging Service Requires=syslog.socket -Wants=klogd.service [Service] -ExecStart=/sbin/syslogd -m 0 -n +ExecStart=/sbin/syslogd -m 0 -F StandardOutput=null Restart=on-failure
- fixes: sysklogd 1.6 klogd with newer glibcs: kernel messages are logged to user facility - sysklogd removed klogd, functionality has been moved to syslogd - now supports config fragments in /etc/syslog.d - disabled sysklogd logger to not interfere with other loggers Signed-off-by: Andreas Hilse <andreas.hilse@googlemail.com> --- package/sysklogd/Config.in | 4 +- package/sysklogd/S02klogd | 65 -------------------------------- package/sysklogd/klogd.service | 11 ------ package/sysklogd/sysklogd.hash | 4 +- package/sysklogd/sysklogd.mk | 12 ++---- package/sysklogd/syslog.conf | 2 + package/sysklogd/syslogd.service | 3 +- 7 files changed, 11 insertions(+), 90 deletions(-) delete mode 100644 package/sysklogd/S02klogd delete mode 100644 package/sysklogd/klogd.service