diff options
Diffstat (limited to 'sys-process/daemontools')
| -rw-r--r-- | sys-process/daemontools/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-process/daemontools/Manifest | 23 | ||||
| -rw-r--r-- | sys-process/daemontools/daemontools-0.76-r5.ebuild (renamed from sys-process/daemontools/daemontools-0.76-r4.ebuild) | 4 | ||||
| -rw-r--r-- | sys-process/daemontools/files/digest-daemontools-0.76-r5 (renamed from sys-process/daemontools/files/digest-daemontools-0.76-r4) | 0 | ||||
| -rwxr-xr-x | sys-process/daemontools/files/svscan | 37 | ||||
| -rwxr-xr-x | sys-process/daemontools/files/svscan-0.76-r4 | 36 | ||||
| -rw-r--r-- | sys-process/daemontools/files/svscan.init | 30 |
7 files changed, 46 insertions, 93 deletions
diff --git a/sys-process/daemontools/ChangeLog b/sys-process/daemontools/ChangeLog index 106fe38a7983..4be43880a56a 100644 --- a/sys-process/daemontools/ChangeLog +++ b/sys-process/daemontools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-process/daemontools # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/ChangeLog,v 1.2 2005/03/03 19:46:25 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/ChangeLog,v 1.3 2005/12/11 09:49:54 uberlord Exp $ + +*daemontools-0.76-r5 (11 Dec 2005) + + 11 Dec 2005; Roy Marples <uberlord@gentoo.org> -files/svscan-0.76-r4, + -files/svscan, +files/svscan.init, -daemontools-0.76-r4.ebuild, + +daemontools-0.76-r5.ebuild: + Init script actually works now, #112950. *daemontools-0.76-r4 (03 Mar 2005) diff --git a/sys-process/daemontools/Manifest b/sys-process/daemontools/Manifest index 7085dc6edbd6..f176aba505e2 100644 --- a/sys-process/daemontools/Manifest +++ b/sys-process/daemontools/Manifest @@ -1,18 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 61c3e4ea45555bbfb799a8eda3c7c563 ChangeLog 4031 -MD5 27722bd887e3c5e54a17540c1b1236c6 daemontools-0.76-r4.ebuild 1589 -MD5 c75438b1c3b9d9f67691bd10cf3c8e52 files/0.76-errno.patch 246 -MD5 6ce7442b288dd69b4e456d00690a8344 files/0.76-head-1.patch 791 -MD5 3f0f5c5f8ae8169640d4dff02605d25e files/digest-daemontools-0.76-r4 67 -MD5 ebe8e01b96d328e46020d8a9a8542640 files/svscan 860 -MD5 318908f89618070823b5ae23d06e91ac files/svscan-0.76-r4 894 +MD5 ea7d4d257ee7a69a1b9c3f93071e54b7 ChangeLog 4280 +MD5 0b9029ee963d21b86b60b55a615dab50 daemontools-0.76-r5.ebuild 1588 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDZIeSgIKl8Uu19MoRAoyLAJ46AjvkyDq0B7RCYVdQ3IO9UER0ZQCdGCwW -gwWhuqufGEwPtP9ZpRDeCBU= -=bM+l ------END PGP SIGNATURE----- +MD5 6ce7442b288dd69b4e456d00690a8344 files/0.76-head-1.patch 791 +MD5 bbfe31d704c11d12b2c48b510ad06b77 files/svscan.init 796 +MD5 c75438b1c3b9d9f67691bd10cf3c8e52 files/0.76-errno.patch 246 +MD5 3f0f5c5f8ae8169640d4dff02605d25e files/digest-daemontools-0.76-r5 67 diff --git a/sys-process/daemontools/daemontools-0.76-r4.ebuild b/sys-process/daemontools/daemontools-0.76-r5.ebuild index 822546ab72ac..10db8ba2ebad 100644 --- a/sys-process/daemontools/daemontools-0.76-r4.ebuild +++ b/sys-process/daemontools/daemontools-0.76-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/daemontools-0.76-r4.ebuild,v 1.2 2005/10/30 08:42:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/daemontools-0.76-r5.ebuild,v 1.1 2005/12/11 09:49:54 uberlord Exp $ inherit eutils toolchain-funcs @@ -50,7 +50,7 @@ src_install() { dodoc CHANGES ../package/README TODO - newinitd ${FILESDIR}/svscan-0.76-r4 svscan + newinitd ${FILESDIR}/svscan.init svscan } pkg_postinst() { diff --git a/sys-process/daemontools/files/digest-daemontools-0.76-r4 b/sys-process/daemontools/files/digest-daemontools-0.76-r5 index 0d344babc47a..0d344babc47a 100644 --- a/sys-process/daemontools/files/digest-daemontools-0.76-r4 +++ b/sys-process/daemontools/files/digest-daemontools-0.76-r5 diff --git a/sys-process/daemontools/files/svscan b/sys-process/daemontools/files/svscan deleted file mode 100755 index b6ac2dcc190a..000000000000 --- a/sys-process/daemontools/files/svscan +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan,v 1.1 2005/03/03 18:11:26 ciaranm Exp $ - -depend() { - need net - after net - before ntpd - before spamd - before apache - before apache2 -} - -start() { - ebegin "Starting service scan" - ( - # workaround for #25754 - unset -f `declare -F | sed 's:declare -f::g'` - PATH="/usr/bin:$PATH" - start-stop-daemon --start --quiet --exec /usr/bin/svscan --pidfile /var/run/svscan.pid -- /service & - echo $! > /var/run/svscan.pid - ) - eend $? -} - -stop() { - ebegin "Stopping service scan" - start-stop-daemon --stop --quiet --pidfile /var/run/svscan.pid - eend $? - ebegin "Stopping services" - svc -dx /service/* - eend $? - ebegin "Stopping service logging" - svc -dx /service/*/log - eend $? -} diff --git a/sys-process/daemontools/files/svscan-0.76-r4 b/sys-process/daemontools/files/svscan-0.76-r4 deleted file mode 100755 index a8b700a39b4c..000000000000 --- a/sys-process/daemontools/files/svscan-0.76-r4 +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan-0.76-r4,v 1.2 2005/04/27 23:41:30 vapier Exp $ - -depend() { - need net - after net - before ntpd ntp-client - before spamd - before apache apache2 -} - -start() { - ebegin "Starting service scan" - ( - # workaround for #25754 - unset -f `declare -F | sed 's:declare -f::g'` - PATH="/usr/bin:$PATH" - start-stop-daemon --start --quiet --exec /usr/bin/svscan --pidfile /var/run/svscan.pid -- /service & - echo $! > /var/run/svscan.pid - ) - eend $? -} - -stop() { - ebegin "Stopping service scan" - start-stop-daemon --stop --quiet --pidfile /var/run/svscan.pid - eend $? - ebegin "Stopping services" - svc -dx /service/* 2>/dev/null - eend $? - ebegin "Stopping service logging" - svc -dx /service/*/log 2>/dev/null - eend $? -} diff --git a/sys-process/daemontools/files/svscan.init b/sys-process/daemontools/files/svscan.init new file mode 100644 index 000000000000..8778c74fcdc5 --- /dev/null +++ b/sys-process/daemontools/files/svscan.init @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan.init,v 1.1 2005/12/11 09:49:54 uberlord Exp $ + +depend() { + use net + before ntpd ntp-client spamd apache apache2 +} + +start() { + ebegin "Starting service scan" + start-stop-daemon --start --exec /usr/bin/svscan \ + --background --make-pidfile \ + --pidfile /var/run/svscan.pid -- /service + eend $? +} + +stop() { + ebegin "Stopping service scan services" + svc -dx /service/* 2>/dev/null + eend $? + ebegin "Stopping service scan logging" + svc -dx /service/*/log 2>/dev/null + eend $? + ebegin "Stopping service scan" + start-stop-daemon --stop --exec /usr/bin/svscan \ + --pidfile /var/run/svscan.pid + eend $? +} |