maintenance update to 2.0.5 .

inputs & ok bernd@

net/vsftpd/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.17 2006/05/31 00:10:12 aanriot Exp $
+# $OpenBSD: Makefile,v 1.18 2006/07/27 11:48:41 aanriot Exp $
 
 COMMENT=		"Ftp daemon which aims to be secure"
 
-DISTNAME=		vsftpd-2.0.4
+DISTNAME=		vsftpd-2.0.5
-PKGNAME=		${DISTNAME}p0
 CATEGORIES=		net
 
 HOMEPAGE=		http://vsftpd.beasts.org/

net/vsftpd/distinfo

@@ -1,4 +1,4 @@
-MD5 (vsftpd-2.0.4.tar.gz) = c0bf8c7b8e15ab15827172786fc56115
+MD5 (vsftpd-2.0.5.tar.gz) = 146062e8b2f93af43ff6c2c770feea94
-RMD160 (vsftpd-2.0.4.tar.gz) = e8f07c125c0c3a8f0d457b47fd0062d6431c480b
+RMD160 (vsftpd-2.0.5.tar.gz) = 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4
-SHA1 (vsftpd-2.0.4.tar.gz) = 6ffbcc08a91300664d527b3ac7c515421d5cd764
+SHA1 (vsftpd-2.0.5.tar.gz) = 9b6a079699aaeb01219665acf203c093f94faef0
-SIZE (vsftpd-2.0.4.tar.gz) = 154857
+SIZE (vsftpd-2.0.5.tar.gz) = 155985

net/vsftpd/patches/patch-sysdeputil_c

@@ -1,9 +1,9 @@
-$OpenBSD: patch-sysdeputil_c,v 1.2 2006/01/28 21:57:51 aanriot Exp $
+$OpenBSD: patch-sysdeputil_c,v 1.3 2006/07/27 11:48:41 aanriot Exp $
---- sysdeputil.c.orig	Tue May 24 00:34:23 2005
+--- sysdeputil.c.orig	Mon Jul  3 00:14:10 2006
-+++ sysdeputil.c	Thu Jan 26 06:39:07 2006
++++ sysdeputil.c	Wed Jul 26 10:00:48 2006
-@@ -74,6 +74,13 @@
+@@ -19,6 +19,13 @@
-   #endif
+ /* For Linux, this adds nothing :-) */
- #endif
+ #include "port/porting_junk.h"
  
 +#if defined(__OpenBSD__)
 +  #undef VSF_BUILD_PAM
@@ -13,20 +13,5 @@ $OpenBSD: patch-sysdeputil_c,v 1.2 2006/01/28 21:57:51 aanriot Exp $
 +#endif
 +
  #if (defined(__FreeBSD__) && __FreeBSD__ >= 3)
-   #define VSF_SYSDEP_HAVE_FREEBSD_SENDFILE
+   #define _FILE_OFFSET_BITS 64
-   #define VSF_SYSDEP_HAVE_SETPROCTITLE
+   #define _LARGEFILE_SOURCE 1
-@@ -623,13 +630,13 @@ static int do_sendfile(const int out_fd,
-   static char* p_recvbuf;
-   unsigned int total_written = 0;
-   int retval;
--  enum EVSFSysUtilError error;
-   (void) start_pos;
- #if defined(VSF_SYSDEP_HAVE_LINUX_SENDFILE) || \
-     defined(VSF_SYSDEP_HAVE_FREEBSD_SENDFILE) || \
-     defined(VSF_SYSDEP_HAVE_HPUX_SENDFILE) || \
-     defined(VSF_SYSDEP_HAVE_AIX_SENDFILE) || \
-     defined(VSF_SYSDEP_HAVE_SOLARIS_SENDFILE)
-+  enum EVSFSysUtilError error;
-   if (tunable_use_sendfile)
-   {
-     static int s_sendfile_checked;

net/vsftpd/patches/patch-vsftpd_conf

@@ -1,7 +1,7 @@
-$OpenBSD: patch-vsftpd_conf,v 1.5 2005/07/03 18:06:37 aanriot Exp $
+$OpenBSD: patch-vsftpd_conf,v 1.6 2006/07/27 11:48:41 aanriot Exp $
---- vsftpd.conf.orig	Tue Jan 21 02:15:34 2003
+--- vsftpd.conf.orig	Sat May 21 00:52:54 2005
-+++ vsftpd.conf	Sun Jul  3 11:36:17 2005
++++ vsftpd.conf	Thu Jul 27 12:34:09 2006
-@@ -8,14 +8,23 @@
+@@ -8,11 +8,20 @@
  # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
  # capabilities.
  #
@@ -23,28 +23,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.5 2005/07/03 18:06:37 aanriot Exp $
 +local_enable=YES
  #
  # Uncomment this to enable any form of FTP write command.
--#write_enable=YES
+ #write_enable=YES
-+write_enable=YES
- #
- # Default umask for local users is 077. You may wish to change this to 022,
- # if your users expect that (022 is used by most other ftpd's)
-@@ -32,13 +41,13 @@ anonymous_enable=YES
- #
- # Activate directory messages - messages given to remote users when they
- # go into a certain directory.
--dirmessage_enable=YES
-+#dirmessage_enable=YES
- #
- # Activate logging of uploads/downloads.
--xferlog_enable=YES
-+#xferlog_enable=YES
- #
- # Make sure PORT transfer connections originate from port 20 (ftp-data).
--connect_from_port_20=YES
-+#connect_from_port_20=YES
- #
- # If you want, you can arrange for uploaded anonymous files to be owned by
- # a different user. Note! Using "root" for uploaded files is not
 @@ -61,7 +70,7 @@ connect_from_port_20=YES
  #
  # It is recommended that you define on your system a unique user which the
@@ -54,16 +33,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.5 2005/07/03 18:06:37 aanriot Exp $
  #
  # Enable this and the server will recognise asynchronous ABOR requests. Not
  # recommended for security (the code is non-trivial). Not enabling it,
-@@ -79,7 +88,7 @@ connect_from_port_20=YES
+@@ -91,9 +100,9 @@ connect_from_port_20=YES
- # without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
- # on the client anyway..
- #ascii_upload_enable=YES
--#ascii_download_enable=YES
-+ascii_download_enable=YES
- #
- # You may fully customise the login banner string:
- #ftpd_banner=Welcome to blah FTP service.
-@@ -93,13 +102,41 @@ connect_from_port_20=YES
  # You may specify an explicit list of local users to chroot() to their home
  # directory. If chroot_local_user is YES, then this list becomes a list of
  # users to NOT chroot().
@@ -75,10 +45,10 @@ $OpenBSD: patch-vsftpd_conf,v 1.5 2005/07/03 18:06:37 aanriot Exp $
  #
  # You may activate the "-R" option to the builtin ls. This is disabled by
  # default to avoid remote users being able to cause excessive I/O on large
- # sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
+@@ -101,3 +110,32 @@ connect_from_port_20=YES
  # the presence of the "-R" option, so there is a strong case for enabling it.
  #ls_recurse_enable=YES
--
+ 
 +#
 +# If enabled, vsftpd will load a list of usernames from the filename
 +# given by userlist_file. If a user tries to log in using a name in this