Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=974c7c355f31ae40700d0adadad47246047abb5a
commit 974c7c355f31ae40700d0adadad47246047abb5a Author: Miklos Vajna <vmik...@frugalware.org> Date: Wed Jan 7 15:41:34 2009 +0100 sysklogd-1.5-4-i686 - rc.syslog rewritten, now supports the status command and gettext diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index e9b4a8b..6abce0b 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -4,21 +4,22 @@ pkgname=sysklogd pkgver=1.5 -pkgrel=3 +pkgrel=4 pkgdesc="Linux system logging utilities" -url="http://www.ibiblio.org/pub/Linux/system/daemons/!INDEX"; +url="http://www.ibiblio.org/pub/Linux/system/daemons/"; backup=(etc/syslog.conf etc/logrotate.d/syslog) depends=('glibc>=2.8-3') rodepends=('netkit-base>=0.17-6') groups=('base') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump 'http://ftp.ibiblio.org/pub/Linux/system/daemons/?M=D'|grep sysklogd.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://ftp.ibiblio.org/pub/Linux/system/daemons/$pkgname-$pkgver.tar.gz \ - rc.syslog \ +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.gz \ + rc.syslog{,-hu.po} \ syslog \ syslog.conf) sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236' \ - 'eef1e35b68be04f9674d53e02beee5fcbdd23ecf' \ + '91c54ba080778788ad1ef2487669b62c9e065a10' \ + '94c71ed2057354a9a39b0a1408c923328be79f89' \ 'e22daf241394779478c113c23bdc294fa2f858bc' \ '839f714f0ac9df71ef9f5955fec953048bbd699c') @@ -31,7 +32,7 @@ build() make BINDIR=$Fdestdir/usr/sbin MANDIR=$Fdestdir/usr/man install Ffile /etc/syslog.conf Ffile /etc/logrotate.d/syslog - Frcd syslog + Frcd2 syslog } # optimization ok diff --git a/source/base/sysklogd/messages/syslog.en b/source/base/sysklogd/messages/syslog.en deleted file mode 100644 index 4af64d2..0000000 --- a/source/base/sysklogd/messages/syslog.en +++ /dev/null @@ -1,2 +0,0 @@ -stopsyslog="Stopping logging" -startsyslog="Starting logging" diff --git a/source/base/sysklogd/messages/syslog.hu b/source/base/sysklogd/messages/syslog.hu deleted file mode 100644 index 0bd634b..0000000 --- a/source/base/sysklogd/messages/syslog.hu +++ /dev/null @@ -1,2 +0,0 @@ -stopsyslog="A naplózás leállítása" -startsyslog="A naplózás indítása" diff --git a/source/base/sysklogd/rc.syslog b/source/base/sysklogd/rc.syslog index ac752f9..e957f55 100644 --- a/source/base/sysklogd/rc.syslog +++ b/source/base/sysklogd/rc.syslog @@ -1,35 +1,59 @@ -#!/bin/sh +#!/bin/bash -# (c) 2003-2004 Vajna Miklos <vmik...@frugalware.org> +# (c) 2003, 2004, 2009 Vajna Miklos <vmik...@frugalware.org> # (c) 2005 Laszlo Dvornik <dvor...@gnome.hu> +# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de> # rc.syslog for Frugalware # distributed under GPL License -. /etc/rc.d/rc.functions - # chkconfig: 2345 12 88 # description: Syslog is the facility by which many daemons use to log \ -# messages to various system log files. It is a good idea to \ -# always run syslog. - -if [ "$1" = "stop" ]; then - stop "$stopsyslog" - killall syslogd 2> /dev/null - killall klogd 2> /dev/null - ok $? -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -else # start - start "$startsyslog" - /usr/sbin/syslogd - # This prevents syslogd/klogd race condition on SMP kernels. - if [ `grep ^processor /proc/cpuinfo|sed -n 's/.*: \(.*\)/\1/;$ p'` -ge '1' ]; then - sleep 1 +# messages to various system log files. It is a good idea to \ +# always run syslog. + +source /lib/initscripts/functions +TEXTDOMAIN=syslog +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start status stop) +daemon=$"logging" + +# It's enough to check for syslogd, klog runs on top of syslogd +pid="cat /var/run/syslogd.pid 2> /dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)"]; then + /usr/sbin/syslogd + pidof syslogd > /var/run/syslogd.pid + # This prevents syslogd/klogd race condition on SMP + # kernels. + if [ `grep ^processor /proc/cpuinfo|sed -n 's/.*: \(.*\)/\1/;$ p'` -ge '1' ]; then + sleep 1 + fi + # '-c 3' = display level 'error' or higher messages on + # console + # '-x' = turn off broken EIP translation + /usr/sbin/klogd -c 3 -x + pidof klogd > /var/run/klogd.pid + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ -n "$(eval $pid)"]; then + kill "$(eval $pid)" + kill $(cat /var/run/klogd.pid) + rm -f /var/run/{sys,k}logd.pid + ok $? + else + ok 999 fi - # '-c 3' = display level 'error' or higher messages on console - # '-x' = turn off broken EIP translation - /usr/sbin/klogd -c 3 -x - ok $? -fi +} + +rc_exec $1 diff --git a/source/base/sysklogd/rc.syslog-hu.po b/source/base/sysklogd/rc.syslog-hu.po new file mode 100644 index 0000000..612dd89 --- /dev/null +++ b/source/base/sysklogd/rc.syslog-hu.po @@ -0,0 +1,21 @@ +# Hungarian translations for PACKAGE package. +# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# <vmik...@frugalware.org>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-01-07 15:37+0100\n" +"PO-Revision-Date: 2009-01-07 15:37+0100\n" +"Last-Translator: <vmik...@frugalware.org>\n" +"Language-Team: Hungarian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: rc.syslog:19 +msgid "logging" +msgstr "naplózás" diff --git a/source/base/sysklogd/rc.syslog.pot b/source/base/sysklogd/rc.syslog.pot new file mode 100644 index 0000000..469c63d --- /dev/null +++ b/source/base/sysklogd/rc.syslog.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <em...@address>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-01-07 15:37+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <em...@address>\n" +"Language-Team: LANGUAGE <l...@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: rc.syslog:19 +msgid "logging" +msgstr "" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
