From patchwork Fri Jan 22 15:43:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Wiberg X-Patchwork-Id: 1430422 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=XXsNPnoS; 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 4DMk8C2H10z9sVm for ; Sat, 23 Jan 2021 02:44:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D83ED870C6; Fri, 22 Jan 2021 15:44:07 +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 gU+HZJHeZLv6; Fri, 22 Jan 2021 15:44:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1A82686C73; Fri, 22 Jan 2021 15:44:05 +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 93B301C113E for ; Fri, 22 Jan 2021 15:44:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 90D998735E for ; Fri, 22 Jan 2021 15:44:01 +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 cLeq+SA1ekRg for ; Fri, 22 Jan 2021 15:44:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6ABD287377 for ; Fri, 22 Jan 2021 15:44:00 +0000 (UTC) Received: by mail-lf1-f44.google.com with SMTP id a8so8118971lfi.8 for ; Fri, 22 Jan 2021 07:44:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8lbv85xD8bmsY3JeMslV+hmp2p+YYwlYgHVWUUVDi/M=; b=XXsNPnoShgiEvTM6HopacU/VIjNHP/p3GcPbU3PnxvuZfNnXl72MBn1Uat+cCouNSq xXUhgWyrXGzZNTK7wGQbujFfRrkLqvXa1RDfC3mryyRqUDL/tbrCdOlcw7p/U0E/jBEp jkRjikP4zuDD09mNzM13WmHY8iv8nA1GdEw4e+/iN40Pz9Jwf5258bQ78qj6EJ2BfunK FyU4U0uwufVfbZLe33ktJ3+lKm94kNQQP5wtrUKxOYiw/l2MEdD80h/WRUcE7/B5IqpE 6dX5hq3jU0Vy4yDcq4OmByqi/U0K/NWmdkmwMp87fhOU3Sfyf9dnjWq/IEOj+kSVYSmR doug== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=8lbv85xD8bmsY3JeMslV+hmp2p+YYwlYgHVWUUVDi/M=; b=lnqoojJfPVVTVSykSGJ/88bmPdolnF8+bn0ggfoXr5MjklNJFQ97xGH6gxT82EU69F nV+RWn387fXkPYuDfW39qDdaKFH34qZfipGn6AafzN2Xs24k8X4mgRV5HlRh7qbdKQmE A5Jtux3l/4rW6wFr4kFXu7ww8JzjjfFie9wa4rvgMvUixrI0+ePlyXD04uZYmbmt9hrN CycefCo7aXM41ebl4UZKVMWgJLxf4mV2YCy2ETgcNt0AnS70I2nfQW6W8aF1n+Lw/4M3 1PkhKAp+VIMUXcfLFZ2/UMu9VjFNMGNSnBBfsr8CIe78or8MEqILCYY9KTPfD7+8083k 3gZQ== X-Gm-Message-State: AOAM531EeT9UTG94QDk/16S7hdrlexXqv07jy5oYKGlfovFBK7DmaekH 5c28feBtJkXJzlTeToBnattwjF0mnLwPCQ== X-Google-Smtp-Source: ABdhPJzdQzLY+11kPwnjsbRw7GBKuKT0iBgg4Vaw5yfkeH45oOXClCop7/QFPtj8bTyAwM86IKVo/A== X-Received: by 2002:ac2:5e81:: with SMTP id b1mr411335lfq.473.1611330237986; Fri, 22 Jan 2021 07:43:57 -0800 (PST) Received: from luthien.lan (h-82-196-111-206.NA.cust.bahnhof.se. [82.196.111.206]) by smtp.gmail.com with ESMTPSA id z19sm971733ljz.107.2021.01.22.07.43.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 07:43:57 -0800 (PST) From: Joachim Wiberg To: buildroot@buildroot.org Date: Fri, 22 Jan 2021 16:43:31 +0100 Message-Id: <20210122154333.1927190-2-troglobit@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210122154333.1927190-1-troglobit@gmail.com> References: <20210122154333.1927190-1-troglobit@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/sysklogd: bump to verson 2.2.0 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: Joachim Wiberg , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Prefer maintainer provided package, not GitHub generated archive - Local backport of O_CLOEXEC patch not needed anymore, in v2.2.0 - Install to /usr, with config in /etc and logs in /var - Update systemd unit file - New daemon path, /usr/sbin - Add support for /etc/default/syslogd, same as SysV init script Signed-off-by: Joachim Wiberg --- ...RCE_required_for_O_CLOEXEC_on_uClibc.patch | 44 ------------------- package/sysklogd/sysklogd.hash | 2 +- package/sysklogd/sysklogd.mk | 8 ++-- package/sysklogd/syslogd.service | 3 +- 4 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch diff --git a/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch b/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch deleted file mode 100644 index 684b6b3e4c..0000000000 --- a/package/sysklogd/0001-Define-_GNU_SOURCE_required_for_O_CLOEXEC_on_uClibc.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 93117e58016de6f604e67263b5135adbba032367 Mon Sep 17 00:00:00 2001 -From: Joachim Wiberg -Date: Sun, 30 Aug 2020 11:41:45 +0200 -Subject: [PATCH] Define _GNU_SOURCE, required for O_CLOEXEC on uClibc - -When building sysklogd on a uClibc system we must define _GNU_SOURCE to -get O_CLOEXEC. - -Since _GNU_SOURCE is also required for asprintf() with GLIBC, as used by -the pidfile() replacement function, we drop it from there and rely on -AM_CPPFLAGS for all sources. - -Signed-off-by: Joachim Wiberg -Signed-off-by: Andreas Hilse ---- - lib/pidfile.c | 1 - - src/Makefile.am | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/pidfile.c b/lib/pidfile.c -index a26de73..886a29c 100644 ---- a/lib/pidfile.c -+++ b/lib/pidfile.c -@@ -31,7 +31,6 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - --#define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */ - #include /* utimensat() */ - #include /* utimensat() on *BSD */ - #include -diff --git a/src/Makefile.am b/src/Makefile.am -index 9b80a02..1909ada 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -36,7 +36,7 @@ endif - AM_CFLAGS = -W -Wall -Wextra - AM_CFLAGS += -Wno-unused-result -Wno-unused-parameter -fno-strict-aliasing - AM_CPPFLAGS = -DSYSCONFDIR=\"@sysconfdir@\" -DRUNSTATEDIR=\"@runstatedir@\" --AM_CPPFLAGS += -D_BSD_SOURCE -D_DEFAULT_SOURCE -+AM_CPPFLAGS += -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE - - syslogd_SOURCES = syslogd.c syslogd.h socket.c socket.h syslog.h - syslogd_SOURCES += timer.c timer.h queue.h compat.h diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 978a670d30..91550aa0dc 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 09fe1edca882a9ae976cdbf516786edc1629347b9507d45dc005d9d969f94702 sysklogd-2.1.2.tar.gz +sha256 60546ae50a9f30b31c19ed9a3ad788ce5798025b0f9a0d552c1a04d5eeac494d sysklogd-2.2.0.tar.gz sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 200738897d..fc54ab6936 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,14 +4,12 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.1.2 -SYSKLOGD_SITE = $(call github,troglobit,sysklogd,v$(SYSKLOGD_VERSION)) +SYSKLOGD_VERSION = 2.2.0 +SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE SYSKLOGD_CPE_ID_VALID = YES -# From git -SYSKLOGD_AUTORECONF = YES -SYSKLOGD_CONF_OPTS = --exec-prefix=/ --without-logger +SYSKLOGD_CONF_OPTS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var define SYSKLOGD_INSTALL_SAMPLE_CONFIG $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ diff --git a/package/sysklogd/syslogd.service b/package/sysklogd/syslogd.service index 1bf1bb3bd9..0e14369596 100644 --- a/package/sysklogd/syslogd.service +++ b/package/sysklogd/syslogd.service @@ -3,7 +3,8 @@ Description=System Logging Service Requires=syslog.socket [Service] -ExecStart=/sbin/syslogd -m 0 -F +EnvironmentFile=-/etc/default/syslogd +ExecStart=/usr/sbin/syslogd -m 0 -F $SYSLOGD_ARGS StandardOutput=null Restart=on-failure From patchwork Fri Jan 22 15:43:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Wiberg X-Patchwork-Id: 1430423 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=PxQl31JT; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DMk8F2dKdz9sS8 for ; Sat, 23 Jan 2021 02:44:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F294885B99; Fri, 22 Jan 2021 15:44:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NOhPOWsjf4GG; Fri, 22 Jan 2021 15:44:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 659B2845C3; Fri, 22 Jan 2021 15:44:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 685731C113E for ; Fri, 22 Jan 2021 15:44:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6515A86A95 for ; Fri, 22 Jan 2021 15:44:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iqVL0035y79d for ; Fri, 22 Jan 2021 15:44:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 32E7086A5B for ; Fri, 22 Jan 2021 15:44:01 +0000 (UTC) Received: by mail-lj1-f182.google.com with SMTP id j3so7010487ljb.9 for ; Fri, 22 Jan 2021 07:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PKVMLOOdOJvhyM2smK0TRndZWRYVk5ZfjpIfWyf/uE0=; b=PxQl31JTznMJetP6R41g9iqaMZ2D5leP8xO3v+24z0CUWB/EjOXnsk7tmAxf2VZx4R sGjQUeNC5rmdzabp851+OP3/0T4ZxNGz8mlbjn1I5i2Bh4kWV0yaJBK/Pl/N+P/FGZkQ kM34vjnLh+6dALDL1YU8eTJQ0lSsJFDD+fSCljm+oxNsLRt5JzLqExs6slQAtvY8R5BT 9yzKCiAJgWp+dpRpfqqgehzfsAfL9nT7jt42PB+7R0QeHNrg93BC2Y4UGBqGdsrSf/6k WzrD70h4aTNOS9OpJXKHAXGXYahEyPNXLKDAvR/2fl/Hkf+5kwzfXUeXlh0SloJ0xoId 6MAA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=PKVMLOOdOJvhyM2smK0TRndZWRYVk5ZfjpIfWyf/uE0=; b=jUgfL1s8tSvMrfgu4RE9KeTuwQsqcHjdECvwvrrK+zeOVUsxLe9XHG98qxwsLdTm2S vtMMjYZGkqzVDBGTjWCRm0lAMiUJqe0vAseWDB4WVJQhfv/KNTf5TLwHHNDot/BB8FTr DopnpGjbQ4uAs3Z5NxwCu9epvyOYMOs0/U/moWU2N22+7RAg/1ocAE1QfDtVj77qQwnG +/IFjut8YvVLm+dXbFJeREQHxUdfe8cO3WEnsSThdelkxKOvx6Z/VuDC+xzm2xUhjETw vB3QvXirceORjcOHC8WAik3lTi0GiwsiQA/RdHCiL+38kzwP1zMXQfFAG7Bx73QeOvV2 OmQg== X-Gm-Message-State: AOAM531OfnMYRP5VmJVqta7YIYTW7h3u9e6WCZhSIIy02WAmDG0iZdGU MTEEscu0EObn2GiZOigqU7kmrdriQSsNbA== X-Google-Smtp-Source: ABdhPJwuGkbYxxqTZ2T9CJmKWzPfAxETb9YxDa9ABlQbZgd3ZVHrgKXQA8S0hm2oQ0rjSY7Rd7kh5w== X-Received: by 2002:a05:651c:28d:: with SMTP id b13mr610779ljo.75.1611330239162; Fri, 22 Jan 2021 07:43:59 -0800 (PST) Received: from luthien.lan (h-82-196-111-206.NA.cust.bahnhof.se. [82.196.111.206]) by smtp.gmail.com with ESMTPSA id z19sm971733ljz.107.2021.01.22.07.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 07:43:58 -0800 (PST) From: Joachim Wiberg To: buildroot@buildroot.org Date: Fri, 22 Jan 2021 16:43:32 +0100 Message-Id: <20210122154333.1927190-3-troglobit@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210122154333.1927190-1-troglobit@gmail.com> References: <20210122154333.1927190-1-troglobit@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/sysklogd: add menuconfig support for enabling native logger 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: Joachim Wiberg , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Installs to /usr/bin and thus replaces the BusyBox logger if enabled. Signed-off-by: Joachim Wiberg --- package/sysklogd/Config.in | 17 +++++++++++++++++ package/sysklogd/sysklogd.mk | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index 90649caa83..52bed0cc18 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -13,7 +13,24 @@ config BR2_PACKAGE_SYSKLOGD https://github.com/troglobit/sysklogd/ +if BR2_PACKAGE_SYSKLOGD + +config BR2_PACKAGE_SYSKLOGD_LOGGER + bool "logger tool" + help + Generate log messages from scripts or from the command line. + + This version of logger is receommended for use with sysklogd. + It makes use of the new syslogp() API for RFC5424 style logs, + e.g. MSGID, strucutred data (SD), etc. + + The BusyBox, or util-linux, logger tools can also be used, but + are limited to RFC3164 style messages. + +endif + comment "sysklogd needs a toolchain w/ threads" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index fc54ab6936..235219c4fc 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -11,6 +11,10 @@ SYSKLOGD_LICENSE_FILES = LICENSE SYSKLOGD_CPE_ID_VALID = YES SYSKLOGD_CONF_OPTS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var +# Disable/Enable utilities +SYSKLOGD_CONF_OPTS += \ + $(if $(BR2_PACKAGE_SYSKLOGD_LOGGER),--with-logger,--without-logger) + define SYSKLOGD_INSTALL_SAMPLE_CONFIG $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ $(TARGET_DIR)/etc/syslog.conf From patchwork Fri Jan 22 15:43:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Wiberg X-Patchwork-Id: 1430421 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=awrJnZx2; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DMk8C089Rz9sVF for ; Sat, 23 Jan 2021 02:44:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 76BE48738F; Fri, 22 Jan 2021 15:44:08 +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 Vn9Icq-31H33; Fri, 22 Jan 2021 15:44:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0FFB98735E; Fri, 22 Jan 2021 15:44:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 565621BF283 for ; Fri, 22 Jan 2021 15:44:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5361E86C3E for ; Fri, 22 Jan 2021 15:44:03 +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 BZBZoRFSGVR7 for ; Fri, 22 Jan 2021 15:44:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5912486C73 for ; Fri, 22 Jan 2021 15:44:02 +0000 (UTC) Received: by mail-lf1-f54.google.com with SMTP id q12so8097844lfo.12 for ; Fri, 22 Jan 2021 07:44:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C2IL185uPb7njuww29futQk+j7G7mfPDt4wiJ/nyWNg=; b=awrJnZx2PlGL2Ik7fdEXhUd8D3JHtBJu7VtNsbEZ29dVHs3vSA+sINfdu/fI1bfJkM WF8yWoJ459DhvVjScLVG4z1E2hU75pF5cwDvYS3zStxjtvENZpa+S9bQk6R7yzsT3do7 RSO34q9x3AnjJ9Wxe04orb3ZSa72ssMSejjBjx1r5coo/Lb6uSX+MS2AiiwEp941Tbw6 lKGLzl8zS3E82+LqGWcj8kS9rGS983reGoWMRxRxay9/6kxfW654ewi/r96ZxTst9Hr4 fVQplALHi4DIRBO8oYJt4uwPUGPswBuBbKTBaZgV/s7W8QG7AN1+94ZMZZuHzjgEV49J 3zQw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=C2IL185uPb7njuww29futQk+j7G7mfPDt4wiJ/nyWNg=; b=pEhDt/GQaOOMz3rvcUUfjd/x6ic0Hdzt99LlBj3LK40f8c+8VkAFIn/5UMsOnF3m9H AKuziQTy2okHp3a8KEg2Ps6OfU9lCsxt42+FemW5B0Jd5ZcFtD4vpOFKwPdock3PI8eo /8Lr/vc7rCxvjTudt3AQNqEntsWc0+uvn5eq5rcqNDs7thIWEEYtj1NIkveINY7YcsHC qjK2AL73WQNHcBb3rT/y0vQlBOZvPBFvfoyzotovYQkxI1eqHJoDhnz9R5H+ZXRRiW3i 65WehisOCQLMMQEKOhTNzB5kPQ+QYEUbYmj6DoSxgTI9ipsjW0oKHxKlMZgCRUmJvM6k XtbA== X-Gm-Message-State: AOAM532tq/rpi+47rT+OjnUvniTlp2WyS7spfVHK+ip4JaKA76oJJIRy o4vLzgWpgm1zlQ4QhyA/cz90+4E7WHpifg== X-Google-Smtp-Source: ABdhPJzvtMLR9guErBrXDDLdXJQ+jB7sFsG9MaSOLAuu2sNRnCzdXwtqOJuyC1sXipfLCw3LWxqtBw== X-Received: by 2002:a05:6512:131f:: with SMTP id x31mr18783lfu.552.1611330240233; Fri, 22 Jan 2021 07:44:00 -0800 (PST) Received: from luthien.lan (h-82-196-111-206.NA.cust.bahnhof.se. [82.196.111.206]) by smtp.gmail.com with ESMTPSA id z19sm971733ljz.107.2021.01.22.07.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 07:43:59 -0800 (PST) From: Joachim Wiberg To: buildroot@buildroot.org Date: Fri, 22 Jan 2021 16:43:33 +0100 Message-Id: <20210122154333.1927190-4-troglobit@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210122154333.1927190-1-troglobit@gmail.com> References: <20210122154333.1927190-1-troglobit@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/3] package/sysklogd: menuconfig support for remote syslog retry delay 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: Joachim Wiberg , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Joachim Wiberg --- package/sysklogd/Config.in | 13 +++++++++++++ package/sysklogd/sysklogd.mk | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in index 52bed0cc18..91db7b348c 100644 --- a/package/sysklogd/Config.in +++ b/package/sysklogd/Config.in @@ -15,6 +15,19 @@ config BR2_PACKAGE_SYSKLOGD if BR2_PACKAGE_SYSKLOGD +config BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY + int "Retry delay (sec)" + default "180" + help + Retry delay (seconds) for sending to remote syslog servers. + + When set up to forward logs to a remote syslog server, the + network may not always be available. E.g., default interface + down, or no route to the remote server. This setting controls + the back-off time before retrying. + + Default: 180 seconds + config BR2_PACKAGE_SYSKLOGD_LOGGER bool "logger tool" help diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 235219c4fc..3dbf886361 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -12,7 +12,7 @@ SYSKLOGD_CPE_ID_VALID = YES SYSKLOGD_CONF_OPTS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var # Disable/Enable utilities -SYSKLOGD_CONF_OPTS += \ +SYSKLOGD_CONF_OPTS += --with-suspend-time=$(BR2_PACKAGE_SYSKLOGD_REMOTE_DELAY) \ $(if $(BR2_PACKAGE_SYSKLOGD_LOGGER),--with-logger,--without-logger) define SYSKLOGD_INSTALL_SAMPLE_CONFIG