From patchwork Sat Sep 26 11:25:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 523082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 8744C140779 for ; Sat, 26 Sep 2015 21:26:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=DF9DNrnd; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AB908915B2; Sat, 26 Sep 2015 11:26:56 +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 m84DoqaRQLpi; Sat, 26 Sep 2015 11:26:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1BA4C915DB; Sat, 26 Sep 2015 11:26:53 +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 AA7E91BFC06 for ; Sat, 26 Sep 2015 11:26:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A61CB915B2 for ; Sat, 26 Sep 2015 11:26:52 +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 ZxKjxd0NUxzh for ; Sat, 26 Sep 2015 11:26:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pa0-f51.google.com (mail-pa0-f51.google.com [209.85.220.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7BDA4915DA for ; Sat, 26 Sep 2015 11:26:50 +0000 (UTC) Received: by pacfv12 with SMTP id fv12so132122925pac.2 for ; Sat, 26 Sep 2015 04:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8dp4OTttD34dgJTdeTU7Ip/Cpalmqzg5T2tr1nNiTBU=; b=DF9DNrnd7FrzwgABS6UeFvcaWd5pinoOu/xp96N7++duDdQ2RV+tbwm+atk0iNRrZi v27EZAJ/LBtBhSolYK4CegWTzA9+4pXW2ZfTnRMX2PH95DaoK3rGdxR/ZFQ1lsRCSNQ3 449XoqSopcC+KpDmybQnxmQCsb7huOsfiZ+dzir9K5DZlBwRF7vtVWK6F/m4mEyFT6MQ 7kd4OqZk3Dy60b95RCidNxRGKGyuxAyVrUyNr8E5home4nmL/+m+Zb092f4a4RtFd6rZ ygGri8FJbcynVQ85nZCdEwy8brLpllN/ThGvo3XUqjgbjbd0bgyNPG8PssYJRhdBWlsQ /tFA== X-Received: by 10.68.94.3 with SMTP id cy3mr13320588pbb.113.1443266810180; Sat, 26 Sep 2015 04:26:50 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc (2-163-36-202-static.alliedtelesis.co.nz. [202.36.163.2]) by smtp.gmail.com with ESMTPSA id rb8sm8854621pab.14.2015.09.26.04.26.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 Sep 2015 04:26:49 -0700 (PDT) From: Chris Packham To: buildroot@buildroot.org Date: Sat, 26 Sep 2015 23:25:43 +1200 Message-Id: <1443266743-20775-3-git-send-email-judge.packham@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1443266743-20775-1-git-send-email-judge.packham@gmail.com> References: <1443266743-20775-1-git-send-email-judge.packham@gmail.com> Subject: [Buildroot] [RFC PATCH 2/2] syslog-ng: New package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" syslog-ng is an enhanced log daemon, supporting a wide range of input and output methods: syslog, unstructured text, queueing, SQL & NoSQL. Signed-off-by: Chris Packham --- package/Config.in | 3 +++ package/syslog-ng/Config.in | 18 +++++++++++++ package/syslog-ng/S01logging | 36 ++++++++++++++++++++++++++ package/syslog-ng/syslog-ng.mk | 58 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 package/syslog-ng/Config.in create mode 100644 package/syslog-ng/S01logging create mode 100644 package/syslog-ng/syslog-ng.mk diff --git a/package/Config.in b/package/Config.in index 2c033ba..00fdc09 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1514,6 +1514,9 @@ endif if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/sysklogd/Config.in" endif +if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + source "package/syslog-ng/Config.in" +endif source "package/systemd/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/sysvinit/Config.in" diff --git a/package/syslog-ng/Config.in b/package/syslog-ng/Config.in new file mode 100644 index 0000000..185a8e2 --- /dev/null +++ b/package/syslog-ng/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_SYSLOG_NG + bool "syslog-ng" + select BR2_PACKAGE_EVENTLOG + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_OPENSSL + depends on BR2_USE_WCHAR # glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + help + syslog-ng is an enhanced log daemon, supporting a wide range of input + and output methods: syslog, unstructured text, queueing, SQL & NoSQL + + https://syslog-ng.org/ + +comment "syslog-ng needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/syslog-ng/S01logging b/package/syslog-ng/S01logging new file mode 100644 index 0000000..3fa7107 --- /dev/null +++ b/package/syslog-ng/S01logging @@ -0,0 +1,36 @@ +#!/bin/sh + +start() { + echo -n "Starting syslog-ng daemon: " + start-stop-daemon -S -q -p /var/run/syslog-ng.pid --exec /usr/sbin/syslog-ng + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +stop() { + echo -n "Stopping syslog-ng daemon: " + start-stop-daemon -K -q -p /var/run/syslog-ng.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk new file mode 100644 index 0000000..475d1b6 --- /dev/null +++ b/package/syslog-ng/syslog-ng.mk @@ -0,0 +1,58 @@ +################################################################################ +# +# syslog-ng +# +################################################################################ + +SYSLOG_NG_VERSION = 3.7.1 +SYSLOG_NG_SOURCE = syslog-ng-$(SYSLOG_NG_VERSION).tar.gz +SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) +SYSLOG_NG_LICENSE = LGPL (syslog-ng core), GPL (modules) +SYSLOG_NG_LICENSE_FILES = COPYING +SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ + eventlog libglib2 openssl pcre \ + $(if $(BR2_PACKAGE_PYTHON),python) \ + $(if $(BR2_PACKAGE_PYTHON3),python3) \ + $(if $(BR2_PACKAGE_LIBESMTP),libesmtp) \ + $(if $(BR2_PACKAGE_JSON_C),json-c) + +ifeq ($(BR2_INIT_SYSTEMD),y) +SYSLOG_NG_CONF_OPTS += \ + --enable-systemd \ + --with-systemdsystemunitdir=/usr/lib/systemd/system +SYSLOG_NG_DEPENDENCIES += systemd +else +SYSLOG_NG_CONF_OPTS += --disable-systemd +endif + +define SYSLOG_NG_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/syslog-ng/S01logging \ + $(TARGET_DIR)/etc/init.d/S01logging +endef + +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),) +SYSLOG_NG_CONF_OPTS += --disable-python --without-python +endif + +ifeq ($(BR2_PACKAGE_LIBESMTP),) +SYSLOG_NG_CONF_OPTS += --disable-smtp +endif + +define SYSLOG_NG_REMOVE_JSONFORMAT + rm -f $(TARGET_DIR)/usr/share/include/scl/cim/template.conf +endef + +ifeq ($(BR2_PACKAGE_JSON_C),) +SYSLOG_NG_CONF_OPTS += --disable-json +# Remove config files that use format-json +SYSLOG_NG_POST_INSTALL_TARGET_HOOKS += SYSLOG_NG_REMOVE_JSONFORMAT +endif + +define SYSLOG_NG_KERNEL_LOG + $(SED) '/internal();/a \\tfile("/proc/kmsg" program_override("kernel"));' \ + $(TARGET_DIR)/etc/syslog-ng.conf +endef + +SYSLOG_NG_POST_INSTALL_TARGET_HOOKS += SYSLOG_NG_KERNEL_LOG + +$(eval $(autotools-package))