update to 1.2.0 based on a submit from Wouter Clarie <rimshot@pandora.be>
This commit is contained in:
parent
8fd069a583
commit
3ef6141f41
@ -1,10 +1,9 @@
|
|||||||
# $OpenBSD: Makefile,v 1.3 2003/06/23 19:08:52 sturm Exp $
|
# $OpenBSD: Makefile,v 1.4 2003/08/02 12:00:13 couderc Exp $
|
||||||
|
|
||||||
COMMENT= "Ftp daemon which aims to be secure"
|
COMMENT= "Ftp daemon which aims to be secure"
|
||||||
|
|
||||||
VERSION= 1.1.3
|
VERSION= 1.2.0
|
||||||
DISTNAME= vsftpd-${VERSION}
|
DISTNAME= vsftpd-${VERSION}
|
||||||
PKGNAME= ${DISTNAME}p0
|
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
|
|
||||||
HOMEPAGE= http://vsftpd.beasts.org/
|
HOMEPAGE= http://vsftpd.beasts.org/
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
MD5 (vsftpd-1.1.3.tar.gz) = 3f5f59be09a6f89e516a75ad0d1e3802
|
MD5 (vsftpd-1.2.0.tar.gz) = 19c1818c102b63e4b0fea8d5b8b7c51f
|
||||||
RMD160 (vsftpd-1.1.3.tar.gz) = 73efdb14707a0c8af7880ef3ebf946bc464d111a
|
RMD160 (vsftpd-1.2.0.tar.gz) = 7e9a6690001f2e353525ae0e73d702bbef1604a9
|
||||||
SHA1 (vsftpd-1.1.3.tar.gz) = 495ae55456d4c1ddc44066a6d09a51d26084cf1b
|
SHA1 (vsftpd-1.2.0.tar.gz) = e5646be4d41e2b4e557767b9d194fcd9ee018fb6
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
$OpenBSD: patch-Makefile,v 1.1.1.1 2003/02/19 15:42:02 couderc Exp $
|
$OpenBSD: patch-Makefile,v 1.2 2003/08/02 12:00:13 couderc Exp $
|
||||||
--- Makefile.orig Tue Oct 22 01:15:16 2002
|
--- Makefile.orig Wed Apr 9 01:28:49 2003
|
||||||
+++ Makefile Wed Feb 12 23:18:00 2003
|
+++ Makefile Sun Jun 8 12:34:26 2003
|
||||||
@@ -1,9 +1,9 @@
|
@@ -1,9 +1,9 @@
|
||||||
# Makefile for systems with GNU tools
|
# Makefile for systems with GNU tools
|
||||||
-CC = gcc
|
-CC = gcc
|
||||||
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2003/02/19 15:42:02 couderc Exp $
|
|||||||
IFLAGS = -idirafter dummyinc
|
IFLAGS = -idirafter dummyinc
|
||||||
#CFLAGS = -g
|
#CFLAGS = -g
|
||||||
-CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
|
-CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
|
||||||
+CFLAGS += -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
|
+CFLAGS += -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
|
||||||
|
|
||||||
LIBS = `./vsf_findlibs.sh`
|
LIBS = `./vsf_findlibs.sh`
|
||||||
LINK = -Wl,-s
|
LINK = -Wl,-s
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-sysutil_c,v 1.1.1.1 2003/02/19 15:42:02 couderc Exp $
|
$OpenBSD: patch-sysutil_c,v 1.2 2003/08/02 12:00:13 couderc Exp $
|
||||||
--- sysutil.c.orig Fri Oct 25 19:32:52 2002
|
--- sysutil.c.orig Sat Apr 19 20:50:44 2003
|
||||||
+++ sysutil.c Sun Feb 2 19:43:03 2003
|
+++ sysutil.c Wed Jul 9 16:54:17 2003
|
||||||
@@ -1312,7 +1312,7 @@ vsf_sysutil_statbuf_get_sortkey_mtime(
|
@@ -1401,7 +1401,7 @@ vsf_sysutil_statbuf_get_sortkey_mtime(
|
||||||
* more recent dates appear later in the alphabet! Most notably, we must
|
* more recent dates appear later in the alphabet! Most notably, we must
|
||||||
* make sure we pad to the same length with 0's
|
* make sure we pad to the same length with 0's
|
||||||
*/
|
*/
|
||||||
@ -10,3 +10,11 @@ $OpenBSD: patch-sysutil_c,v 1.1.1.1 2003/02/19 15:42:02 couderc Exp $
|
|||||||
return intbuf;
|
return intbuf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -2066,6 +2066,7 @@ vsf_sysutil_inet_ntop(const struct vsf_s
|
||||||
|
else
|
||||||
|
{
|
||||||
|
die("can only support ipv4 and ipv6 currently");
|
||||||
|
+ return(NULL); /* does nothing but makes compiler happy */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
$OpenBSD: patch-vsftpd_conf,v 1.2 2003/06/23 19:08:52 sturm Exp $
|
$OpenBSD: patch-vsftpd_conf,v 1.3 2003/08/02 12:00:13 couderc Exp $
|
||||||
--- vsftpd.conf.orig Mon Jul 30 23:51:07 2001
|
--- vsftpd.conf.orig Tue Jan 21 02:15:34 2003
|
||||||
+++ vsftpd.conf Sun May 11 21:56:55 2003
|
+++ vsftpd.conf Wed Jul 9 16:56:03 2003
|
||||||
@@ -4,13 +4,13 @@
|
@@ -9,13 +9,13 @@
|
||||||
# loosens things up a bit, to make the ftp daemon more usable.
|
# capabilities.
|
||||||
#
|
#
|
||||||
# Allow anonymous FTP?
|
# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
|
||||||
-anonymous_enable=YES
|
-anonymous_enable=YES
|
||||||
+anonymous_enable=NO
|
+anonymous_enable=NO
|
||||||
#
|
#
|
||||||
@ -18,7 +18,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.2 2003/06/23 19:08:52 sturm Exp $
|
|||||||
#
|
#
|
||||||
# Default umask for local users is 077. You may wish to change this to 022,
|
# 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)
|
# if your users expect that (022 is used by most other ftpd's)
|
||||||
@@ -27,13 +27,13 @@ anonymous_enable=YES
|
@@ -32,13 +32,13 @@ anonymous_enable=YES
|
||||||
#
|
#
|
||||||
# Activate directory messages - messages given to remote users when they
|
# Activate directory messages - messages given to remote users when they
|
||||||
# go into a certain directory.
|
# go into a certain directory.
|
||||||
@ -35,7 +35,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.2 2003/06/23 19:08:52 sturm Exp $
|
|||||||
#
|
#
|
||||||
# If you want, you can arrange for uploaded anonymous files to be owned by
|
# 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
|
# a different user. Note! Using "root" for uploaded files is not
|
||||||
@@ -56,7 +56,7 @@ connect_from_port_20=YES
|
@@ -61,7 +61,7 @@ connect_from_port_20=YES
|
||||||
#
|
#
|
||||||
# It is recommended that you define on your system a unique user which the
|
# 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.
|
# ftp server can use as a totally isolated and unprivileged user.
|
||||||
@ -44,7 +44,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.2 2003/06/23 19:08:52 sturm Exp $
|
|||||||
#
|
#
|
||||||
# Enable this and the server will recognise asynchronous ABOR requests. Not
|
# Enable this and the server will recognise asynchronous ABOR requests. Not
|
||||||
# recommended for security (the code is non-trivial). Not enabling it,
|
# recommended for security (the code is non-trivial). Not enabling it,
|
||||||
@@ -74,7 +74,7 @@ connect_from_port_20=YES
|
@@ -79,7 +79,7 @@ connect_from_port_20=YES
|
||||||
# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
|
# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
|
||||||
# on the client anyway..
|
# on the client anyway..
|
||||||
#ascii_upload_enable=YES
|
#ascii_upload_enable=YES
|
||||||
@ -53,7 +53,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.2 2003/06/23 19:08:52 sturm Exp $
|
|||||||
#
|
#
|
||||||
# You may fully customise the login banner string:
|
# You may fully customise the login banner string:
|
||||||
#ftpd_banner=Welcome to blah FTP service.
|
#ftpd_banner=Welcome to blah FTP service.
|
||||||
@@ -88,13 +88,41 @@ connect_from_port_20=YES
|
@@ -93,13 +93,41 @@ connect_from_port_20=YES
|
||||||
# You may specify an explicit list of local users to chroot() to their home
|
# 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
|
# directory. If chroot_local_user is YES, then this list becomes a list of
|
||||||
# users to NOT chroot().
|
# users to NOT chroot().
|
||||||
@ -70,7 +70,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.2 2003/06/23 19:08:52 sturm Exp $
|
|||||||
#ls_recurse_enable=YES
|
#ls_recurse_enable=YES
|
||||||
-
|
-
|
||||||
+#
|
+#
|
||||||
+# If enabled, vsftpd will load a list of usernames, from the filename
|
+# 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
|
+# given by userlist_file. If a user tries to log in using a name in this
|
||||||
+# file, they will be denied before they are asked for a password.
|
+# file, they will be denied before they are asked for a password.
|
||||||
+# This may be useful in preventing clear text passwords being transmitted.
|
+# This may be useful in preventing clear text passwords being transmitted.
|
||||||
|
Loading…
Reference in New Issue
Block a user