diff options
| author | Nathan Angelacos <nangel@alpinelinux.org> | 2015-03-11 21:28:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-12 15:25:26 +0000 |
| commit | b206e74e10edf243a45a1269913e2d344b0e8f97 (patch) | |
| tree | 50ba8b2e16973e64d5ccd43c9f1bb7a6d908b439 | |
| parent | fb437c1115ebbad45cffc06efb2d0326c24f3ee4 (diff) | |
| download | aports-b206e74e10edf243a45a1269913e2d344b0e8f97.tar.bz2 aports-b206e74e10edf243a45a1269913e2d344b0e8f97.tar.xz | |
main/sysklogd: remove GNUism and use POSIX Extended Regular Expressions (EREs)
fixes #3940
(cherry picked from commit bea27cd485c3a9064c48c949edd32385333b9b80)
| -rw-r--r-- | main/sysklogd/APKBUILD | 8 | ||||
| -rwxr-xr-x | main/sysklogd/sysklogd.daily | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD index 020f2281b..24abf236d 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=16 +pkgrel=17 pkgdesc="System and kernel log daemons" url="http://www.infodrom.org/projects/sysklogd/" arch="all" @@ -58,7 +58,7 @@ package() { } md5sums="e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz 6bc1d1c65076b104a8f78d0fb4f21db7 sysklogd.logrotate -dcda8ba997e79a90fdf4ab61f6e5a42b sysklogd.daily +db996d562606318fec093b289a601d8a sysklogd.daily 6ac5b2a358c0ffdaff05e9666b279827 sysklogd.initd e25d7b583b7e4bd8be503b89e1771e90 sysklogd.confd 3b7ba3aa6519f96f11165a7d5900a8b1 sysklogd-1.4.2-caen-owl-klogd-drop-root.diff @@ -71,7 +71,7 @@ fee8beb8c17f8ff8bbf6523fbb1c627f fix-includes.patch 7930f7ff5038e1318511624e348581cc LICENSE" sha256sums="6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773 sysklogd-1.5.tar.gz 603fa42348264aba7bc6e3306582523248a7841a0b02f101af0028e8db14a22a sysklogd.logrotate -bd72d336cf70903af1512e81180190de09b84f25b3dced5915869306a63841f2 sysklogd.daily +a4530de4906d1e7a433a0d3c8184f91ecc4279c753882f2653e0ce207c616440 sysklogd.daily ef2e1e49b08b1ce7d9109c446bda65860feb8f79ceaeaa7a91a73bf28737b721 sysklogd.initd 11a1eeb9edd09639d5143227bada137945822b23c5abb88fec5ebaef064b991d sysklogd.confd f316586561ec40eb185bb83b6e785185b9e33b8290767336cdab626767f88060 sysklogd-1.4.2-caen-owl-klogd-drop-root.diff @@ -84,7 +84,7 @@ f438fd0f85eb6796289421aa0339d54d5c1cb0a5524df4c866c009a05223bf70 syslog.conf 5d15a27dc7c6183a61a0e44fa5559b6d53a9f1591767c2322dd797f717c5eb8d LICENSE" sha512sums="19ef104c03a8c87ea30c811fe54bb30e7c73a2834a83c8720841f0d553d41508dbf052d4e3dd9ea929eedff31e9fbb79f8c05546f48005b74f01ebf2a57e48f7 sysklogd-1.5.tar.gz d82caedfa61bfefc0162e5c416ff75a5cd8f60abe1cf8a3c5c4e7775aeb7bb64e712c783031659d3793378c8753578adf73ef79aac6a0e7cfbc5bbba5a74bd81 sysklogd.logrotate -954f2f913e044b11b418aec3157f7757079b2e20b9a6fffd4b6eff94b5c74e62e804cdf870f84ea9412285d5024f3900c9a42cad8ff99534cc1d1a40ee120048 sysklogd.daily +87a95d612b9841a022c91a219ff4f69f57badb7f84178f06fc8abec242df948540582f27146b34c6ce730a451ddfc5195b24237cd70c70896ef040148789dd20 sysklogd.daily 4b598713f531d436cb2b666136464ce519eb17ad66061aa58cbb2ab4383f97e62170ae5efe0e2455b33f8f59509809a553625827a1ef8d65ab54a61f937f8e4c sysklogd.initd 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c sysklogd.confd 1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a sysklogd-1.4.2-caen-owl-klogd-drop-root.diff diff --git a/main/sysklogd/sysklogd.daily b/main/sysklogd/sysklogd.daily index 723413d4d..725c33e31 100755 --- a/main/sysklogd/sysklogd.daily +++ b/main/sysklogd/sysklogd.daily @@ -1,7 +1,7 @@ #!/bin/sh # This is a shell script replacement for the sysklogd's logrotate cron script # and syslogd-listfiles perl script. -# Copyright (C) 2008 N. Angelacos for the Alpine Linux project - GPL2 +# Copyright (C) 2008-2015 N. Angelacos for the Alpine Linux project - GPL2 CONF="/etc/syslog.conf" @@ -25,12 +25,12 @@ syslogd_listfiles() { # deletes lines that are not filenames with leading "/" # print it while read a ; do echo "$a"; done < $CONF |\ - sed -n -e "s/\#.*//" \ + sed -nE -e "s/\#.*//" \ -e "/^[[:space:]]*$/D" \ - -e "s/[[:space:]]\+/ /g" \ + -e "s/[[:space:]]+/ /g" \ -e "s: -/: /:g" \ -e "s/ *; */;/" \ - -e "/^.*\(auth\)[^ ]* /${skip}D" \ + -e "/^.*(auth)[^ ]* /${skip}D" \ -e "s:^.* /:/:" \ -e "/^[^\\/]/D" \ -e "P" \ |