UPDATE: net/vsftpd

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: net/vsftpd

???????? ??????
Hi,

Here is a diff for latest version of the vsftpd.
Tested on amd64 and i386.

CHANGES:
Too many changes since version 2.0.5 to paste it here.
Changelog:
ftp://vsftpd.beasts.org/users/cevans/untar/vsftpd-2.1.0/Changelog

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/vsftpd/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile 15 Sep 2007 22:37:00 -0000 1.19
+++ Makefile 3 Mar 2009 16:13:11 -0000
@@ -2,7 +2,7 @@

  COMMENT= Ftp daemon which aims to be secure

-DISTNAME= vsftpd-2.0.5
+DISTNAME= vsftpd-2.1.0
  CATEGORIES= net

  HOMEPAGE= http://vsftpd.beasts.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/vsftpd/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 5 Apr 2007 16:20:17 -0000 1.10
+++ distinfo 3 Mar 2009 16:13:11 -0000
@@ -1,5 +1,5 @@
-MD5 (vsftpd-2.0.5.tar.gz) = FGBi6LL5OvQ/9sLHcP7qlA==
-RMD160 (vsftpd-2.0.5.tar.gz) = KXw4Oq6f2Q911damKy7V5UrfJdQ=
-SHA1 (vsftpd-2.0.5.tar.gz) = m2oHlpmq6wEhlmWs8gPAk/lPrvA=
-SHA256 (vsftpd-2.0.5.tar.gz) = VGLr8N8nkt3o6jz12HxxUgCqw4hVSz8Kms5iZe3s+ls=
-SIZE (vsftpd-2.0.5.tar.gz) = 155985
+MD5 (vsftpd-2.1.0.tar.gz) = eJC1Tn/6YQb/vf2lP0f6QQ==
+RMD160 (vsftpd-2.1.0.tar.gz) = AGasUmuxhOOtqdTlPlINgt/HFjM=
+SHA1 (vsftpd-2.1.0.tar.gz) = Pt0IaOAxZOrBGrH6nqw8pKMM0zo=
+SHA256 (vsftpd-2.1.0.tar.gz) = gv23XUTxu/HueTAmWnct0T69MU04lpLGeI6eK0sRbIc=
+SIZE (vsftpd-2.1.0.tar.gz) = 178636
Index: patches/patch-tcpwrap_c
===================================================================
RCS file: /cvs/ports/net/vsftpd/patches/patch-tcpwrap_c,v
retrieving revision 1.1
diff -u -r1.1 patch-tcpwrap_c
--- patches/patch-tcpwrap_c 3 Jul 2005 18:06:37 -0000 1.1
+++ patches/patch-tcpwrap_c 3 Mar 2009 16:13:11 -0000
@@ -1,10 +1,10 @@
  $OpenBSD: patch-tcpwrap_c,v 1.1 2005/07/03 18:06:37 aanriot Exp $
---- tcpwrap.c.orig Fri Jun 10 10:08:18 2005
-+++ tcpwrap.c Fri Jun 10 10:08:32 2005
-@@ -10,6 +10,7 @@
- #include "tcpwrap.h"
+--- tcpwrap.c.orig Tue Mar  3 17:58:49 2009
++++ tcpwrap.c Tue Mar  3 17:59:32 2009
+@@ -11,6 +11,7 @@
   #include "builddefs.h"
   #include "utility.h"
+ #include "sysutil.h"
  +#include <sys/types.h>

   #ifdef VSF_BUILD_TCPWRAPPERS

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/vsftpd

Stuart Henderson
On 2009/03/03 19:22, [hidden email] wrote:
> Hi,
>
> Here is a diff for latest version of the vsftpd.
> Tested on amd64 and i386.
>
> CHANGES:
> Too many changes since version 2.0.5 to paste it here.
> Changelog:
> ftp://vsftpd.beasts.org/users/cevans/untar/vsftpd-2.1.0/Changelog

This diff was mangled (you need to disable format=flowed for sending
inline diffs from thunderbird), here's a version which applies. We were
also adding "Listen" to the sample config file which upstream now also
lists so it showed up twice, I've removed ours.

aanriot, ok with you?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/vsftpd/Makefile,v
retrieving revision 1.19
diff -N -u -p Makefile
--- Makefile 15 Sep 2007 22:37:00 -0000 1.19
+++ Makefile 27 Mar 2009 09:16:14 -0000
@@ -2,7 +2,7 @@
 
 COMMENT= Ftp daemon which aims to be secure
 
-DISTNAME= vsftpd-2.0.5
+DISTNAME= vsftpd-2.1.0
 CATEGORIES= net
 
 HOMEPAGE= http://vsftpd.beasts.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/vsftpd/distinfo,v
retrieving revision 1.10
diff -N -u -p distinfo
--- distinfo 5 Apr 2007 16:20:17 -0000 1.10
+++ distinfo 27 Mar 2009 09:16:14 -0000
@@ -1,5 +1,5 @@
-MD5 (vsftpd-2.0.5.tar.gz) = FGBi6LL5OvQ/9sLHcP7qlA==
-RMD160 (vsftpd-2.0.5.tar.gz) = KXw4Oq6f2Q911damKy7V5UrfJdQ=
-SHA1 (vsftpd-2.0.5.tar.gz) = m2oHlpmq6wEhlmWs8gPAk/lPrvA=
-SHA256 (vsftpd-2.0.5.tar.gz) = VGLr8N8nkt3o6jz12HxxUgCqw4hVSz8Kms5iZe3s+ls=
-SIZE (vsftpd-2.0.5.tar.gz) = 155985
+MD5 (vsftpd-2.1.0.tar.gz) = eJC1Tn/6YQb/vf2lP0f6QQ==
+RMD160 (vsftpd-2.1.0.tar.gz) = AGasUmuxhOOtqdTlPlINgt/HFjM=
+SHA1 (vsftpd-2.1.0.tar.gz) = Pt0IaOAxZOrBGrH6nqw8pKMM0zo=
+SHA256 (vsftpd-2.1.0.tar.gz) = gv23XUTxu/HueTAmWnct0T69MU04lpLGeI6eK0sRbIc=
+SIZE (vsftpd-2.1.0.tar.gz) = 178636
Index: patches/patch-tcpwrap_c
===================================================================
RCS file: /cvs/ports/net/vsftpd/patches/patch-tcpwrap_c,v
retrieving revision 1.1
diff -N -u -p patches/patch-tcpwrap_c
--- patches/patch-tcpwrap_c 3 Jul 2005 18:06:37 -0000 1.1
+++ patches/patch-tcpwrap_c 27 Mar 2009 09:16:14 -0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-tcpwrap_c,v 1.1 2005/07/03 18:06:37 aanriot Exp $
---- tcpwrap.c.orig Fri Jun 10 10:08:18 2005
-+++ tcpwrap.c Fri Jun 10 10:08:32 2005
-@@ -10,6 +10,7 @@
- #include "tcpwrap.h"
+--- tcpwrap.c.orig Wed Dec 17 19:58:05 2008
++++ tcpwrap.c Fri Mar 27 09:00:07 2009
+@@ -11,6 +11,7 @@
  #include "builddefs.h"
  #include "utility.h"
+ #include "sysutil.h"
 +#include <sys/types.h>
 
  #ifdef VSF_BUILD_TCPWRAPPERS
Index: patches/patch-vsftpd_conf
===================================================================
RCS file: /cvs/ports/net/vsftpd/patches/patch-vsftpd_conf,v
retrieving revision 1.6
diff -N -u -p patches/patch-vsftpd_conf
--- patches/patch-vsftpd_conf 27 Jul 2006 11:48:41 -0000 1.6
+++ patches/patch-vsftpd_conf 27 Mar 2009 09:16:14 -0000
@@ -1,13 +1,10 @@
 $OpenBSD: patch-vsftpd_conf,v 1.6 2006/07/27 11:48:41 aanriot Exp $
---- vsftpd.conf.orig Sat May 21 00:52:54 2005
-+++ vsftpd.conf Thu Jul 27 12:34:09 2006
-@@ -8,11 +8,20 @@
+--- vsftpd.conf.orig Wed Dec 17 20:31:40 2008
++++ vsftpd.conf Fri Mar 27 09:09:19 2009
+@@ -8,11 +8,17 @@
  # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
  # capabilities.
  #
-+# Standalone mode
-+listen=YES
-+#
 +# SSL
 +#ssl_enable=YES
 +#
@@ -24,7 +21,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.6 2006/07/27 11:48:41
  #
  # Uncomment this to enable any form of FTP write command.
  #write_enable=YES
-@@ -61,7 +70,7 @@ connect_from_port_20=YES
+@@ -62,7 +68,7 @@ connect_from_port_20=YES
  #
  # 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.
@@ -33,7 +30,7 @@ $OpenBSD: patch-vsftpd_conf,v 1.6 2006/07/27 11:48:41
  #
  # Enable this and the server will recognise asynchronous ABOR requests. Not
  # recommended for security (the code is non-trivial). Not enabling it,
-@@ -91,9 +100,9 @@ connect_from_port_20=YES
+@@ -92,9 +98,9 @@ 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().
@@ -45,10 +42,10 @@ $OpenBSD: patch-vsftpd_conf,v 1.6 2006/07/27 11:48:41
  #
  # 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
-@@ -101,3 +110,32 @@ connect_from_port_20=YES
+@@ -102,6 +108,35 @@ 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
@@ -78,3 +75,6 @@ $OpenBSD: patch-vsftpd_conf,v 1.6 2006/07/27 11:48:41
 +# directory listings. You can get textual names by enabling this parameter.
 +# It is off by default for performance reasons.
 +text_userdb_names=YES
+ # When "listen" directive is enabled, vsftpd runs in standalone mode and
+ # listens on IPv4 sockets. This directive cannot be used in conjunction
+ # with the listen_ipv6 directive.

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: net/vsftpd

Antoine Jacoutot-7
On Fri, 27 Mar 2009, Stuart Henderson wrote:

> On 2009/03/03 19:22, [hidden email] wrote:
> > Hi,
> >
> > Here is a diff for latest version of the vsftpd.
> > Tested on amd64 and i386.
> >
> > CHANGES:
> > Too many changes since version 2.0.5 to paste it here.
> > Changelog:
> > ftp://vsftpd.beasts.org/users/cevans/untar/vsftpd-2.1.0/Changelog
>
> This diff was mangled (you need to disable format=flowed for sending
> inline diffs from thunderbird), here's a version which applies. We were
> also adding "Listen" to the sample config file which upstream now also
> lists so it showed up twice, I've removed ours.
>
> aanriot, ok with you?

aanriot@ is probably slaying ducks somewhere and won't answer before
next year ;)

--
Antoine