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

Package-Manager: portage-2.1_rc1-r2

7 files changed, 94 insertions, 17 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/Manifest b/net-ftp/tftp-hpa/Manifest
index 769456709b23..5648ae04d2ee 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -1,30 +1,47 @@
-MD5 573b19eb114bf2f54e459fa2971b2988 ChangeLog 4894
-RMD160 e93b5df561cdcd10bd2fdda15fc4383fe3bbc2b4 ChangeLog 4894
-SHA256 af2fa87c9f396146639886380860f7dbe99abe97734f98d2b440c894201b14cd ChangeLog 4894
-MD5 64b89cea2b9b468a4c4068b0ec5382a4 files/digest-tftp-hpa-0.40-r1 65
-RMD160 64a51e77c5a97dd438a76eaced7d20f5c1d70d4a files/digest-tftp-hpa-0.40-r1 65
-SHA256 29717b521800dfd48a64f9ee17bc545f83235c306d50c782fead77895cba2a28 files/digest-tftp-hpa-0.40-r1 65
-MD5 ce9766cf2b5c3fcf0deab319ac68ad38 files/digest-tftp-hpa-0.40.1 67
-RMD160 6747253ed97998062d44b58a1475819fec8fa066 files/digest-tftp-hpa-0.40.1 67
-SHA256 d33be3d24c36b16fbf4d01e44f15ed079ec68e2a8040ec46fb0475891a3e278b files/digest-tftp-hpa-0.40.1 67
-MD5 9dbde371bcd1a82b6cf587877505b808 files/digest-tftp-hpa-0.42 241
-RMD160 711fe2f4d754375af1840eb9aa9a289a15065fba files/digest-tftp-hpa-0.42 241
-SHA256 b43df0e7d05dd34167798b4694ea94f54f8dc9c27ddf80bc36e25a65d7bf10c0 files/digest-tftp-hpa-0.42 241
+AUX in.tftpd.confd 145 RMD160 64fd029d121406e492b92b28b1bf227c3c81ce7a SHA1 5b3af114a9a8462995dd3d71164a3b8f29f230a1 SHA256 750212e6c8e58bb799f0b49d39527ffceb595d26d24852f3f3bacedac38ea65f size 145
 MD5 9e0867241bab97104a2d82fb8035725b files/in.tftpd.confd 145
 RMD160 64fd029d121406e492b92b28b1bf227c3c81ce7a files/in.tftpd.confd 145
 SHA256 750212e6c8e58bb799f0b49d39527ffceb595d26d24852f3f3bacedac38ea65f files/in.tftpd.confd 145
-MD5 9874de8012b7a059c137eda056a2f05f files/in.tftpd.confd-0.42 401
-RMD160 fe91e3711ab48da5e8d38d2dc4bffd61939f749c files/in.tftpd.confd-0.42 401
-SHA256 5fd6f873d73f649bacf6a0dddbc522167594fbce2ebd67f38b295486cd63a186 files/in.tftpd.confd-0.42 401
+AUX in.tftpd.confd-0.42 576 RMD160 718a437e2d44c1594ef359784fde89d0367c2a47 SHA1 e4a051f435f56007b9efb4173e2d272b12442436 SHA256 55e67f871f070db2b7fa1428dabf55777ca87fecdbba7fa3b03e63c63734f977 size 576
+MD5 1f01a56b211b6113aa08895bf6c6b78f files/in.tftpd.confd-0.42 576
+RMD160 718a437e2d44c1594ef359784fde89d0367c2a47 files/in.tftpd.confd-0.42 576
+SHA256 55e67f871f070db2b7fa1428dabf55777ca87fecdbba7fa3b03e63c63734f977 files/in.tftpd.confd-0.42 576
+AUX in.tftpd.rc6 443 RMD160 e4a8d822b24cb9cf73b6e9601fcc58d40a203cb9 SHA1 7929ceb89811558576c7a9a4a4bb6d11bbd3c833 SHA256 3bceb3446bbebfae60d5276a2481c4311270d2e33c46e73a8bea66e330244ae0 size 443
 MD5 0deba94161c48e49f0e2ee02afde4940 files/in.tftpd.rc6 443
 RMD160 e4a8d822b24cb9cf73b6e9601fcc58d40a203cb9 files/in.tftpd.rc6 443
 SHA256 3bceb3446bbebfae60d5276a2481c4311270d2e33c46e73a8bea66e330244ae0 files/in.tftpd.rc6 443
+DIST tftp-hpa-0.40.1.tar.bz2 81835 RMD160 82dd5590ecba0929697fa3d3e37d2fc098d199cb SHA256 2c0c274f904a34cd93676e59eb83ae86ed535c27f6ee967c11542ec302d346d1 size 81835
+DIST tftp-hpa-0.40.tar.bz2 82442 RMD160 09faa3d5b9579dc4a975aae7c717e4afdcaa06dc SHA256 c2e234731fd1aa34483cf71fb5151aa1a59f427196fc94273e1fc026b12beeb9 size 82442
+DIST tftp-hpa-0.42.tar.bz2 82367 RMD160 241ad845bd53c0ef43d46210cc9083d040dd0354 SHA256 f957c2340e367d62a90be1542cb80028ebbf5a5fb71fdb1935c05c000f79a3d1 size 82367
+EBUILD tftp-hpa-0.40-r1.ebuild 1019 RMD160 2a7a5f69d928842c2fe6b1a6f920a2de0f854380 SHA1 bfd8a3ce9f1b9004c3d6f83060b8e0c83ab30bbb SHA256 2932c10da7841b7df83c340d65e6fbab96b5343a974f92c2e54b71f367946a73 size 1019
 MD5 0b942a8eed3507099acec26ffd91bd07 tftp-hpa-0.40-r1.ebuild 1019
 RMD160 2a7a5f69d928842c2fe6b1a6f920a2de0f854380 tftp-hpa-0.40-r1.ebuild 1019
 SHA256 2932c10da7841b7df83c340d65e6fbab96b5343a974f92c2e54b71f367946a73 tftp-hpa-0.40-r1.ebuild 1019
+EBUILD tftp-hpa-0.40.1.ebuild 1024 RMD160 875b90fc36df46d2ba006582ac09f7ac9c1db0d0 SHA1 405cbe17cc90d5556914e68b1ea8a939f94275f6 SHA256 5d4f33d2c1491703287f5d3cdf27741932a2571d58a3eb3c4746dc20390b09fe size 1024
 MD5 a399f11a493b57f15387d01a33be4e26 tftp-hpa-0.40.1.ebuild 1024
 RMD160 875b90fc36df46d2ba006582ac09f7ac9c1db0d0 tftp-hpa-0.40.1.ebuild 1024
 SHA256 5d4f33d2c1491703287f5d3cdf27741932a2571d58a3eb3c4746dc20390b09fe tftp-hpa-0.40.1.ebuild 1024
+EBUILD tftp-hpa-0.42-r1.ebuild 1212 RMD160 6f952cbb44ae9fda9e9206f07c3860017d8effa4 SHA1 deebeca8f611c37ba69c342ac0a991ab852e165e SHA256 c2f2355d027334779962f478b172329c6bfd519c42394deb46f3e916a3815d42 size 1212
+MD5 ff07379cab43709707660f444f26e1e5 tftp-hpa-0.42-r1.ebuild 1212
+RMD160 6f952cbb44ae9fda9e9206f07c3860017d8effa4 tftp-hpa-0.42-r1.ebuild 1212
+SHA256 c2f2355d027334779962f478b172329c6bfd519c42394deb46f3e916a3815d42 tftp-hpa-0.42-r1.ebuild 1212
+EBUILD tftp-hpa-0.42.ebuild 1048 RMD160 bf7aba5f18147679862a4ab8a14e3b43dc56696f SHA1 0ef95e4e95b803e91a8f885a5a4ebe433cfc7bd3 SHA256 2393a9d3fd6eba9b2f4be18a6cc3e086baf8cb478856a3aa3abc382a65d750de size 1048
 MD5 c947c4318b94a42095d2d2d13f2d4750 tftp-hpa-0.42.ebuild 1048
 RMD160 bf7aba5f18147679862a4ab8a14e3b43dc56696f tftp-hpa-0.42.ebuild 1048
 SHA256 2393a9d3fd6eba9b2f4be18a6cc3e086baf8cb478856a3aa3abc382a65d750de tftp-hpa-0.42.ebuild 1048
+MISC ChangeLog 5116 RMD160 aec5ebaf759a050609f6ac2448bdc99aa96d880e SHA1 7ca38941234c698cea1418bfd4aa6ecb3b0af580 SHA256 66a46f89cdf8281457daaa9ea04dc48b5de389f228440c15f617a5e6a220e8fa size 5116
+MD5 a9c9a989fd414bfb5bacd2b260d73f53 ChangeLog 5116
+RMD160 aec5ebaf759a050609f6ac2448bdc99aa96d880e ChangeLog 5116
+SHA256 66a46f89cdf8281457daaa9ea04dc48b5de389f228440c15f617a5e6a220e8fa ChangeLog 5116
+MD5 3bef8565097412558405d37f0850a92d files/digest-tftp-hpa-0.40-r1 241
+RMD160 e6ee75950f178a21b8ae37d6a7e3f2311d8c7a39 files/digest-tftp-hpa-0.40-r1 241
+SHA256 ad2153132ee7558b6bb24ce3113b9f9af5b85433b15b7e410410ef4042ad58ad files/digest-tftp-hpa-0.40-r1 241
+MD5 2e5fe20d1a2d2dfa210f00a5cd0ca954 files/digest-tftp-hpa-0.40.1 247
+RMD160 1aa35829b6322ffe8cee0af9c5dcfea167e33e1c files/digest-tftp-hpa-0.40.1 247
+SHA256 6552f39dae672ae827ab129f8417fb8939ce5d232a1145b2d1242a1fa38d70a7 files/digest-tftp-hpa-0.40.1 247
+MD5 9dbde371bcd1a82b6cf587877505b808 files/digest-tftp-hpa-0.42 241
+RMD160 711fe2f4d754375af1840eb9aa9a289a15065fba files/digest-tftp-hpa-0.42 241
+SHA256 b43df0e7d05dd34167798b4694ea94f54f8dc9c27ddf80bc36e25a65d7bf10c0 files/digest-tftp-hpa-0.42 241
+MD5 9dbde371bcd1a82b6cf587877505b808 files/digest-tftp-hpa-0.42-r1 241
+RMD160 711fe2f4d754375af1840eb9aa9a289a15065fba files/digest-tftp-hpa-0.42-r1 241
+SHA256 b43df0e7d05dd34167798b4694ea94f54f8dc9c27ddf80bc36e25a65d7bf10c0 files/digest-tftp-hpa-0.42-r1 241
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."
+}