X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id CAC07DC0D1C for ; Wed, 29 Jul 2015 17:10:03 +0000 (UTC) Received: from apollo.thewebhostserver.com (apollomail.thewebhostserver.com [46.23.65.248]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 90BC8DC0D0D for ; Wed, 29 Jul 2015 17:10:03 +0000 (UTC) Received: from [81.4.121.188] (port=58096 helo=localhost.localdomain) by apollo.thewebhostserver.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.85) (envelope-from ) id 1ZKUre-003ryP-2L; Wed, 29 Jul 2015 18:09:58 +0100 From: Stuart Cardall To: alpine-aports@lists.alpinelinux.org Cc: Stuart Cardall Subject: [alpine-aports] [PATCH] testing/inetutils-syslogd: update to 1.9.4 + fix scripts Date: Wed, 29 Jul 2015 17:09:45 +0000 Message-Id: <1438189785-107958-1-git-send-email-developer@it-offshore.co.uk> X-Mailer: git-send-email 2.4.6 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - apollo.thewebhostserver.com X-AntiAbuse: Original Domain - lists.alpinelinux.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - it-offshore.co.uk X-Get-Message-Sender-Via: apollo.thewebhostserver.com: authenticated_id: developer@it-offshore.co.uk X-Source: X-Source-Args: X-Source-Dir: X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/inetutils-syslogd/APKBUILD | 37 +++++++++------------- testing/inetutils-syslogd/inetutils-syslogd.initd | 36 +++++++-------------- .../inetutils-syslogd.post-deinstall | 10 +++--- .../inetutils-syslogd.post-install | 3 ++ testing/inetutils-syslogd/inetutils-syslogd.setup | 2 +- 5 files changed, 35 insertions(+), 53 deletions(-) create mode 100644 testing/inetutils-syslogd/inetutils-syslogd.post-install diff --git a/testing/inetutils-syslogd/APKBUILD b/testing/inetutils-syslogd/APKBUILD index 1e09e31..cfe6fdd 100644 --- a/testing/inetutils-syslogd/APKBUILD +++ b/testing/inetutils-syslogd/APKBUILD @@ -2,16 +2,15 @@ # Maintainer: Stuart Cardall pkgname=inetutils-syslogd _pkgname=inetutils -pkgver=1.9.2 -pkgrel=1 +pkgver=1.9.4 +pkgrel=0 pkgdesc="A small syslogd for logging to multiple files" url="http://www.gnu.org/software/inetutils/" arch="all" license="GPL3" -depends="" -depends_dev="" -makedepends="$depends_dev readline-dev ncurses-dev" -install="$pkgname.post-deinstall" +depends_dev="readline-dev ncurses-dev" +makedepends="$depends_dev" +install="$pkgname.post-install $pkgname.post-deinstall" subpackages="$pkgname-doc" source="http://ftp.gnu.org/gnu/inetutils/${_pkgname}-${pkgver}.tar.gz $pkgname.initd @@ -46,7 +45,7 @@ build() { --disable-tftp --disable-tftpd \ --disable-ping --disable-ping6 \ --disable-logger --enable-syslogd \ - --disable-inetd --disable-whois \ + --disable-inetd --disable-whois --disable-dnsdomainname \ --disable-uucpd --disable-ifconfig --disable-traceroute \ || return 1 make || return 1 @@ -77,29 +76,23 @@ package() { install -m755 -D "$srcdir"/inetutils-syslogd.setup \ "$pkgdir"/sbin/setup-inetutils-syslogd || return 1 mkdir -p "$pkgdir/usr/share/apk-tools/$pkgname" - # post-install message - mkdir -p "$pkgdir/usr/share/doc/$pkgname" - cat > $pkgdir/usr/share/doc/$pkgname/README.alpine < +# Created for Alpine Linux by Stuart Cardall +# Distributed under the terms of the GNU General Public License v2 name=syslogd -daemon=/usr/sbin/$name config_file="/etc/syslog.conf" +pid_file=/var/run/syslog.pid +command=/usr/sbin/$name +command_args=${SYSLOGD_OPTS} +extra_started_commands="reload" depend() { - need clock hostname localmount + need clock hostname localmount provide logger } @@ -20,31 +23,14 @@ start_pre() { check_config || return 1 } -start() { - ebegin "Starting ${name}" - start-stop-daemon --start --quiet \ - --pidfile /var/run/${name}.pid \ - --exec ${daemon} -- ${SYSLOGD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping ${name}" - start-stop-daemon --stop --quiet \ - --pidfile /var/run/$name.pid \ - --exec ${daemon} - eend $? -} - reload() { - if [ ! -f "${PIDFILE}" ]; then - eerror "rsyslogd not running" + if [ ! -f "${pid_file}" ]; then + eerror "inetutils-$name is not running" return 1 fi - ebegin "Re-opening intetutils-syslogd log files" - start-stop-daemon --stop --signal HUP \ - --pidfile /var/run/$name.pid + ebegin "Re-opening intetutils-$name log files" + pkill -HUP -f "$command $command_args" eend $? } diff --git a/testing/inetutils-syslogd/inetutils-syslogd.post-deinstall b/testing/inetutils-syslogd/inetutils-syslogd.post-deinstall index 28f5dde..009b5b8 100644 --- a/testing/inetutils-syslogd/inetutils-syslogd.post-deinstall +++ b/testing/inetutils-syslogd/inetutils-syslogd.post-deinstall @@ -1,7 +1,7 @@ #!/bin/sh -rc-update add syslog boot -# show service status - cron will be stopped due to logger dependency -echo "Cron:"; rc-service cron status -echo "Syslog:"; rc-service syslog status - +echo; rc-update del inetutils-syslogd boot; rc-update add syslog boot +syslog_state=$(rc-service syslog status) +inetutils_state=$(rc-service inetutils-syslogd status) +echo "$inetutils_state: inetutils-syslogd" +echo -e "$syslog_state: syslog\n" diff --git a/testing/inetutils-syslogd/inetutils-syslogd.post-install b/testing/inetutils-syslogd/inetutils-syslogd.post-install new file mode 100644 index 0000000..18099c7 --- /dev/null +++ b/testing/inetutils-syslogd/inetutils-syslogd.post-install @@ -0,0 +1,3 @@ +#!/bin/sh +echo -e "\nTo configure inetutils-syslogd / deconfigure BusyBox syslog execute:\n\n/sbin/setup-inetutils-syslogd\n" + diff --git a/testing/inetutils-syslogd/inetutils-syslogd.setup b/testing/inetutils-syslogd/inetutils-syslogd.setup index fd356df..7c82513 100644 --- a/testing/inetutils-syslogd/inetutils-syslogd.setup +++ b/testing/inetutils-syslogd/inetutils-syslogd.setup @@ -17,7 +17,7 @@ print_start() { print_stop "\nWould you like to STOP BusyBox Syslog & remove it from the Boot Runlevel ?" "[ Enter or Y to remove ]:"; read ans if [ -z "$ans" ] || [ "$ans" = "y" ] || [ "$ans" = "Y" ]; then - echo; rc-update del syslog boot; rc-service syslog stop + echo; rc-update del syslog boot; rc-service syslog stop; rc-service klogd stop fi print_start "\nWould you like to START inetutils-syslogd & add it to the Boot Runlevel ?" "[ Enter or Y to add ]:"; read ans -- 2.4.6 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---