vsftpd: fix build without largefile support

Fix lfs patch to include <features.h> before checking any of the
uClibc defines.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 354186a09fe0c35e0fa3717f483063591010e937..83242aa48602e3e8e4b70e07726fdabe679e4a97 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,8 @@
        nbd, netsnmp, ntfsprogs, ntp, olsr, pango, pciutils, pcmanfm,
        php, pkg-config, psmisc, qt, samba, shared-mime-info,
        squashfs, squashfs3, sshfs, startup-notification, swfdec,
-       sylpheed, uemacs, util-linux, valgrind, vpnc, webkit, xstroke
+       sylpheed, uemacs, util-linux, valgrind, vpnc, vsftpd, webkit,
+       xstroke
 
        Issues resolved (http://bugs.uclibc.org):
 

diff --git a/package/vsftpd/vsftpd-2.0.5-uclibc_lfs.patch b/package/vsftpd/vsftpd-2.0.5-uclibc_lfs.patch
deleted file mode 100644 (file)
index ebd25ca..0000000
--- a/package/vsftpd/vsftpd-2.0.5-uclibc_lfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rdup vsftpd-2.0.5.orig/sysutil.c vsftpd-2.0.5/sysutil.c
---- vsftpd-2.0.5.orig/sysutil.c        2006-07-03 18:26:40.000000000 +0200
-+++ vsftpd-2.0.5/sysutil.c     2006-12-14 15:13:15.000000000 +0100
-@@ -16,11 +16,15 @@
- #include "utility.h"
- #include "tunables.h"
- 
-+#include "builddefs.h"
-+
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
- /* 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
-+#endif
- 
- /* For Linux, this adds nothing :-) */
- #include "port/porting_junk.h"

diff --git a/package/vsftpd/vsftpd-2.0.7-uclibc_lfs.patch b/package/vsftpd/vsftpd-2.0.7-uclibc_lfs.patch
new file mode 100644 (file)
index 0000000..610b782
--- /dev/null
+++ b/package/vsftpd/vsftpd-2.0.7-uclibc_lfs.patch
@@ -0,0 +1,19 @@
+diff -rdup vsftpd-2.0.5.orig/sysutil.c vsftpd-2.0.5/sysutil.c
+--- vsftpd-2.0.5.orig/sysutil.c        2006-07-03 18:26:40.000000000 +0200
++++ vsftpd-2.0.5/sysutil.c     2006-12-14 15:13:15.000000000 +0100
+@@ -16,11 +16,15 @@
+ #include "utility.h"
+ #include "tunables.h"
+ 
++#include <features.h>
++
++#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
+ /* 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
++#endif
+ 
+ /* For Linux, this adds nothing :-) */
+ #include "port/porting_junk.h"