diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-07-30 06:29:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-30 06:29:14 +0000 |
| commit | bd6bb9a5d2341d0f00d284580525966c45aa51bb (patch) | |
| tree | 66af0075d7112657fa2772a256099027ecc1b55c /net-ftp | |
| parent | Add some user-input buffer len checks #100423 by Amir Sadoughi. (diff) | |
| download | gentoo-2-bd6bb9a5d2341d0f00d284580525966c45aa51bb.tar.gz gentoo-2-bd6bb9a5d2341d0f00d284580525966c45aa51bb.tar.bz2 gentoo-2-bd6bb9a5d2341d0f00d284580525966c45aa51bb.zip | |
Clean up init scripts and stabilize for #90784 by Daniel Webert.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/tftp-hpa/ChangeLog | 8 | ||||
| -rw-r--r-- | net-ftp/tftp-hpa/files/in.tftpd.confd | 8 | ||||
| -rw-r--r-- | net-ftp/tftp-hpa/files/in.tftpd.rc6 | 15 | ||||
| -rw-r--r-- | net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild | 5 |
4 files changed, 21 insertions, 15 deletions
diff --git a/net-ftp/tftp-hpa/ChangeLog b/net-ftp/tftp-hpa/ChangeLog index f0a726ebf9ad..d023ed189501 100644 --- a/net-ftp/tftp-hpa/ChangeLog +++ b/net-ftp/tftp-hpa/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/tftp-hpa -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.5 2005/07/29 22:05:36 vanquirius Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.6 2005/07/30 06:29:14 vapier Exp $ + + 30 Jul 2005; Mike Frysinger <vapier@gentoo.org> files/in.tftpd.confd, + files/in.tftpd.rc6, tftp-hpa-0.40-r1.ebuild: + Clean up init scripts and stabilize for #90784 by Daniel Webert. 29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> -tftp-hpa-0.33.ebuild, -tftp-hpa-0.40.ebuild, tftp-hpa-0.40-r1.ebuild: diff --git a/net-ftp/tftp-hpa/files/in.tftpd.confd b/net-ftp/tftp-hpa/files/in.tftpd.confd index a755e418d7a3..99cb21cbb6c3 100644 --- a/net-ftp/tftp-hpa/files/in.tftpd.confd +++ b/net-ftp/tftp-hpa/files/in.tftpd.confd @@ -1,5 +1,7 @@ -# Config file for /etc/init.d/in.tftpd -# Remove the -l if you use [x]inetd +# /etc/init.d/in.tftpd +# Path to server files from INTFTPD_PATH="/tftproot" -INTFTPD_OPTS="-l -s ${INTFTPD_PATH}" + +# For more options, see tftpd(8) +INTFTPD_OPTS="-s ${INTFTPD_PATH}" diff --git a/net-ftp/tftp-hpa/files/in.tftpd.rc6 b/net-ftp/tftp-hpa/files/in.tftpd.rc6 index 58d27a638360..fcf2a4cc3e58 100644 --- a/net-ftp/tftp-hpa/files/in.tftpd.rc6 +++ b/net-ftp/tftp-hpa/files/in.tftpd.rc6 @@ -1,21 +1,20 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/files/in.tftpd.rc6,v 1.1 2004/12/09 20:56:37 squinky86 Exp $ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/files/in.tftpd.rc6,v 1.2 2005/07/30 06:29:14 vapier Exp $ depend() { need net } start() { - ebegin "Starting in.tftpd" - start-stop-daemon --start --quiet \ - --exec /usr/sbin/in.tftpd -- ${INTFTPD_OPTS} + ebegin "Starting tftpd" + /usr/sbin/in.tftpd -l ${INTFTPD_OPTS} eend $? } stop() { - ebegin "Stopping in.tftpd" - start-stop-daemon --stop --quiet --exec /usr/sbin/in.tftpd + ebegin "Stopping tftpd" + start-stop-daemon --stop --exec /usr/sbin/in.tftpd eend $? } diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild index 365244df2605..d66bbd765e31 100644 --- a/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild +++ b/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild,v 1.3 2005/07/29 22:05:36 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.40-r1.ebuild,v 1.4 2005/07/30 06:29:14 vapier Exp $ DESCRIPTION="port of the OpenBSD TFTP server" HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/" SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2" + LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~s390" +KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc s390 ~sparc x86" IUSE="" DEPEND="!virtual/tftp" |