Bunch of fixes reported and some fixed in debian: segfault during tftp connect (see debian bug #375365), manpage typo (debian #310347), and put command in tftp now works (debian #88286). Added example files for xinetd, and dodoc now installs README, ChangeLog and BUGS. Took maintenance.

Package-Manager: portage-2.1.3_rc8

10 files changed, 203 insertions, 10 deletions

diff --git a/net-ftp/netkit-tftp/ChangeLog b/net-ftp/netkit-tftp/ChangeLog
index dc33d4e08689..324d035f6d90 100644
--- a/net-ftp/netkit-tftp/ChangeLog
+++ b/net-ftp/netkit-tftp/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-ftp/netkit-tftp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.5 2007/05/15 14:03:32 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.6 2007/07/19 13:27:18 pva Exp $
+
+*netkit-tftp-0.17-r4 (19 Jul 2007)
+
+  19 Jul 2007; <pva@gentoo.org>
+  +files/netkit-tftp-0.17-tftp-connect-segfault.patch,
+  +files/netkit-tftp-0.17-tftp-fix-put-zero-size.diff,
+  +files/netkit-tftp-0.17-tftp-manpage-typo.patch, +files/tftp-dgram,
+  +files/tftp-stream, metadata.xml, +netkit-tftp-0.17-r4.ebuild:
+  Bunch of fixes reported and some fixed in debian: segfault during tftp
+  connect (see debian bug #375365), manpage typo (debian #310347), and put
+  command in tftp now works (debian #88286). Added example files for xinetd,
+  and dodoc now installs README, ChangeLog and BUGS. Took maintenance.
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/net-ftp/netkit-tftp/Manifest b/net-ftp/netkit-tftp/Manifest
index 99c739f09b37..72c3c678a091 100644
--- a/net-ftp/netkit-tftp/Manifest
+++ b/net-ftp/netkit-tftp/Manifest
@@ -6,19 +6,46 @@ AUX memset.patch 280 RMD160 e7de5f8e41574e7dc649ee38bb5f7365fc0be4b6 SHA1 fe8c0c
 MD5 82dfb288c67dbce3be2e101318fab155 files/memset.patch 280
 RMD160 e7de5f8e41574e7dc649ee38bb5f7365fc0be4b6 files/memset.patch 280
 SHA256 9b04964776efc6b321fe9b388dda6206101d681911b80ea20135593d47b948b8 files/memset.patch 280
+AUX netkit-tftp-0.17-tftp-connect-segfault.patch 785 RMD160 e1e6daf991f55b8454c58f207d479dbbaeb76f57 SHA1 4b54bbf87cbcfb3a8ad47762086150aa77a0a3a3 SHA256 8ec005824a299cc106b420d012d9f5492093eaf9237c7dba692baffcb081458e
+MD5 5c2c7ed0f0f5e9a5908052ef277e1083 files/netkit-tftp-0.17-tftp-connect-segfault.patch 785
+RMD160 e1e6daf991f55b8454c58f207d479dbbaeb76f57 files/netkit-tftp-0.17-tftp-connect-segfault.patch 785
+SHA256 8ec005824a299cc106b420d012d9f5492093eaf9237c7dba692baffcb081458e files/netkit-tftp-0.17-tftp-connect-segfault.patch 785
+AUX netkit-tftp-0.17-tftp-fix-put-zero-size.diff 314 RMD160 4ed269cdf6cde97152da6d37eec1b91b3df363aa SHA1 6bfcd34858e78f0a1370c66323f9d26cb2907b7d SHA256 1e216083f0cdb592f927a5a33cec5b3ae1ae6fdc803d20c738b904a1aac7a32e
+MD5 946c96c4565adae5bcecc0f3701b120f files/netkit-tftp-0.17-tftp-fix-put-zero-size.diff 314
+RMD160 4ed269cdf6cde97152da6d37eec1b91b3df363aa files/netkit-tftp-0.17-tftp-fix-put-zero-size.diff 314
+SHA256 1e216083f0cdb592f927a5a33cec5b3ae1ae6fdc803d20c738b904a1aac7a32e files/netkit-tftp-0.17-tftp-fix-put-zero-size.diff 314
+AUX netkit-tftp-0.17-tftp-manpage-typo.patch 473 RMD160 43f7599b55c4a4e1493268ea03b4a44813ad5bf1 SHA1 2b26c24664e27024075a74d6e32a28ace1150cb9 SHA256 c7134c4458000f42aa3e3293ff8027a8126fdcdf8cb110673d2051b8f6ba12b4
+MD5 2224ec479b17795a4037d22ed72b074d files/netkit-tftp-0.17-tftp-manpage-typo.patch 473
+RMD160 43f7599b55c4a4e1493268ea03b4a44813ad5bf1 files/netkit-tftp-0.17-tftp-manpage-typo.patch 473
+SHA256 c7134c4458000f42aa3e3293ff8027a8126fdcdf8cb110673d2051b8f6ba12b4 files/netkit-tftp-0.17-tftp-manpage-typo.patch 473
+AUX tftp-dgram 246 RMD160 adfcba66b4db0afbb6372ff701ec8da310963f77 SHA1 e0afb619d6e4b2665be04ed2016836668a619ffd SHA256 b79af85531e4e300da30731ed0b761d0325ad091c6ae7e9c75bf67806b9e1009
+MD5 a7c82e66219132a44aa316babeea8c81 files/tftp-dgram 246
+RMD160 adfcba66b4db0afbb6372ff701ec8da310963f77 files/tftp-dgram 246
+SHA256 b79af85531e4e300da30731ed0b761d0325ad091c6ae7e9c75bf67806b9e1009 files/tftp-dgram 246
+AUX tftp-stream 246 RMD160 b1075084b89ac25cbcebdaa69152f42a032c57a5 SHA1 2378f5976cfae1c63e3ac96d6df417165dab8d17 SHA256 861a2d955c1d84d7268c3348ef53c33f44ce73453eda96c36b3750bba6f1f836
+MD5 4b5184285a740756f9b63e1185e5dbf5 files/tftp-stream 246
+RMD160 b1075084b89ac25cbcebdaa69152f42a032c57a5 files/tftp-stream 246
+SHA256 861a2d955c1d84d7268c3348ef53c33f44ce73453eda96c36b3750bba6f1f836 files/tftp-stream 246
 DIST netkit-tftp-0.17.tar.gz 23620 RMD160 18fa9eaa4e31ec9579a8ba8a486a2f0da0b22747 SHA1 d3d661d6462f1989a69b37acba4006be5ae112bc SHA256 3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d
 EBUILD netkit-tftp-0.17-r3.ebuild 889 RMD160 967c55df0f81cfa7bc69917acd4aafffaa2545ab SHA1 23dc1c253e7835a37ffbd4a1463479ed166ab5e9 SHA256 2e47c31a9ccdb75b50806fdec2d86a2487dc7b889534c782158b50e640c30e61
 MD5 a544c1e673768dcca6c6e142c3aa4abb netkit-tftp-0.17-r3.ebuild 889
 RMD160 967c55df0f81cfa7bc69917acd4aafffaa2545ab netkit-tftp-0.17-r3.ebuild 889
 SHA256 2e47c31a9ccdb75b50806fdec2d86a2487dc7b889534c782158b50e640c30e61 netkit-tftp-0.17-r3.ebuild 889
-MISC ChangeLog 1902 RMD160 9f753713f7dcb29c41fed250ff114eab7f055597 SHA1 1decdc501fed570021f22e4461ec36d3ba2725ac SHA256 d1828695184caee675a69d9281386d33b9c9aa0a4e4bc7167545a6c214debd97
-MD5 2d5e7abc23f29a9eff7e3636d52b3774 ChangeLog 1902
-RMD160 9f753713f7dcb29c41fed250ff114eab7f055597 ChangeLog 1902
-SHA256 d1828695184caee675a69d9281386d33b9c9aa0a4e4bc7167545a6c214debd97 ChangeLog 1902
-MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
-MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
-RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
-SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata.xml 231
+EBUILD netkit-tftp-0.17-r4.ebuild 1415 RMD160 2c8956ea6719ed94572c0c74174684ef09a863e4 SHA1 fc9f04f2af78a8895aa7540874fbd64f73813779 SHA256 180980b740e1a31dd1c3c95cd03ba99f3cf2ee2370f87ac577a0869c3d123b6a
+MD5 81308d7919856e53d13b0931aca11e9b netkit-tftp-0.17-r4.ebuild 1415
+RMD160 2c8956ea6719ed94572c0c74174684ef09a863e4 netkit-tftp-0.17-r4.ebuild 1415
+SHA256 180980b740e1a31dd1c3c95cd03ba99f3cf2ee2370f87ac577a0869c3d123b6a netkit-tftp-0.17-r4.ebuild 1415
+MISC ChangeLog 2508 RMD160 8bce983fdd16a37264a702425e5eb22697eda852 SHA1 84dae129daa38e2b99424c27a81df211ca8ec743 SHA256 a834254377f40e0c56328c5b0d800b60ae1ac9fede02fd97e13f79b0c9699b25
+MD5 95978c024b4e8ae2370b5fc431604d4c ChangeLog 2508
+RMD160 8bce983fdd16a37264a702425e5eb22697eda852 ChangeLog 2508
+SHA256 a834254377f40e0c56328c5b0d800b60ae1ac9fede02fd97e13f79b0c9699b25 ChangeLog 2508
+MISC metadata.xml 799 RMD160 8f94b4bf878b4bc1c81977707abe311e34b21780 SHA1 14a84369d0cbb5deca5b938f13c6c6fa7c1b5623 SHA256 6fc447069710464408b1e3c22512a9ec36f59f9226bae0918e36267780e6ef4a
+MD5 f609cd5499d71ca1f017ec94c0b305af metadata.xml 799
+RMD160 8f94b4bf878b4bc1c81977707abe311e34b21780 metadata.xml 799
+SHA256 6fc447069710464408b1e3c22512a9ec36f59f9226bae0918e36267780e6ef4a metadata.xml 799
 MD5 209efb222fc077ee2592589b114e7b6c files/digest-netkit-tftp-0.17-r3 247
 RMD160 a58f024955731eba24b066f566b900c824237990 files/digest-netkit-tftp-0.17-r3 247
 SHA256 d182b4e93d5175e8698237a06acba7a150d6c17a48f9a89e41a1eae42d092673 files/digest-netkit-tftp-0.17-r3 247
+MD5 209efb222fc077ee2592589b114e7b6c files/digest-netkit-tftp-0.17-r4 247
+RMD160 a58f024955731eba24b066f566b900c824237990 files/digest-netkit-tftp-0.17-r4 247
+SHA256 d182b4e93d5175e8698237a06acba7a150d6c17a48f9a89e41a1eae42d092673 files/digest-netkit-tftp-0.17-r4 247
diff --git a/net-ftp/netkit-tftp/files/digest-netkit-tftp-0.17-r4 b/net-ftp/netkit-tftp/files/digest-netkit-tftp-0.17-r4
new file mode 100644
index 000000000000..d9eb6d399074
--- /dev/null
+++ b/net-ftp/netkit-tftp/files/digest-netkit-tftp-0.17-r4
@@ -0,0 +1,3 @@
+MD5 b7262c798e2ff50e29c2ff50dfd8d6a8 netkit-tftp-0.17.tar.gz 23620
+RMD160 18fa9eaa4e31ec9579a8ba8a486a2f0da0b22747 netkit-tftp-0.17.tar.gz 23620
+SHA256 3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d netkit-tftp-0.17.tar.gz 23620
diff --git a/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-connect-segfault.patch b/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-connect-segfault.patch
new file mode 100644
index 000000000000..c9a2fd3a5555
--- /dev/null
+++ b/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-connect-segfault.patch
@@ -0,0 +1,32 @@
+Fixes bug reported at debian bugzilla:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=375365
+
+How to reproduce:
+$ tftp
+tftp> connect
+(to) 
+Segmentation fault
+
+Just pressing enter at the "(to)" prompt crashes tftp.
+
+--- ./tftp/main.c.orig	2007-07-19 11:31:55.000000000 +0400
++++ ./tftp/main.c	2007-07-19 12:54:25.000000000 +0400
+@@ -192,12 +192,17 @@
+ {
+ 	struct hostent *host;
+ 	size_t len;
++	char *retval;
+ 
+ 	if (argc < 2) {
+ 		strcpy(line, "Connect ");
+ 		printf("(to) ");
+ 		len = strlen(line);
+-		fgets(line+len, sizeof(line)-len, stdin);
++		retval = fgets(line+len, sizeof(line)-len, stdin);
++		if (isspace((int)*retval)) {
++			printf ("No value supplied. Connecting to localhost.\n");
++			strcpy(line+len, "localhost\n");
++		}
+ 		makeargv();
+ 		argc = margc;
+ 		argv = margv;
diff --git a/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-fix-put-zero-size.diff b/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-fix-put-zero-size.diff
new file mode 100644
index 000000000000..8a5c581ef6ad
--- /dev/null
+++ b/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-fix-put-zero-size.diff
@@ -0,0 +1,16 @@
+--- ./tftp/tftp.c.orig	2007-07-19 14:56:11.000000000 +0400
++++ ./tftp/tftp.c	2007-07-19 15:31:47.000000000 +0400
+@@ -197,9 +197,12 @@
+ 		}
+ 		else {
+ 			amount += size;
++			if (size != SEGSIZE) {
++				break;
++			}
+ 		}
+ 		block++;
+-	} while (size == SEGSIZE);
++	} while (1);
+ abort:
+ 	fclose(file);
+ 	stopclock();
diff --git a/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-manpage-typo.patch b/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-manpage-typo.patch
new file mode 100644
index 000000000000..0102450c8849
--- /dev/null
+++ b/net-ftp/netkit-tftp/files/netkit-tftp-0.17-tftp-manpage-typo.patch
@@ -0,0 +1,13 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=310347
+
+--- ./tftp/tftp.1.orig	2007-07-19 13:04:39.000000000 +0400
++++ ./tftp/tftp.1	2007-07-19 13:04:48.000000000 +0400
+@@ -84,7 +84,7 @@
+ protocol, unlike the
+ .Tn FTP
+ protocol,
+-does not maintain connections betweeen transfers; thus, the
++does not maintain connections between transfers; thus, the
+ .Cm connect
+ command does not actually create a connection,
+ but merely remembers what host is to be used for transfers.
diff --git a/net-ftp/netkit-tftp/files/tftp-dgram b/net-ftp/netkit-tftp/files/tftp-dgram
new file mode 100644
index 000000000000..ff2daf69e793
--- /dev/null
+++ b/net-ftp/netkit-tftp/files/tftp-dgram
@@ -0,0 +1,15 @@
+service tftp
+{
+	disable		= yes
+	id		= tftp
+	wait		= yes
+	socket_type	= dgram
+
+	user		= tftp
+	group		= tftp
+	server		= /usr/sbin/in.tftpd
+	server_args	= /tftpboot
+
+	log_on_success	= PID HOST USERID EXIT DURATION
+	log_on_failure	= USERID ATTEMPT
+}
diff --git a/net-ftp/netkit-tftp/files/tftp-stream b/net-ftp/netkit-tftp/files/tftp-stream
new file mode 100644
index 000000000000..966154824dff
--- /dev/null
+++ b/net-ftp/netkit-tftp/files/tftp-stream
@@ -0,0 +1,15 @@
+service tftp
+{
+	disable		= yes
+	id		= tftp
+	wait		= no
+	socket_type	= stream
+
+	user		= tftp
+	group		= tftp
+	server		= /usr/sbin/in.tftpd
+	server_args	= /tftpboot
+
+	log_on_success	= PID HOST USERID EXIT DURATION
+	log_on_failure	= USERID ATTEMPT
+}
diff --git a/net-ftp/netkit-tftp/metadata.xml b/net-ftp/netkit-tftp/metadata.xml
index 54494c4bb860..1cdcfd79c131 100644
--- a/net-ftp/netkit-tftp/metadata.xml
+++ b/net-ftp/netkit-tftp/metadata.xml
@@ -3,6 +3,16 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+<email>pva@gentoo.org</email>
+<name>Peter Volkov</name>
 </maintainer>
+<longdescription>
+  Tftp is the user interface to the Internet TFTP (Trivial File Transfer
+  Protocol), which allows users to transfer files to and from a remote machine.
+  The remote host may be specified on the command line, in which case tftp uses
+  host as the default host for future transfers. Tftpd is a server which
+  supports the Internet Trivial File Transfer Protocol (RFC 783). The TFTP
+  server operates at the port indicated in the `tftp' service description; see
+  services(5). The server is normally started by inetd(8).
+</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild
new file mode 100644
index 000000000000..b5932938aa27
--- /dev/null
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild,v 1.1 2007/07/19 13:27:18 pva Exp $
+
+inherit eutils
+
+DESCRIPTION="the tftp server included in netkit"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-0.17.tar.gz"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+
+KEYWORDS="~x86 ~sparc ~ppc ~mips ~amd64 ~ppc64"
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="!virtual/tftp
+		virtual/inetd"
+PROVIDE="virtual/tftp"
+
+src_unpack() {
+	unpack $A
+	cd "${S}"
+
+	# Change default man directory
+	sed -ie 's:MANDIR="$PREFIX/man":MANDIR="$PREFIX/share/man":' configure
+
+	# don't prestrip binaries
+	find -name Makefile -exec sed -ie 's,install -s,install,' \{\} \;
+
+	# Solve QA warning by including string.h
+	epatch ${FILESDIR}/memset.patch
+	epatch ${FILESDIR}/${P}-tftp-connect-segfault.patch
+	epatch ${FILESDIR}/${P}-tftp-manpage-typo.patch
+	epatch ${FILESDIR}/${P}-tftp-fix-put-zero-size.diff
+}
+
+src_compile() {
+	./configure --prefix=/usr --installroot="${D}" || die
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/sbin
+	doman tftp/tftp.1 tftpd/tftpd.8
+	make install || die
+
+	dodoc "${FILESDIR}"/{tftp-dgram,tftp-stream} BUGS ChangeLog README
+	einfo "Take a look at /usr/share/doc/${PF}/tftp-* files"
+	einfo "for sample xinetd configuration files."
+}