From f29fb9c595a8147b34c334cccc254a77b10b8a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Fri, 11 Jun 2010 15:10:46 +0300 Subject: main/sysklogd: fix rotation of log files fixes #358 --- main/sysklogd/APKBUILD | 2 +- main/sysklogd/sysklogd.daily | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD index 681ac7d89..d4615ff81 100644 --- a/main/sysklogd/APKBUILD +++ b/main/sysklogd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=sysklogd pkgver=1.5 -pkgrel=5 +pkgrel=6 pkgdesc="System and kernel log daemons" url="http://www.infodrom.org/projects/sysklogd/" license="GPL BSD" diff --git a/main/sysklogd/sysklogd.daily b/main/sysklogd/sysklogd.daily index 79e85fb46..ccd63d61e 100755 --- a/main/sysklogd/sysklogd.daily +++ b/main/sysklogd/sysklogd.daily @@ -17,13 +17,14 @@ syslogd_listfiles() { # the sed (in order)- # strips comments; # collapses spaces/tabs to 1 space; - # deletes the "-" in front of the filename; + # deletes the "-" in front of the filename; + # deletes whitespace before ';' # deletes lines that have the "skip" facility # deletes the facility (leaving just the filename) # deletes lines that are not filenames with leading "/" while read a ; do echo "$a"; done < $CONF |\ - sed -n "/^ *#/D; /^[ ]*$/D; s/[ ]\+/ /g; \ - s+ -/+ /+g; /^.*\($skip\)[^ ]* /D; \ + sed -n "/^[ \t]*#/D; /^[ \t]*$/D; s/[ \t]\+/ /g; \ + s+ -/+ /+g; s/ *; */;/; /^.*\($skip\)[^ ]* /D; \ s/^[^ ]* //; /^[^\\/]/D; P" |\ sort | uniq } -- cgit v1.2.3