aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-12-08 15:56:26 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-12-08 15:57:51 +0000
commit1a27133d79e1de4818ccc4323bb7223680e2725c (patch)
treeee322d3db43fffbe0bc725e91eaf62ab8f409855 /main
parenta946e1cdc42ee7b7f804f46b818e029a2d7856cb (diff)
downloadaports-1a27133d79e1de4818ccc4323bb7223680e2725c.tar.bz2
aports-1a27133d79e1de4818ccc4323bb7223680e2725c.tar.xz
main/sysklogd: fix log rotating
ref #408
Diffstat (limited to 'main')
-rw-r--r--main/sysklogd/APKBUILD4
-rwxr-xr-xmain/sysklogd/sysklogd.daily11
2 files changed, 8 insertions, 7 deletions
diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index 4ac82a6102..35e1c005c0 100644
--- a/main/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sysklogd
pkgver=1.5
-pkgrel=9
+pkgrel=10
pkgdesc="System and kernel log daemons"
url="http://www.infodrom.org/projects/sysklogd/"
license="GPL BSD"
@@ -48,7 +48,7 @@ build ()
}
md5sums="e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz
6bc1d1c65076b104a8f78d0fb4f21db7 sysklogd.logrotate
-d66d2ad2c4d0905b42963af9e86edacb sysklogd.daily
+dcda8ba997e79a90fdf4ab61f6e5a42b sysklogd.daily
1ea1768fbfc6165e3a73490d98d47799 sysklogd.initd
e25d7b583b7e4bd8be503b89e1771e90 sysklogd.confd
3b7ba3aa6519f96f11165a7d5900a8b1 sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
diff --git a/main/sysklogd/sysklogd.daily b/main/sysklogd/sysklogd.daily
index 6c5692ba3d..723413d4d5 100755
--- a/main/sysklogd/sysklogd.daily
+++ b/main/sysklogd/sysklogd.daily
@@ -15,18 +15,19 @@ syslogd_listfiles() {
# the while loop joins lines that end in "\"
# the sed (in order)-
- # strips comments;
- # collapses spaces/tabs to 1 space;
+ # strips comments;
+ # remove empty lines;
+ # collapses spaces/tabs to 1 space;
# deletes the "-" in front of the filename;
# deletes whitespace before ';'
# deletes lines that have/dont have the "auth" facility
# deletes the facility (leaving just the filename)
- # deletes lines that are not filenames with leading "/"
+ # deletes lines that are not filenames with leading "/"
# print it
while read a ; do echo "$a"; done < $CONF |\
sed -n -e "s/\#.*//" \
- -e "/^\s*$/D" \
- -e "s/\s\+/ /g" \
+ -e "/^[[:space:]]*$/D" \
+ -e "s/[[:space:]]\+/ /g" \
-e "s: -/: /:g" \
-e "s/ *; */;/" \
-e "/^.*\(auth\)[^ ]* /${skip}D" \