3 files changed, 4 insertions, 68 deletions

diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index ae3fe08ffb18..5dd07d73e7e5 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vsftpd
-PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTVERSION=	2.0.5
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://vsftpd.beasts.org/users/cevans/
 PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
diff --git a/ftp/vsftpd/distinfo b/ftp/vsftpd/distinfo
index 498c791a8aaf..fc6b1539a0db 100644
--- a/ftp/vsftpd/distinfo
+++ b/ftp/vsftpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (vsftpd-2.0.4.tar.gz) = c0bf8c7b8e15ab15827172786fc56115
-SHA256 (vsftpd-2.0.4.tar.gz) = 3bd3d8750460cf724b4589589eb37ab0d398f0c4d3d7492468c66d3617052af6
-SIZE (vsftpd-2.0.4.tar.gz) = 154857
+MD5 (vsftpd-2.0.5.tar.gz) = 146062e8b2f93af43ff6c2c770feea94
+SHA256 (vsftpd-2.0.5.tar.gz) = 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b
+SIZE (vsftpd-2.0.5.tar.gz) = 155985
diff --git a/ftp/vsftpd/files/patch-sysdeputil.c b/ftp/vsftpd/files/patch-sysdeputil.c
deleted file mode 100644
index 14fd4107e6d4..000000000000
--- a/ftp/vsftpd/files/patch-sysdeputil.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- sysdeputil.c.orig	Mon May 23 16:34:23 2005
-+++ sysdeputil.c	Mon Jan 30 20:17:40 2006
-@@ -6,6 +6,10 @@
-  *
-  * Highly system dependent utilities - e.g. authentication, capabilities.
-  */
-+/* Modifications by Joe R. Doupnik, jrd@cc.usu.edu, marked as JRD, for
-+PAM support on recent FreeBSD systems. Does wtmp entries for last_log. 
-+Most recently tested on FBSD v6.0
-+*/
- 
- #include "sysdeputil.h"
- #include "str.h"
-@@ -34,6 +38,9 @@
- /* For FreeBSD */
- #include <sys/param.h>
- #include <sys/uio.h>
-+#include <stdio.h>  /* JRD */
-+#include <syslog.h> /* JRD */
-+#include <utmp.h>   /* JRD */
- 
- /* Configuration.. here are the possibilities */
- #undef VSF_SYSDEP_HAVE_CAPABILITIES
-@@ -302,15 +309,21 @@
-     s_pamh = 0;
-     return 0;
-   }
--#ifdef PAM_RHOST
--  retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host));
-+
-+/*was JRD  #ifdef PAM_RHOST */
-+  {
-+  char buf[UT_HOSTSIZE];	/* restrict to normal system buf size */
-+  snprintf(buf, sizeof(buf), "%s", str_getbuf(p_remote_host));
-+  retval = pam_set_item(s_pamh, PAM_RHOST, buf);
-+   }
-+/*was JRD  retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host)); */
-   if (retval != PAM_SUCCESS)
-   {
-     (void) pam_end(s_pamh, 0);
-     s_pamh = 0;
-     return 0;
-   }
--#endif
-+/*was JRD  #endif */
-   retval = pam_authenticate(s_pamh, 0);
-   if (retval != PAM_SUCCESS)
-   {
-@@ -341,6 +354,14 @@
-   }
-   /* Must do this BEFORE opening a session for pam_limits to count us */
-   vsf_insert_uwtmp(p_user_str, p_remote_host);
-+/* JRD Tell PAM our "PAM_TTY" */
-+        {
-+        char ttyline[UT_LINESIZE];
-+        (void)snprintf(ttyline, sizeof(ttyline), "ftp%d", getpid());
-+        pam_set_item(s_pamh, PAM_TTY, ttyline);
-+        }
-+/* JRD end */
-+
-   retval = pam_open_session(s_pamh, 0);
-   if (retval != PAM_SUCCESS)
-   {