- maintenance update to 2.0.4 (minor bugfixes).

- enable setproctitle() support in order to use setproctitle_enable=Yes.
- manpages fixes (help alek@).
- regen patches.

ok alek@

net/vsftpd/Makefile

@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2005/09/16 16:40:19 aanriot Exp $
+# $OpenBSD: Makefile,v 1.16 2006/01/28 21:57:51 aanriot Exp $
 
 COMMENT=		"Ftp daemon which aims to be secure"
 
-VERSION=		2.0.3
-DISTNAME=		vsftpd-${VERSION}
-PKGNAME=		${DISTNAME}p1
+DISTNAME=		vsftpd-2.0.4
 CATEGORIES=		net
 
 HOMEPAGE=		http://vsftpd.beasts.org/
@@ -22,7 +20,7 @@ MASTER_SITES=		ftp://vsftpd.beasts.org/users/cevans/
 
 ALL_TARGET=		vsftpd
 
-MAKE_FLAGS=		CC="${CC}" CFLAGS="${CFLAGS} -Wall -W -Wshadow"
+MAKE_FLAGS=		CC="${CC}" CFLAGS="${CFLAGS}"
 
 NO_REGRESS=		Yes
 
@@ -31,6 +29,9 @@ do-configure:
 	@perl -pi -e "s,/usr/share/ssl/certs/,/etc/ssl/private/,g" \
 		${WRKSRC}/tunables.c \
 		${WRKSRC}/README.ssl
+	@perl -pi -e "s,/etc/vsftpd,${SYSCONFDIR}/vsftpd,g" \
+		${WRKSRC}/vsftpd.conf.5 \
+		${WRKSRC}/vsftpd.8
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vsftpd

net/vsftpd/distinfo

@@ -1,4 +1,4 @@
-MD5 (vsftpd-2.0.3.tar.gz) = 74936cbd8e8251deb1cd99c5fb18b6f8
-RMD160 (vsftpd-2.0.3.tar.gz) = 78b6d73a04e17a2ef11ee0bbb925fe60af41f036
-SHA1 (vsftpd-2.0.3.tar.gz) = ac29192b3be7148f84b7bd5b240cc1c10ba3720e
-SIZE (vsftpd-2.0.3.tar.gz) = 153266
+MD5 (vsftpd-2.0.4.tar.gz) = c0bf8c7b8e15ab15827172786fc56115
+RMD160 (vsftpd-2.0.4.tar.gz) = e8f07c125c0c3a8f0d457b47fd0062d6431c480b
+SHA1 (vsftpd-2.0.4.tar.gz) = 6ffbcc08a91300664d527b3ac7c515421d5cd764
+SIZE (vsftpd-2.0.4.tar.gz) = 154857

net/vsftpd/patches/patch-sysdeputil_c

@@ -1,19 +1,21 @@
-$OpenBSD: patch-sysdeputil_c,v 1.1 2005/03/13 20:40:38 couderc Exp $
---- sysdeputil.c.orig	Tue Sep 14 03:18:54 2004
-+++ sysdeputil.c	Sun Mar 13 09:01:50 2005
-@@ -74,6 +74,11 @@
+$OpenBSD: patch-sysdeputil_c,v 1.2 2006/01/28 21:57:51 aanriot Exp $
+--- sysdeputil.c.orig	Tue May 24 00:34:23 2005
++++ sysdeputil.c	Thu Jan 26 06:39:07 2006
+@@ -74,6 +74,13 @@
    #endif
  #endif
  
 +#if defined(__OpenBSD__)
 +  #undef VSF_BUILD_PAM
 +  #undef VSF_SYSDEP_HAVE_SHADOW
++  #include <stdlib.h>
++  #define VSF_SYSDEP_HAVE_SETPROCTITLE
 +#endif
 +
  #if (defined(__FreeBSD__) && __FreeBSD__ >= 3)
    #define VSF_SYSDEP_HAVE_FREEBSD_SENDFILE
    #define VSF_SYSDEP_HAVE_SETPROCTITLE
-@@ -622,13 +627,13 @@ static int do_sendfile(const int out_fd,
+@@ -623,13 +630,13 @@ static int do_sendfile(const int out_fd,
    static char* p_recvbuf;
    unsigned int total_written = 0;
    int retval;