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.

(Portage version: 2.1.3_rc8)

6 files changed, 94 insertions, 0 deletions

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
+}