diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2008-06-14 03:35:45 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2008-06-14 03:35:45 +0000 |
| commit | 20c9e1ffa4c709899a54b7dd24562d817c01a027 (patch) | |
| tree | be1f5a9f28ab359c45a2695509e9d882d7a731d0 /net-misc/zebedee | |
| parent | Version bump. Changed dependancy based on Possum's suggestion in bug #197904.... (diff) | |
| download | gentoo-2-20c9e1ffa4c709899a54b7dd24562d817c01a027.tar.gz gentoo-2-20c9e1ffa4c709899a54b7dd24562d817c01a027.tar.bz2 gentoo-2-20c9e1ffa4c709899a54b7dd24562d817c01a027.zip | |
Minor QA: quoting & fixed init script to actually be able to start daemon after stopping it. Thanks to WayneSherman in bug #197948
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-misc/zebedee')
| -rw-r--r-- | net-misc/zebedee/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/zebedee/files/zebedee | 16 | ||||
| -rw-r--r-- | net-misc/zebedee/zebedee-2.4.1-r1.ebuild | 8 |
3 files changed, 17 insertions, 16 deletions
diff --git a/net-misc/zebedee/ChangeLog b/net-misc/zebedee/ChangeLog index 21280a7c4887..1ce7bb89caf3 100644 --- a/net-misc/zebedee/ChangeLog +++ b/net-misc/zebedee/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/zebedee -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.20 2007/10/31 03:28:14 vapier Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.21 2008/06/14 03:35:44 darkside Exp $ + + 14 Jun 2008; Jeremy Olexa <darkside@gentoo.org> files/zebedee, + zebedee-2.4.1-r1.ebuild: + Minor QA: quoting & fixed init script to actually be able to start daemon + after stopping it. Thanks to WayneSherman in bug #197948 31 Oct 2007; Mike Frysinger <vapier@gentoo.org> zebedee-2.5.3.ebuild: Use doinitd rather than newinitd #197482. diff --git a/net-misc/zebedee/files/zebedee b/net-misc/zebedee/files/zebedee index 8bfef2a39fe9..c06f8c7192ca 100644 --- a/net-misc/zebedee/files/zebedee +++ b/net-misc/zebedee/files/zebedee @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/files/zebedee,v 1.3 2004/07/15 00:16:32 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/files/zebedee,v 1.4 2008/06/14 03:35:45 darkside Exp $ depend() { need net @@ -10,25 +10,21 @@ depend() { start() { ebegin "Starting Zebedee" - start-stop-daemon --quiet --start --startas /usr/bin/zebedee \ + start-stop-daemon --start --startas /usr/bin/zebedee \ -m -b -p /var/run/zebedee.pid \ -- -f /etc/zebedee/server.zbd - eend $? "Failed to start Zebedee" + eend $? } stop() { ebegin "Stopping Zebedee" - start-stop-daemon --quiet --stop \ - -p /var/run/zebedee.pid - eend $? "Failed to stop Zebedee" - - # clean stale pidfile - [ -f /var/run/zebedee.pid ] && rm -f /var/run/zebedee.pid + start-stop-daemon --stop -p /var/run/zebedee.pid + eend $? } restart() { ebegin "Restarting Zebedee" svc_stop svc_start - eend $? "Failed to restart Zebedee" + eend $? } diff --git a/net-misc/zebedee/zebedee-2.4.1-r1.ebuild b/net-misc/zebedee/zebedee-2.4.1-r1.ebuild index e9a6df6cffe1..a933d92f8307 100644 --- a/net-misc/zebedee/zebedee-2.4.1-r1.ebuild +++ b/net-misc/zebedee/zebedee-2.4.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1-r1.ebuild,v 1.3 2007/04/28 17:04:39 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1-r1.ebuild,v 1.4 2008/06/14 03:35:44 darkside Exp $ MY_P="${P}A" DESCRIPTION="A simple, free, secure TCP and UDP tunnel program" @@ -38,12 +38,12 @@ src_install() { OS=linux \ install || die - rm -f ${D}/etc/zebedee/*.{txt,html} + rm -f "${D}"/etc/zebedee/*.{txt,html} dodoc *.txt dohtml *.html - doinitd ${FILESDIR}/zebedee + doinitd "${FILESDIR}"/zebedee } pkg_postinst() { |