8 files changed, 23 insertions, 28 deletions

diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile
index 6b6decd0979d..56b6871390db 100644
--- a/ftp/tnftpd/Makefile
+++ b/ftp/tnftpd/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	tnftpd
-PORTVERSION=	20031217
-PORTREVISION=	1
+PORTVERSION=	20040810
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
 
-FORBIDDEN=	http://vuxml.freebsd.org/c4b025bb-f05d-11d8-9837-000c41e2cdad.html
 MAINTAINER=	cejkar@fit.vutbr.cz
 COMMENT=	Enhanced ftp server from NetBSD
 
diff --git a/ftp/tnftpd/distinfo b/ftp/tnftpd/distinfo
index 2dfa20e7ad56..13963cb4b4e3 100644
--- a/ftp/tnftpd/distinfo
+++ b/ftp/tnftpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (tnftpd-20031217.tar.gz) = b33d184b49bf5335cc59c2827f4c71aa
-SIZE (tnftpd-20031217.tar.gz) = 177483
+MD5 (tnftpd-20040810.tar.gz) = a51e89237973db43ae3fd0bb448e9ae4
+SIZE (tnftpd-20040810.tar.gz) = 178638
diff --git a/ftp/tnftpd/files/patch-configure b/ftp/tnftpd/files/patch-configure
index 8c5c6235c353..ded8bee1eff8 100644
--- a/ftp/tnftpd/files/patch-configure
+++ b/ftp/tnftpd/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Mon May 17 14:46:54 2004
 +++ configure	Mon May 17 14:47:14 2004
-@@ -2423,6 +2423,7 @@
+@@ -2434,6 +2434,7 @@
    cat > conftest.$ac_ext <<EOF
  #line 2425 "configure"
  #include "confdefs.h"
diff --git a/ftp/tnftpd/files/patch-src-Makefile.in b/ftp/tnftpd/files/patch-src-Makefile.in
index 77ce90f09c7d..674b0c8cc61f 100644
--- a/ftp/tnftpd/files/patch-src-Makefile.in
+++ b/ftp/tnftpd/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -23,8 +23,7 @@
  INSTALL	= @INSTALL@
  
  PROG	= tnftpd
diff --git a/ftp/tnftpd/files/patch-src-ftpd.c b/ftp/tnftpd/files/patch-src-ftpd.c
index 781d7e6a26f0..3158bc53b8be 100644
--- a/ftp/tnftpd/files/patch-src-ftpd.c
+++ b/ftp/tnftpd/files/patch-src-ftpd.c
@@ -1,20 +1,17 @@
---- src/ftpd.c-orig	Tue Feb  3 18:16:46 2004
-+++ src/ftpd.c	Tue Feb  3 18:19:26 2004
-@@ -436,6 +436,7 @@
- 	if (EMPTYSTR(confdir))
- 		confdir = _DEFAULT_CONFDIR;
- 
-+#ifdef _SC_LOGIN_NAME_MAX
- 	errno = 0;
- 	l = sysconf(_SC_LOGIN_NAME_MAX);
- 	if (l == -1 && errno != 0) {
-@@ -446,6 +447,9 @@
- 		curname_len = _POSIX_LOGIN_NAME_MAX;
+--- src/ftpd.c-orig	Wed Aug 18 17:22:30 2004
++++ src/ftpd.c	Wed Aug 18 17:27:28 2004
+@@ -450,12 +450,12 @@
+ 		exit(1);
+ 	} else if (l <= 0) {
+ 		syslog(LOG_WARNING, "using conservative LOGIN_NAME_MAX value");
+-		curname_len = _POSIX_LOGIN_NAME_MAX;
++		curname_len = LOGIN_NAME_MAX;
  	} else 
  		curname_len = (size_t)l;
-+#else
+ #else
+ 	/* using conservative LOGIN_NAME_MAX value */
+-	curname_len = _POSIX_LOGIN_NAME_MAX;
 +	curname_len = LOGIN_NAME_MAX;
-+#endif
+ #endif
  	curname = malloc(curname_len);
  	if (curname == NULL) {
- 		syslog(LOG_ERR, "malloc: %m");
diff --git a/ftp/tnftpd/files/patch-src-logutmp.c b/ftp/tnftpd/files/patch-src-logutmp.c
index c3ac8f7ebd99..fc9dbcf87d57 100644
--- a/ftp/tnftpd/files/patch-src-logutmp.c
+++ b/ftp/tnftpd/files/patch-src-logutmp.c
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -59,13 +59,13 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
diff --git a/ftp/tnftpd/files/patch-src-logwtmp.c b/ftp/tnftpd/files/patch-src-logwtmp.c
index 7b667a2f314d..611693a77393 100644
--- a/ftp/tnftpd/files/patch-src-logwtmp.c
+++ b/ftp/tnftpd/files/patch-src-logwtmp.c
@@ -11,10 +11,10 @@
  
  #include <fcntl.h>
 +#include <netdb.h>
- #include <setjmp.h>
  #include <signal.h>
  #include <stdio.h>
-@@ -57,7 +59,6 @@
+ #include <string.h>
+@@ -56,7 +58,6 @@
  #ifdef SUPPORT_UTMPX
  #include <utmpx.h>
  #endif
@@ -22,7 +22,7 @@
  
  #ifdef KERBEROS5
  #include <krb5/krb5.h>
-@@ -80,6 +81,26 @@
+@@ -79,6 +80,26 @@
  {
  	struct utmp ut;
  	struct stat buf;
diff --git a/ftp/tnftpd/files/patch-tnftpd.h b/ftp/tnftpd/files/patch-tnftpd.h
index 3f251322c690..0cf397e5c549 100644
--- a/ftp/tnftpd/files/patch-tnftpd.h
+++ b/ftp/tnftpd/files/patch-tnftpd.h
@@ -1,12 +1,12 @@
 --- tnftpd.h-orig	Wed Dec 17 02:43:41 2003
 +++ tnftpd.h	Tue Feb  3 18:14:15 2004
-@@ -429,5 +429,9 @@
+@@ -426,5 +426,9 @@
  #define TM_YEAR_BASE	1900
  
  #if ! defined(LOGIN_NAME_MAX)
 +#if defined(MAXLOGNAME)
 +# define LOGIN_NAME_MAX MAXLOGNAME
-+#elif ! defined(LOGIN_NAME_MAX)
++#else
  # define LOGIN_NAME_MAX (9)
 +#endif
  #endif