From patchwork Wed Oct 14 07:41:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 530071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 3F7831402D6 for ; Wed, 14 Oct 2015 18:41:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=p9H3zCFZ; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7DBDC2757F; Wed, 14 Oct 2015 07:41:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tyD6HGjcYptX; Wed, 14 Oct 2015 07:41:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id EE8AA28989; Wed, 14 Oct 2015 07:41:45 +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 8BB651C1739 for ; Wed, 14 Oct 2015 07:41:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 86CE6878DD for ; Wed, 14 Oct 2015 07:41:44 +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 EoSBIFFk4Ghm for ; Wed, 14 Oct 2015 07:41:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D39BE878DB for ; Wed, 14 Oct 2015 07:41:43 +0000 (UTC) Received: by pabrc13 with SMTP id rc13so46742669pab.0 for ; Wed, 14 Oct 2015 00:41:43 -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; bh=0vR96ABNf/N0A24WENFK4vdBCG3OFXFGjsnGSm+qVPI=; b=p9H3zCFZqXkAGzzXV0AXv0D06wsq3kD1K/cwAh78GLU+GUENDgNUFssihSpuKE9LtP nyRPaMIkO5u+rjFu1gW4XqRTUa+OTKmbtBTS7ZF1zYZ9FO5two/6A3Hvmb5JIckDD6MC JWpAM+cOdCkxsFPxfofMgm2JMPZ/nYwXo72prIFF/bXXeOBIs/tjz3dYVS77fFeowCxm Vovbv7oVhxzvhjXnzR/HeDP3qG3fUpkmGTrKU2Ky/vxreUkjZ92K0+gLMW4ClGQNhkvQ Jk8LT3uCdRtGrlRS+wmwgXnPRtxl46G4aKGUGCnfnxd76xtDcfV/WU9zKorzf6Zy6z/6 i0YQ== X-Received: by 10.66.231.103 with SMTP id tf7mr2173652pac.85.1444808503284; Wed, 14 Oct 2015 00:41:43 -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 rl17sm7896749pab.2.2015.10.14.00.41.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Oct 2015 00:41:42 -0700 (PDT) From: Chris Packham To: buildroot@buildroot.org, thomas.petazzoni@free-electrons.com Date: Wed, 14 Oct 2015 20:41:28 +1300 Message-Id: <1444808488-3387-1-git-send-email-judge.packham@gmail.com> X-Mailer: git-send-email 2.5.3 Subject: [Buildroot] [PATCHv2] 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 --- Changes since v1: - add hash file - use simplified logging configuration for buildroot - don't install man pages package/Config.in | 3 +++ package/syslog-ng/Config.in | 18 +++++++++++++ package/syslog-ng/S01logging | 36 ++++++++++++++++++++++++++ package/syslog-ng/syslog-ng.conf | 16 ++++++++++++ package/syslog-ng/syslog-ng.hash | 2 ++ package/syslog-ng/syslog-ng.mk | 55 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 130 insertions(+) create mode 100644 package/syslog-ng/Config.in create mode 100644 package/syslog-ng/S01logging create mode 100644 package/syslog-ng/syslog-ng.conf create mode 100644 package/syslog-ng/syslog-ng.hash create mode 100644 package/syslog-ng/syslog-ng.mk diff --git a/package/Config.in b/package/Config.in index 8e3c64a..e191af7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1518,6 +1518,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.conf b/package/syslog-ng/syslog-ng.conf new file mode 100644 index 0000000..0b4a860 --- /dev/null +++ b/package/syslog-ng/syslog-ng.conf @@ -0,0 +1,16 @@ +@version: 3.7 + +source s_sys { + file("/proc/kmsg" program_override("kernel")); + unix-stream ("/dev/log"); + internal(); +}; + +destination d_all { + file("/var/log/messages"); +}; + +log { + source(s_sys); + destination(d_all); +}; diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash new file mode 100644 index 0000000..761ac84 --- /dev/null +++ b/package/syslog-ng/syslog-ng.hash @@ -0,0 +1,2 @@ +# Locally computed +sha1 494418ca185d912e2296dccac4ca1b38924159ff syslog-ng-3.7.1.tar.gz diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk new file mode 100644 index 0000000..da58bba --- /dev/null +++ b/package/syslog-ng/syslog-ng.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# 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) +SYSLOG_NG_CONF_OPTS = --disable-manpages + +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 + +ifeq ($(BR2_PACKAGE_JSON_C),) +SYSLOG_NG_CONF_OPTS += --disable-json +endif + +define SYSLOG_NG_FIXUP_CONFIG + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR) scl-uninstall-local + $(INSTALL) -D -m 0644 package/syslog-ng/syslog-ng.conf \ + $(TARGET_DIR)/etc/syslog-ng.conf +endef + +SYSLOG_NG_POST_INSTALL_TARGET_HOOKS = SYSLOG_NG_FIXUP_CONFIG + +$(eval $(autotools-package))