From patchwork Wed Aug 12 16:08:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Hilse X-Patchwork-Id: 1343772 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.a=rsa-sha256 header.s=20161025 header.b=qFDgq5Kx; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BRZQ20Prxz9sR4 for ; Thu, 13 Aug 2020 02:08:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 291848824D; Wed, 12 Aug 2020 16:08:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cYnO0po-QEu6; Wed, 12 Aug 2020 16:08:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1BAED88144; Wed, 12 Aug 2020 16:08:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7FAAF1BF4DD for ; Wed, 12 Aug 2020 16:08:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7C33787E90 for ; Wed, 12 Aug 2020 16:08:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z5l1CKNUSQBK for ; Wed, 12 Aug 2020 16:08:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by hemlock.osuosl.org (Postfix) with ESMTPS id 31F4287C7D for ; Wed, 12 Aug 2020 16:08:49 +0000 (UTC) Received: by mail-ej1-f42.google.com with SMTP id a26so2892267ejc.2 for ; Wed, 12 Aug 2020 09:08:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lgiZPFAMx9pvcNxmS9gY/SDVnfruV45OfEmG3xT8NCw=; b=qFDgq5KxtKBU9bJXZZL2MHykVAvRNPiWkr+pEeVmjA1sLv/qjP1z9gl6gYxPjIQIbW +Lm7BV9D/VyG5kqbD4A+8ec2N/oXkPzjK6P/MUyvc0oIcu8MRZxYg2fJBVsjGhEBXB1Q X+iouvtWTiCjg8QnYbNxODLzhZIaLz0vHkgd0o55Nb2A6zEtivWgvgg5sYHWkND6X79p +4kwSLLJvlkzzrixxs02AfFeASVkpPhlSDHYJDVj0HhLLWw4uKqgEZVO5J9zE2RYqbgz 5DzxgXrXVHU1atFUXNbe2vZv7jYYGaKSlQx+xaINJnEhE0YkQkyGZOf7dCdFZKRRWfSZ Ds1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lgiZPFAMx9pvcNxmS9gY/SDVnfruV45OfEmG3xT8NCw=; b=YzoFgdoq1fpSSPoQGNN3lXC7FHjS4Mdq3a4BwiLAholJU5gjH5o1biT2/oby6/Iu7P r8aj7EuTG7kAqlCUqXW/RaYvMx3wzmAPW831cu3c7gCbpby/Rx8i2Prr/k3u+HhUORKj +tpWdYSfjmrNu2dVEfGrn5gIlJpWjyUusLdx/AMG8gfskM1rm7+WghAHVHRkx/br9ATT 8PRR+A2IrgEAq1RTeW4m/67IYIsl7Onk4gzv7UdsJ8ZJ30+gomx2ueSrf8CRCOtV68J0 u0SYfFgRGObyi0wXGBMWbspQ/t1KSMHX8b64lMLxbGRfn9GtW5TGTmJUROYOFnKV1WNa i7AA== X-Gm-Message-State: AOAM530rzTHsQ7GQdV+C9syS3dKLfv50P3jo/wMUwl9uPbPWT96QS9cM TbKL/ejP1LTk6q5cOyIXnzstX9EXuAk= X-Google-Smtp-Source: ABdhPJzg+lu+q91hfuUJGJ5Gd324QvmUBeFuWiHCGzncF5BTI8J5cs04ee5b4g8JQxVHkSAsMZU1CA== X-Received: by 2002:a17:906:fcdb:: with SMTP id qx27mr463760ejb.421.1597248527314; Wed, 12 Aug 2020 09:08:47 -0700 (PDT) Received: from localhost.localdomain ([80.154.221.122]) by smtp.gmail.com with ESMTPSA id h22sm1889303ejf.100.2020.08.12.09.08.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Aug 2020 09:08:46 -0700 (PDT) From: Andreas Hilse To: buildroot@buildroot.org Date: Wed, 12 Aug 2020 18:08:43 +0200 Message-Id: <20200812160843.24064-1-andreas.hilse@googlemail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/sysklogd: bump to version 2.1.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Hilse Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - 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 --- 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 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