Clean up init scripts and stabilize for #90784 by Daniel Webert.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 36 insertions, 20 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/Manifest b/net-ftp/tftp-hpa/Manifest
index 8a5d1b07abe3..c75db0bb4963 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6beaaff025cc211c3776bf3c633e4c1f tftp-hpa-0.34-r1.ebuild 766
-MD5 fd8ae783b2fd54e4b437c65ccaa3a398 ChangeLog 3412
-MD5 ebde07d7d9b1c603428806489254c116 tftp-hpa-0.40-r1.ebuild 839
+MD5 982fb58cbcecc16480892ac21a5f33d4 tftp-hpa-0.40-r1.ebuild 830
 MD5 f0b3c514a598fdff8dffc93723f41068 metadata.xml 300
-MD5 b528d4bed168103c99134196bee5b274 files/in.tftpd.rc6 515
-MD5 4cf3b73c8361f35562a6933865d78e5f files/in.tftpd.confd 138
-MD5 2f7c453cd0fde112ffac93387966fad3 files/digest-tftp-hpa-0.34-r1 65
+MD5 d7871f18053cd9774ee4b79016d94aa4 ChangeLog 3595
+MD5 9e0867241bab97104a2d82fb8035725b files/in.tftpd.confd 145
+MD5 0deba94161c48e49f0e2ee02afde4940 files/in.tftpd.rc6 443
 MD5 64b89cea2b9b468a4c4068b0ec5382a4 files/digest-tftp-hpa-0.40-r1 65
+MD5 2f7c453cd0fde112ffac93387966fad3 files/digest-tftp-hpa-0.34-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC6x5LgIKl8Uu19MoRAjm0AJ0ejApNDq0QaPgSocscURVzTP6BIgCfTS+g
+hjcZ0Nnc+eKYd0sAD/FGNnA=
+=AUWl
+-----END PGP SIGNATURE-----
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"