Bug #132889, argument over default service location leads to a safer default.

(Portage version: 2.1_rc1-r2)

6 files changed, 62 insertions, 2 deletions

diff --git a/net-ftp/tftp-hpa/ChangeLog b/net-ftp/tftp-hpa/ChangeLog
index 9f8c4c380428..4be2dd4df6a1 100644
--- a/net-ftp/tftp-hpa/ChangeLog
+++ b/net-ftp/tftp-hpa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/tftp-hpa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.17 2006/04/02 21:59:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.18 2006/05/20 09:14:57 robbat2 Exp $
+
+*tftp-hpa-0.42-r1 (20 May 2006)
+
+  20 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  files/in.tftpd.confd-0.42, +tftp-hpa-0.42-r1.ebuild:
+  Bug #132889, argument over default service location leads to a safer default.
 
 *tftp-hpa-0.42 (02 Apr 2006)
 
diff --git a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40-r1 b/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40-r1
index 22a8e1e12057..fe45d5a88e58 100644
--- a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40-r1
+++ b/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40-r1
@@ -1 +1,3 @@
 MD5 bfcdd49bf94900e610f2cc937d8980ef tftp-hpa-0.40.tar.bz2 82442
+RMD160 09faa3d5b9579dc4a975aae7c717e4afdcaa06dc tftp-hpa-0.40.tar.bz2 82442
+SHA256 c2e234731fd1aa34483cf71fb5151aa1a59f427196fc94273e1fc026b12beeb9 tftp-hpa-0.40.tar.bz2 82442
diff --git a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40.1 b/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40.1
index 4994e881ee56..9f4bd592d3d1 100644
--- a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40.1
+++ b/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.40.1
@@ -1 +1,3 @@
 MD5 ae4273b21cef3f7984b6e3757a78e452 tftp-hpa-0.40.1.tar.bz2 81835
+RMD160 82dd5590ecba0929697fa3d3e37d2fc098d199cb tftp-hpa-0.40.1.tar.bz2 81835
+SHA256 2c0c274f904a34cd93676e59eb83ae86ed535c27f6ee967c11542ec302d346d1 tftp-hpa-0.40.1.tar.bz2 81835
diff --git a/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.42-r1 b/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.42-r1
new file mode 100644
index 000000000000..42e22d1abe40
--- /dev/null
+++ b/net-ftp/tftp-hpa/files/digest-tftp-hpa-0.42-r1
@@ -0,0 +1,3 @@
+MD5 a6a21c51d74787f02ac4b2280d1fedb5 tftp-hpa-0.42.tar.bz2 82367
+RMD160 241ad845bd53c0ef43d46210cc9083d040dd0354 tftp-hpa-0.42.tar.bz2 82367
+SHA256 f957c2340e367d62a90be1542cb80028ebbf5a5fb71fdb1935c05c000f79a3d1 tftp-hpa-0.42.tar.bz2 82367
diff --git a/net-ftp/tftp-hpa/files/in.tftpd.confd-0.42 b/net-ftp/tftp-hpa/files/in.tftpd.confd-0.42
index f5a40f0236c7..14e8d1452881 100644
--- a/net-ftp/tftp-hpa/files/in.tftpd.confd-0.42
+++ b/net-ftp/tftp-hpa/files/in.tftpd.confd-0.42
@@ -1,7 +1,11 @@
 # /etc/init.d/in.tftpd
 
 # Path to server files from
-INTFTPD_PATH="/tftproot"
+# Depending on your application you may have to change this.
+# This is commented out to force you to look at the file!
+#INTFTPD_PATH="/var/tftp/"
+#INTFTPD_PATH="/tftpboot/"
+#INTFTPD_PATH="/tftproot/"
 
 # For more options, see in.tftpd(8)
 # -R 4096:32767 solves problems with ARC firmware, and obsoletes
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.42-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.42-r1.ebuild
new file mode 100644
index 000000000000..dba997bb1716
--- /dev/null
+++ b/net-ftp/tftp-hpa/tftp-hpa-0.42-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 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.42-r1.ebuild,v 1.1 2006/05/20 09:14:57 robbat2 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 ~ppc64 ~s390 ~sparc ~x86"
+IUSE="readline selinux tcpd"
+
+DEPEND="readline? ( sys-libs/readline )
+	tcpd? ( sys-apps/tcp-wrappers )
+	selinux? ( sec-policy/selinux-tftpd )
+	!virtual/tftp"
+PROVIDE="virtual/tftp"
+
+src_compile() {
+	econf \
+		$(use_with tcpd tcpwrappers) \
+		$(use_with readline) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make INSTALLROOT="${D}" install || die
+	dodoc README* CHANGES tftpd/sample.rules
+
+	# iputils installs this
+	rm -f "${D}"/usr/share/man/man8/tftpd.8
+
+	newconfd "${FILESDIR}"/in.tftpd.confd-0.42 in.tftpd
+	newinitd "${FILESDIR}"/in.tftpd.rc6 in.tftpd
+}
+
+pkg_postinst() {
+	ewarn "After installation, please ensure you look at"
+	ewarn "/etc/conf.d/in.tftpd and set the correct path"
+	ewarn "for your application."
+}