update to 2.0.2 from maintainer.
This release fix an issue with SSL secured data connections.
This commit is contained in:
couderc
parent
5c59b7a355
commit
8c19b2ec3d
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2005/02/27 16:37:22 couderc Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2005/03/13 20:40:38 couderc Exp $
|
||||
|
||||
COMMENT= "Ftp daemon which aims to be secure"
|
||||
|
||||
VERSION= 1.2.2
|
||||
VERSION= 2.0.2
|
||||
DISTNAME= vsftpd-${VERSION}
|
||||
CATEGORIES= net
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (vsftpd-1.2.2.tar.gz) = 5a38e1c69062e7688fbbdae6d1196de2
|
||||
RMD160 (vsftpd-1.2.2.tar.gz) = 7c2a033ccc7f651200abff6f57cb34f8e8ee1ec9
|
||||
SHA1 (vsftpd-1.2.2.tar.gz) = 02ba37eb26021bb5650d78541072b210f8d3937e
|
||||
SIZE (vsftpd-1.2.2.tar.gz) = 136669
|
||||
MD5 (vsftpd-2.0.2.tar.gz) = 470ebbdfd5f67677eb4d2fcec80d0ed4
|
||||
RMD160 (vsftpd-2.0.2.tar.gz) = 6765eb5ad0f0b2c444f32974717383dd444b36ab
|
||||
SHA1 (vsftpd-2.0.2.tar.gz) = 609ba78dfd0b0829e574375946130d7c8ca0c4a7
|
||||
SIZE (vsftpd-2.0.2.tar.gz) = 151178
|
||||
|
||||
30
net/vsftpd/patches/patch-sysdeputil_c
Normal file
30
net/vsftpd/patches/patch-sysdeputil_c
Normal file
@ -0,0 +1,30 @@
|
||||
$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 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if defined(__OpenBSD__)
|
||||
+ #undef VSF_BUILD_PAM
|
||||
+ #undef VSF_SYSDEP_HAVE_SHADOW
|
||||
+#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,
|
||||
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;
|
||||
@ -1,9 +1,12 @@
|
||||
$OpenBSD: patch-vsftpd_conf,v 1.3 2003/08/02 12:00:13 couderc Exp $
|
||||
--- vsftpd.conf.orig Tue Jan 21 02:15:34 2003
|
||||
+++ vsftpd.conf Wed Jul 9 16:56:03 2003
|
||||
@@ -9,13 +9,13 @@
|
||||
--- w-vsftpd-2.0.2/vsftpd-2.0.2/vsftpd.conf Tue Jan 21 02:15:34 2003
|
||||
+++ vsftpd.conf Sun Mar 13 13:03:35 2005
|
||||
@@ -8,14 +8,17 @@
|
||||
# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
|
||||
# capabilities.
|
||||
#
|
||||
+# Standalone mode
|
||||
+listen=YES
|
||||
+#
|
||||
# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
|
||||
-anonymous_enable=YES
|
||||
+anonymous_enable=NO
|
||||
@ -18,7 +21,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.3 2003/08/02 12:00:13 couderc Exp $
|
||||
#
|
||||
# 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 +32,13 @@ anonymous_enable=YES
|
||||
@@ -32,13 +35,13 @@
|
||||
#
|
||||
# Activate directory messages - messages given to remote users when they
|
||||
# go into a certain directory.
|
||||
@ -35,7 +38,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.3 2003/08/02 12:00:13 couderc Exp $
|
||||
#
|
||||
# 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 +61,7 @@ connect_from_port_20=YES
|
||||
@@ -61,7 +64,7 @@
|
||||
#
|
||||
# It is recommended that you define on your system a unique user which the
|
||||
# ftp server can use as a totally isolated and unprivileged user.
|
||||
@ -44,7 +47,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.3 2003/08/02 12:00:13 couderc 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 +79,7 @@ connect_from_port_20=YES
|
||||
@@ -79,7 +82,7 @@
|
||||
# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
|
||||
# on the client anyway..
|
||||
#ascii_upload_enable=YES
|
||||
@ -53,7 +56,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.3 2003/08/02 12:00:13 couderc Exp $
|
||||
#
|
||||
# You may fully customise the login banner string:
|
||||
#ftpd_banner=Welcome to blah FTP service.
|
||||
@@ -93,13 +93,41 @@ connect_from_port_20=YES
|
||||
@@ -93,13 +96,41 @@
|
||||
# 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().
|
||||
|
||||
@ -1,9 +1,14 @@
|
||||
You must also add one of the two folowing lines to your inetd.conf
|
||||
You can run vsftpd in standalone mode :
|
||||
|
||||
ftp stream tcp nowait root ${PREFIX}/sbin/vsftpd vsftpd"
|
||||
$ sudo vsftpd &
|
||||
|
||||
or through inetd, you have to change listen=YES to listen=NO in
|
||||
vsftpd.conf and add one of the two folowing lines to your inetd.conf :
|
||||
|
||||
"ftp stream tcp nowait root ${PREFIX}/sbin/vsftpd vsftpd"
|
||||
|
||||
or
|
||||
|
||||
ftp stream tcp nowait root /usr/libexec/tcpd ${PREFIX}/sbin/vsftpd"
|
||||
"ftp stream tcp nowait root /usr/libexec/tcpd ${PREFIX}/sbin/vsftpd"
|
||||
|
||||
The second line is to use vsftpd with tcp-wrappers, see tcpd(8).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user