6 files changed, 42 insertions, 29 deletions

diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile
index 7f034b623841..3ac3f9b4be04 100644
--- a/ftp/tnftpd/Makefile
+++ b/ftp/tnftpd/Makefile
@@ -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
@@ -19,6 +17,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
 CONFIGURE_ARGS+=	--with-socks5
diff --git a/ftp/tnftpd/distinfo b/ftp/tnftpd/distinfo
index 479d050fb06f..d7f4fa8f2dfb 100644
--- a/ftp/tnftpd/distinfo
+++ b/ftp/tnftpd/distinfo
@@ -1 +1 @@
-MD5 (tnftpd-2.0-beta3.tar.gz) = 2c70bdc6549f88f992191ebe772629a7
+MD5 (tnftpd-20031217.tar.gz) = b33d184b49bf5335cc59c2827f4c71aa
diff --git a/ftp/tnftpd/files/patch-src-ftpd.c b/ftp/tnftpd/files/patch-src-ftpd.c
index a7afb8c90424..781d7e6a26f0 100644
--- a/ftp/tnftpd/files/patch-src-ftpd.c
+++ b/ftp/tnftpd/files/patch-src-ftpd.c
@@ -1,11 +1,20 @@
---- 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.
-  */
+--- 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;
  
-+#define SUPPORT_UTMP
-+
- #if	HAVE_TNFTPD_H
- 
- #define	FTP_NAMES
++#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;
+ 	} else 
+ 		curname_len = (size_t)l;
++#else
++	curname_len = LOGIN_NAME_MAX;
++#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 5579c69ed529..c3ac8f7ebd99 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	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 --git a/ftp/tnftpd/files/patch-src-logwtmp.c b/ftp/tnftpd/files/patch-src-logwtmp.c
index d77f75dff7d7..ce3789457f1a 100644
--- a/ftp/tnftpd/files/patch-src-logwtmp.c
+++ b/ftp/tnftpd/files/patch-src-logwtmp.c
@@ -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;
diff --git a/ftp/tnftpd/files/patch-tnftpd.h b/ftp/tnftpd/files/patch-tnftpd.h
index 018a2a02e118..3f251322c690 100644
--- a/ftp/tnftpd/files/patch-tnftpd.h
+++ b/ftp/tnftpd/files/patch-tnftpd.h
@@ -1,12 +1,12 @@
---- tnftpd.h-orig	Wed Feb 26 19:16:13 2003
-+++ tnftpd.h	Sun Aug  3 15:49:57 2003
-@@ -404,6 +404,8 @@
- #define SECSPERDAY	86400
+--- tnftpd.h-orig	Wed Dec 17 02:43:41 2003
++++ tnftpd.h	Tue Feb  3 18:14:15 2004
+@@ -429,5 +429,9 @@
  #define TM_YEAR_BASE	1900
  
--#if ! defined(LOGIN_NAME_MAX)
+ #if ! defined(LOGIN_NAME_MAX)
 +#if defined(MAXLOGNAME)
 +# define LOGIN_NAME_MAX MAXLOGNAME
 +#elif ! defined(LOGIN_NAME_MAX)
  # define LOGIN_NAME_MAX (9)
++#endif
  #endif