vsftpd: rename patches to the new naming convention

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/vsftpd/0001-utmpx-builddef.patch b/package/vsftpd/0001-utmpx-builddef.patch
new file mode 100644 (file)
index 0000000..07bf13c
--- /dev/null
+++ b/package/vsftpd/0001-utmpx-builddef.patch
@@ -0,0 +1,49 @@
+Add build option to disable utmpx update code
+
+On some embedded systems the libc may have utmpx support, but the
+feature would be redundant. So add a build switch to disable utmpx
+updating, similar to compiling on systems without utmpx support.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+
+diff -ru vsftpd-3.0.2.orig/builddefs.h vsftpd-3.0.2/builddefs.h
+--- vsftpd-3.0.2.orig/builddefs.h      2012-04-05 05:24:56.000000000 +0200
++++ vsftpd-3.0.2/builddefs.h   2014-09-16 14:23:36.128003245 +0200
+@@ -4,6 +4,7 @@
+ #undef VSF_BUILD_TCPWRAPPERS
+ #define VSF_BUILD_PAM
+ #undef VSF_BUILD_SSL
++#define VSF_BUILD_UTMPX
+ 
+ #endif /* VSF_BUILDDEFS_H */
+ 
+diff -ru vsftpd-3.0.2.orig/sysdeputil.c vsftpd-3.0.2/sysdeputil.c
+--- vsftpd-3.0.2.orig/sysdeputil.c     2012-09-16 06:18:04.000000000 +0200
++++ vsftpd-3.0.2/sysdeputil.c  2014-09-16 14:26:42.686887724 +0200
+@@ -1158,7 +1158,7 @@
+ 
+ #endif /* !VSF_SYSDEP_NEED_OLD_FD_PASSING */
+ 
+-#ifndef VSF_SYSDEP_HAVE_UTMPX
++#if !defined(VSF_BUILD_UTMPX) || !defined(VSF_SYSDEP_HAVE_UTMPX)
+ 
+ void
+ vsf_insert_uwtmp(const struct mystr* p_user_str,
+@@ -1173,7 +1173,7 @@
+ {
+ }
+ 
+-#else /* !VSF_SYSDEP_HAVE_UTMPX */
++#else /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */
+ 
+ /* IMHO, the pam_unix module REALLY should be doing this in its SM component */
+ /* Statics */
+@@ -1238,7 +1238,7 @@
+   updwtmpx(WTMPX_FILE, &s_utent);
+ }
+ 
+-#endif /* !VSF_SYSDEP_HAVE_UTMPX */
++#endif /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */
+ 
+ void
+ vsf_set_die_if_parent_dies()

diff --git a/package/vsftpd/0002-dont-force-largefile.patch b/package/vsftpd/0002-dont-force-largefile.patch
new file mode 100644 (file)
index 0000000..b66c25e
--- /dev/null
+++ b/package/vsftpd/0002-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-0001-utmpx-builddef.patch b/package/vsftpd/vsftpd-0001-utmpx-builddef.patch
deleted file mode 100644 (file)
index 07bf13c..0000000
--- a/package/vsftpd/vsftpd-0001-utmpx-builddef.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Add build option to disable utmpx update code
-
-On some embedded systems the libc may have utmpx support, but the
-feature would be redundant. So add a build switch to disable utmpx
-updating, similar to compiling on systems without utmpx support.
-
-Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
-
-diff -ru vsftpd-3.0.2.orig/builddefs.h vsftpd-3.0.2/builddefs.h
---- vsftpd-3.0.2.orig/builddefs.h      2012-04-05 05:24:56.000000000 +0200
-+++ vsftpd-3.0.2/builddefs.h   2014-09-16 14:23:36.128003245 +0200
-@@ -4,6 +4,7 @@
- #undef VSF_BUILD_TCPWRAPPERS
- #define VSF_BUILD_PAM
- #undef VSF_BUILD_SSL
-+#define VSF_BUILD_UTMPX
- 
- #endif /* VSF_BUILDDEFS_H */
- 
-diff -ru vsftpd-3.0.2.orig/sysdeputil.c vsftpd-3.0.2/sysdeputil.c
---- vsftpd-3.0.2.orig/sysdeputil.c     2012-09-16 06:18:04.000000000 +0200
-+++ vsftpd-3.0.2/sysdeputil.c  2014-09-16 14:26:42.686887724 +0200
-@@ -1158,7 +1158,7 @@
- 
- #endif /* !VSF_SYSDEP_NEED_OLD_FD_PASSING */
- 
--#ifndef VSF_SYSDEP_HAVE_UTMPX
-+#if !defined(VSF_BUILD_UTMPX) || !defined(VSF_SYSDEP_HAVE_UTMPX)
- 
- void
- vsf_insert_uwtmp(const struct mystr* p_user_str,
-@@ -1173,7 +1173,7 @@
- {
- }
- 
--#else /* !VSF_SYSDEP_HAVE_UTMPX */
-+#else /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */
- 
- /* IMHO, the pam_unix module REALLY should be doing this in its SM component */
- /* Statics */
-@@ -1238,7 +1238,7 @@
-   updwtmpx(WTMPX_FILE, &s_utent);
- }
- 
--#endif /* !VSF_SYSDEP_HAVE_UTMPX */
-+#endif /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */
- 
- void
- vsf_set_die_if_parent_dies()

diff --git a/package/vsftpd/vsftpd-dont-force-largefile.patch b/package/vsftpd/vsftpd-dont-force-largefile.patch
deleted file mode 100644 (file)
index b66c25e..0000000
--- a/package/vsftpd/vsftpd-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"
-