vsftpd: bump to version 3.0.2

Bump vsftpd to version 3.0.2, closes bug #5330

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/vsftpd/vsftpd-2.3.4-dont-force-largefile.patch b/package/vsftpd/vsftpd-2.3.4-dont-force-largefile.patch
deleted file mode 100644 (file)
index b66c25e..0000000
--- a/package/vsftpd/vsftpd-2.3.4-dont-force-largefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-[PATCH] vsftpd: don't enforce largefile support
-
-In Buildroot we enable/disable largefile support globally, and pass the
-correct defines in CFLAGS, so don't enforce it unconditionally.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- sysutil.c |    6 ------
- 1 file changed, 6 deletions(-)
-
-Index: vsftpd-2.3.2/sysutil.c
-===================================================================
---- vsftpd-2.3.2.orig/sysutil.c
-+++ vsftpd-2.3.2/sysutil.c
-@@ -17,12 +17,6 @@
- #include "tunables.h"
- #include "sysdeputil.h"
- 
--/* Activate 64-bit file support on Linux/32bit plus others */
--#define _FILE_OFFSET_BITS 64
--#define _LARGEFILE_SOURCE 1
--#define _LARGEFILE64_SOURCE 1
--#define _LARGE_FILES 1
--
- /* For Linux, this adds nothing :-) */
- #include "port/porting_junk.h"
- 

diff --git a/package/vsftpd/vsftpd-dont-force-largefile.patch b/package/vsftpd/vsftpd-dont-force-largefile.patch
new file mode 100644 (file)
index 0000000..b66c25e
--- /dev/null
+++ b/package/vsftpd/vsftpd-dont-force-largefile.patch
@@ -0,0 +1,27 @@
+[PATCH] vsftpd: don't enforce largefile support
+
+In Buildroot we enable/disable largefile support globally, and pass the
+correct defines in CFLAGS, so don't enforce it unconditionally.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ sysutil.c |    6 ------
+ 1 file changed, 6 deletions(-)
+
+Index: vsftpd-2.3.2/sysutil.c
+===================================================================
+--- vsftpd-2.3.2.orig/sysutil.c
++++ vsftpd-2.3.2/sysutil.c
+@@ -17,12 +17,6 @@
+ #include "tunables.h"
+ #include "sysdeputil.h"
+ 
+-/* Activate 64-bit file support on Linux/32bit plus others */
+-#define _FILE_OFFSET_BITS 64
+-#define _LARGEFILE_SOURCE 1
+-#define _LARGEFILE64_SOURCE 1
+-#define _LARGE_FILES 1
+-
+ /* For Linux, this adds nothing :-) */
+ #include "port/porting_junk.h"
+ 

diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index ce042c5ba9fc47676a4a4ec4f1681b309f4b5334..8d261c8626a5f0c52903c5b888e007bdc92fc2fa 100644 (file)
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-VSFTPD_VERSION = 2.3.5
+VSFTPD_VERSION = 3.0.2
 VSFTPD_SITE = https://security.appspot.com/downloads
 VSFTPD_LIBS = -lcrypt
+VSFTPD_LICENSE = GPLv2
+VSFTPD_LICENSE_FILES = COPYING
 
 define VSFTPD_ENABLE_SSL
        $(SED) 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(@D)/builddefs.h