diff options
| -rw-r--r-- | main/sysklogd/APKBUILD | 8 | ||||
| -rw-r--r-- | main/sysklogd/sysklogd.initd | 18 |
2 files changed, 11 insertions, 15 deletions
diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD index e482fbca4a..377bc3fbc8 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=14 +pkgrel=15 pkgdesc="System and kernel log daemons" url="http://www.infodrom.org/projects/sysklogd/" arch="all" @@ -59,7 +59,7 @@ package() { md5sums="e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz 6bc1d1c65076b104a8f78d0fb4f21db7 sysklogd.logrotate dcda8ba997e79a90fdf4ab61f6e5a42b sysklogd.daily -1b75dea0bac3d35c3d3e9854ab70c057 sysklogd.initd +6ac5b2a358c0ffdaff05e9666b279827 sysklogd.initd e25d7b583b7e4bd8be503b89e1771e90 sysklogd.confd 3b7ba3aa6519f96f11165a7d5900a8b1 sysklogd-1.4.2-caen-owl-klogd-drop-root.diff 4715e1dd2deb7a9ac137e004210e3154 sysklogd-1.4.2-caen-owl-syslogd-bind.diff @@ -72,7 +72,7 @@ fee8beb8c17f8ff8bbf6523fbb1c627f fix-includes.patch sha256sums="6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773 sysklogd-1.5.tar.gz 603fa42348264aba7bc6e3306582523248a7841a0b02f101af0028e8db14a22a sysklogd.logrotate bd72d336cf70903af1512e81180190de09b84f25b3dced5915869306a63841f2 sysklogd.daily -379fd137610ff0c3be23387e2b85e1163212c87952a410b3dfa38a24e0215880 sysklogd.initd +ef2e1e49b08b1ce7d9109c446bda65860feb8f79ceaeaa7a91a73bf28737b721 sysklogd.initd 11a1eeb9edd09639d5143227bada137945822b23c5abb88fec5ebaef064b991d sysklogd.confd f316586561ec40eb185bb83b6e785185b9e33b8290767336cdab626767f88060 sysklogd-1.4.2-caen-owl-klogd-drop-root.diff 1818aee4cb0d501542721468199e376b73c71d8635b178b6a8d7bd6aff49aa9d sysklogd-1.4.2-caen-owl-syslogd-bind.diff @@ -85,7 +85,7 @@ f438fd0f85eb6796289421aa0339d54d5c1cb0a5524df4c866c009a05223bf70 syslog.conf sha512sums="19ef104c03a8c87ea30c811fe54bb30e7c73a2834a83c8720841f0d553d41508dbf052d4e3dd9ea929eedff31e9fbb79f8c05546f48005b74f01ebf2a57e48f7 sysklogd-1.5.tar.gz d82caedfa61bfefc0162e5c416ff75a5cd8f60abe1cf8a3c5c4e7775aeb7bb64e712c783031659d3793378c8753578adf73ef79aac6a0e7cfbc5bbba5a74bd81 sysklogd.logrotate 954f2f913e044b11b418aec3157f7757079b2e20b9a6fffd4b6eff94b5c74e62e804cdf870f84ea9412285d5024f3900c9a42cad8ff99534cc1d1a40ee120048 sysklogd.daily -1734ef2dc9cbfeb14528f08c9dece22e0a8f4b2488b630e462a3967205c01e1ba012376bbc3f2f5d90d6f201b3cbacd0e41b16ebe05b3d0a361a278a855fe5b9 sysklogd.initd +4b598713f531d436cb2b666136464ce519eb17ad66061aa58cbb2ab4383f97e62170ae5efe0e2455b33f8f59509809a553625827a1ef8d65ab54a61f937f8e4c sysklogd.initd 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c sysklogd.confd 1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a sysklogd-1.4.2-caen-owl-klogd-drop-root.diff 995c240fc54681445f68f7681173e1e1860aaab309edc8ac3531881c63c8889f009a7fd622d37145e80fe187410b80c28554140d6a6660134ca87a1c8d13570d sysklogd-1.4.2-caen-owl-syslogd-bind.diff diff --git a/main/sysklogd/sysklogd.initd b/main/sysklogd/sysklogd.initd index 429f6391c7..f0f8384941 100644 --- a/main/sysklogd/sysklogd.initd +++ b/main/sysklogd/sysklogd.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc6,v 1.12 2007/05/01 12:49:04 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/files/sysklogd.rc7,v 1.1 2011/09/14 22:22:57 polynomial-c Exp $ extra_started_commands="reload" @@ -32,7 +32,7 @@ stop_daemon() { local daemon="$1" [ -z "${daemon}" ] && return 1 - + ebegin "sysklogd -> stop: ${daemon}" # syslogd can be stubborn some times (--retry 15)... start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid @@ -45,8 +45,6 @@ stop_daemon() { start() { start_daemon "syslogd" "${SYSLOGD}" || return 1 - # vservers should not start klogd - [ "$RC_SYS" = "VSERVER" ] && return 0 # klogd do not always start proper if started too early sleep 1 @@ -59,10 +57,8 @@ start() { } stop() { - if [ "$RC_SYS" != "VSERVER" ]; then - stop_daemon "klogd" || return 1 - fi - stop_daemon "syslogd" || return 1 + stop_daemon "klogd" || return 1 + stop_daemon "syslogd" || return 1 return 0 } @@ -71,9 +67,9 @@ reload() { ebegin "Reloading configuration" - start-stop-daemon --stop --signal HUP --pidfile /var/run/syslogd.pid + start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid ret=$((${ret} + $?)) - start-stop-daemon --stop --signal USR1 --pidfile /var/run/klogd.pid + start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid ret=$((${ret} + $?)) eend ${ret} |