[Packages] net/vsftpd: Update to 2.0.6
git-svn-id: svn://svn.openwrt.org/openwrt/packages@10809 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -1,5 +1,7 @@
|
||||
--- vsftpd-2.0.4-orig/Makefile 2005-06-29 00:24:03.000000000 +0200
|
||||
+++ vsftpd-2.0.4/Makefile 2006-01-11 18:29:12.000000000 +0100
|
||||
Index: vsftpd-2.0.6/Makefile
|
||||
===================================================================
|
||||
--- vsftpd-2.0.6.orig/Makefile 2008-04-13 11:41:08.000000000 +0200
|
||||
+++ vsftpd-2.0.6/Makefile 2008-04-13 11:41:08.000000000 +0200
|
||||
@@ -17,6 +17,8 @@
|
||||
ssl.o sysutil.o sysdeputil.o
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
diff -ruN vsftpd-1.2.2-orig/Makefile vsftpd-1.2.2-3/Makefile
|
||||
--- vsftpd-1.2.2-orig/Makefile 2003-09-15 13:41:58.000000000 +0200
|
||||
+++ vsftpd-1.2.2-3/Makefile 2005-03-09 22:23:12.000000000 +0100
|
||||
Index: vsftpd-2.0.6/Makefile
|
||||
===================================================================
|
||||
--- vsftpd-2.0.6.orig/Makefile 2008-04-13 11:41:08.000000000 +0200
|
||||
+++ vsftpd-2.0.6/Makefile 2008-04-13 11:41:08.000000000 +0200
|
||||
@@ -5,8 +5,8 @@
|
||||
#CFLAGS = -g
|
||||
CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
|
||||
|
@ -1,8 +1,10 @@
|
||||
--- vsftpd-2.0.4-orig/tunables.c 2006-01-07 20:32:44.000000000 +0100
|
||||
+++ vsftpd-2.0.4/tunables.c 2006-01-11 18:25:15.000000000 +0100
|
||||
@@ -92,7 +92,7 @@
|
||||
unsigned int tunable_max_per_ip = 0;
|
||||
unsigned int tunable_trans_chunk_size = 0;
|
||||
Index: vsftpd-2.0.6/tunables.c
|
||||
===================================================================
|
||||
--- vsftpd-2.0.6.orig/tunables.c 2008-04-13 11:41:08.000000000 +0200
|
||||
+++ vsftpd-2.0.6/tunables.c 2008-04-13 11:41:09.000000000 +0200
|
||||
@@ -100,7 +100,7 @@
|
||||
/* -rw------- */
|
||||
unsigned int tunable_chown_upload_mode = 0600;
|
||||
|
||||
-const char* tunable_secure_chroot_dir = "/usr/share/empty";
|
||||
+const char* tunable_secure_chroot_dir = "/var/run/vsftpd";
|
||||
|
@ -1,6 +1,7 @@
|
||||
diff -ur vsftpd.old/sysdeputil.c vsftpd.dev/sysdeputil.c
|
||||
--- vsftpd.old/sysdeputil.c 2005-05-24 00:34:23.000000000 +0200
|
||||
+++ vsftpd.dev/sysdeputil.c 2007-03-02 17:50:30.969786936 +0100
|
||||
Index: vsftpd-2.0.6/sysdeputil.c
|
||||
===================================================================
|
||||
--- vsftpd-2.0.6.orig/sysdeputil.c 2008-04-13 11:41:08.000000000 +0200
|
||||
+++ vsftpd-2.0.6/sysdeputil.c 2008-04-13 11:41:09.000000000 +0200
|
||||
@@ -159,7 +159,6 @@
|
||||
#include <linux/capability.h>
|
||||
#include <errno.h>
|
||||
@ -9,4 +10,3 @@ diff -ur vsftpd.old/sysdeputil.c vsftpd.dev/sysdeputil.c
|
||||
/* Gross HACK to avoid warnings - linux headers overlap glibc headers */
|
||||
#undef __NFDBITS
|
||||
#undef __FDMASK
|
||||
Only in vsftpd.old: vsftpd-2.0.4
|
||||
|
@ -5,8 +5,10 @@ sysutil.c:604: error: assignment of read-only member '__in'
|
||||
sysutil.c: In function 'vsf_sysutil_wait_get_exitcode':
|
||||
sysutil.c:614: error: assignment of read-only member '__in'
|
||||
|
||||
--- vsftpd-2.0.4-old/sysutil.c
|
||||
+++ vsftpd-2.0.4-new/sysutil.c
|
||||
Index: vsftpd-2.0.6/sysutil.c
|
||||
===================================================================
|
||||
--- vsftpd-2.0.6.orig/sysutil.c 2008-04-13 11:41:08.000000000 +0200
|
||||
+++ vsftpd-2.0.6/sysutil.c 2008-04-13 11:41:09.000000000 +0200
|
||||
@@ -601,7 +601,7 @@
|
||||
vsf_sysutil_wait_exited_normally(
|
||||
const struct vsf_sysutil_wait_retval* p_waitret)
|
||||
|
Reference in New Issue
Block a user