5 files changed, 65 insertions, 6 deletions

diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile
index d89e2e16e108..e21fd7d5a56c 100644
--- a/ftp/tnftpd/Makefile
+++ b/ftp/tnftpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tnftpd
 PORTVERSION=	2.0b3
+PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
 DISTNAME=	${PORTNAME}-2.0-beta3
diff --git a/ftp/tnftpd/files/patch-src-Makefile.in b/ftp/tnftpd/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..77ce90f09c7d
--- /dev/null
+++ b/ftp/tnftpd/files/patch-src-Makefile.in
@@ -0,0 +1,12 @@
+--- src/Makefile.in-orig	Mon Feb 17 22:57:18 2003
++++ src/Makefile.in	Mon Feb 17 22:57:48 2003
+@@ -22,8 +22,7 @@
+ INSTALL	= @INSTALL@
+ 
+ PROG	= tnftpd
+-OBJS	= cmds.o conf.o ftpd.o ftpcmd.o popen.o @LSOBJS@
+-# removed: logutmp.o logwtmp.o
++OBJS	= cmds.o conf.o ftpd.o ftpcmd.o popen.o logutmp.o logwtmp.o @LSOBJS@
+ 
+ all:	${PROG}
+ 
diff --git a/ftp/tnftpd/files/patch-src-ftpd.c b/ftp/tnftpd/files/patch-src-ftpd.c
new file mode 100644
index 000000000000..a7afb8c90424
--- /dev/null
+++ b/ftp/tnftpd/files/patch-src-ftpd.c
@@ -0,0 +1,11 @@
+--- src/ftpd.c-orig	Mon Feb 17 23:52:49 2003
++++ src/ftpd.c	Mon Feb 17 23:56:52 2003
+@@ -98,6 +98,8 @@
+  * SUCH DAMAGE.
+  */
+ 
++#define SUPPORT_UTMP
++
+ #if	HAVE_TNFTPD_H
+ 
+ #define	FTP_NAMES
diff --git a/ftp/tnftpd/files/patch-src-logutmp.c b/ftp/tnftpd/files/patch-src-logutmp.c
new file mode 100644
index 000000000000..5579c69ed529
--- /dev/null
+++ b/ftp/tnftpd/files/patch-src-logutmp.c
@@ -0,0 +1,14 @@
+--- src/logutmp.c-orig	Mon Feb 24 07:38:44 2003
++++ src/logutmp.c	Thu Jan 22 11:59:38 2004
+@@ -40,10 +40,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include <ttyent.h>
+ #include <unistd.h>
+ #include <utmp.h>
+-#include <util.h>
+ 
+ #include "extern.h"
+ 
diff --git a/ftp/tnftpd/files/patch-src-logwtmp.c b/ftp/tnftpd/files/patch-src-logwtmp.c
index 928f910f9ad6..d77f75dff7d7 100644
--- a/ftp/tnftpd/files/patch-src-logwtmp.c
+++ b/ftp/tnftpd/files/patch-src-logwtmp.c
@@ -1,9 +1,31 @@
---- src/logwtmp.c-orig	Sun Feb 23 22:38:44 2003
-+++ src/logwtmp.c	Sun Aug  3 15:53:32 2003
-@@ -78,6 +78,26 @@
+--- src/logwtmp.c-orig	Mon Feb 24 07:38:44 2003
++++ src/logwtmp.c	Thu Jan 22 12:05:36 2004
+@@ -46,10 +46,12 @@
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
++#include <sys/socket.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ 
+ #include <fcntl.h>
++#include <netdb.h>
+ #include <setjmp.h>
+ #include <signal.h>
+ #include <stdio.h>
+@@ -57,7 +59,6 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <utmp.h>
+-#include <util.h>
+ 
+ #ifdef KERBEROS5
+ #include <krb5/krb5.h>
+@@ -77,6 +78,26 @@
+ {
  	struct utmp ut;
  	struct stat buf;
- 
++
 +	if (strlen(host) > UT_HOSTSIZE) {
 +		struct addrinfo hints, *res;
 +		int error;
@@ -23,7 +45,6 @@
 +				host[UT_HOSTSIZE] = '\0';
 +		}
 +	}
-+
+ 
  	if (fd < 0 && (fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) < 0)
  		return;
- 	if (fstat(fd, &buf) == 0) {