From 75f6e1df60b29e8e9d11ce91d548ef5d149c6804 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 15 Oct 2012 15:50:26 +0000 Subject: vsftpd: bump to version 3.0.2 Bump vsftpd to version 3.0.2, closes bug #5330 Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../vsftpd/vsftpd-2.3.4-dont-force-largefile.patch | 27 ---------------------- package/vsftpd/vsftpd-dont-force-largefile.patch | 27 ++++++++++++++++++++++ package/vsftpd/vsftpd.mk | 4 +++- 3 files changed, 30 insertions(+), 28 deletions(-) delete mode 100644 package/vsftpd/vsftpd-2.3.4-dont-force-largefile.patch create mode 100644 package/vsftpd/vsftpd-dont-force-largefile.patch 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 index b66c25efd..000000000 --- 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 ---- - 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 index 000000000..b66c25efd --- /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 +--- + 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 ce042c5ba..8d261c862 100644 --- 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 -- cgit v1.2.3