Bug 62069

 
 Here is an update to the ftp/tnftpd, to the version tnftpd-20031217.
 Note that files files/patch-src-ftpd.c and files/patch-tnftpd.h has
 been removed.
 
 diff -urN tnftpd-orig/Makefile tnftpd/Makefile
 --- tnftpd-orig/Makefile	Thu Jan 29 16:03:45 2004
 +++ tnftpd/Makefile	Thu Jan 29 15:35:40 2004
 @@ -6,11 +6,9 @@
  #
  
  PORTNAME=	tnftpd
 -PORTVERSION=	2.0b3
 -PORTREVISION=	1
 +PORTVERSION=	20031217
  CATEGORIES=	ftp ipv6
  MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
 -DISTNAME=	${PORTNAME}-2.0-beta3
  
  MAINTAINER=	cejkar@fit.vutbr.cz
  COMMENT=	Enhanced ftp server from NetBSD
 @@ -18,6 +16,8 @@
  USE_REINPLACE=	yes
  GNU_CONFIGURE=	yes
  PKGMESSAGE=	${WRKDIR}/pkg-message
 +
 +CFLAGS+=	-DSUPPORT_UTMP
  
  .if defined(WITH_SOCKS5)
  BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 diff -urN tnftpd-orig/distinfo tnftpd/distinfo
 --- tnftpd-orig/distinfo	Thu Jan 29 16:03:46 2004
 +++ tnftpd/distinfo	Thu Jan 29 15:16:40 2004
 @@ -1 +1 @@
 -MD5 (tnftpd-2.0-beta3.tar.gz) = 2c70bdc6549f88f992191ebe772629a7
 +MD5 (tnftpd-20031217.tar.gz) = b33d184b49bf5335cc59c2827f4c71aa
 diff -urN tnftpd-orig/files/patch-src-ftpd.c tnftpd/files/patch-src-ftpd.c
 --- tnftpd-orig/files/patch-src-ftpd.c	Thu Jan 29 16:03:45 2004
 +++ tnftpd/files/patch-src-ftpd.c	Thu Jan  1 01:00:00 1970
 @@ -1,11 +0,0 @@
 ---- 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 -urN tnftpd-orig/files/patch-src-logutmp.c tnftpd/files/patch-src-logutmp.c
 --- tnftpd-orig/files/patch-src-logutmp.c	Thu Jan 29 16:03:45 2004
 +++ tnftpd/files/patch-src-logutmp.c	Thu Jan 29 15:44:49 2004
 @@ -1,6 +1,6 @@
 ---- 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 @@
 +--- src/logutmp.c-orig	Thu Jan 29 15:43:57 2004
 ++++ src/logutmp.c	Thu Jan 29 15:44:33 2004
 +@@ -60,13 +60,13 @@
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
 @@ -8,6 +8,9 @@
   #include <ttyent.h>
   #include <unistd.h>
   #include <utmp.h>
 + #ifdef SUPPORT_UTMPX
 + #include <utmpx.h>
 + #endif
  -#include <util.h>
   
   #include "extern.h"
 diff -urN tnftpd-orig/files/patch-src-logwtmp.c tnftpd/files/patch-src-logwtmp.c
 --- tnftpd-orig/files/patch-src-logwtmp.c	Thu Jan 29 16:03:45 2004
 +++ tnftpd/files/patch-src-logwtmp.c	Thu Jan 29 15:48:06 2004
 @@ -1,12 +1,13 @@
 ---- 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 @@
 +--- src/logwtmp.c-orig	Thu Jan 29 15:45:32 2004
 ++++ src/logwtmp.c	Thu Jan 29 15:47:34 2004
 +@@ -42,11 +42,13 @@
   
   #include <sys/types.h>
   #include <sys/param.h>
  +#include <sys/socket.h>
   #include <sys/time.h>
   #include <sys/stat.h>
 + #include <sys/wait.h>
   
   #include <fcntl.h>
  +#include <netdb.h>
 @@ -14,14 +15,14 @@
   #include <signal.h>
   #include <stdio.h>
  @@ -57,7 +59,6 @@
 - #include <time.h>
 - #include <unistd.h>
 - #include <utmp.h>
 + #ifdef SUPPORT_UTMPX
 + #include <utmpx.h>
 + #endif
  -#include <util.h>
   
   #ifdef KERBEROS5
   #include <krb5/krb5.h>
 -@@ -77,6 +78,26 @@
 +@@ -80,6 +81,26 @@
   {
   	struct utmp ut;
   	struct stat buf;