aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorOpenWrt Developers <openwrt-devel@openwrt.org>2006-01-11 17:40:24 +0000
committerOpenWrt Developers <openwrt-devel@openwrt.org>2006-01-11 17:40:24 +0000
commitecdb3fe3ea2dc70b2136e54119ece6de66609ffe (patch)
tree55ba92a0256d14314947df586a20230f9b7273c9 /package
parent58c384e58a916f174acde56ea5405fc5c0bbb421 (diff)
downloadupstream-ecdb3fe3ea2dc70b2136e54119ece6de66609ffe.tar.gz
upstream-ecdb3fe3ea2dc70b2136e54119ece6de66609ffe.tar.bz2
upstream-ecdb3fe3ea2dc70b2136e54119ece6de66609ffe.zip
update vsftpd to latest upstream release (v2.0.4) and fix patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2916 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/vsftpd/Makefile4
-rw-r--r--package/vsftpd/patches/chroot.patch7
-rw-r--r--package/vsftpd/patches/destdir.patch15
3 files changed, 12 insertions, 14 deletions
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index 1801d808ca..42044579e0 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=vsftpd
-PKG_VERSION:=1.2.2
+PKG_VERSION:=2.0.4
PKG_RELEASE:=1
-PKG_MD5SUM:=5a38e1c69062e7688fbbdae6d1196de2
+PKG_MD5SUM:=c0bf8c7b8e15ab15827172786fc56115
PKG_SOURCE_URL:=ftp://vsftpd.beasts.org/users/cevans/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/vsftpd/patches/chroot.patch b/package/vsftpd/patches/chroot.patch
index 4c25736242..e80d1377b3 100644
--- a/package/vsftpd/patches/chroot.patch
+++ b/package/vsftpd/patches/chroot.patch
@@ -1,7 +1,6 @@
-diff -ruN vsftpd-1.2.2-orig/tunables.c vsftpd-1.2.2-3/tunables.c
---- vsftpd-1.2.2-orig/tunables.c 2004-04-20 02:25:05.000000000 +0200
-+++ vsftpd-1.2.2-3/tunables.c 2005-03-09 21:12:35.000000000 +0100
-@@ -78,7 +78,7 @@
+--- 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;
diff --git a/package/vsftpd/patches/destdir.patch b/package/vsftpd/patches/destdir.patch
index c4fb40f4e0..13f3954753 100644
--- a/package/vsftpd/patches/destdir.patch
+++ b/package/vsftpd/patches/destdir.patch
@@ -1,17 +1,16 @@
-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
-@@ -16,6 +16,8 @@
- tcpwrap.o ipv6parse.o access.o \
- sysutil.o sysdeputil.o
+--- 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
+@@ -17,6 +17,8 @@
+ ssl.o sysutil.o sysdeputil.o
+
+DESTDIR =
+
.c.o:
$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
-@@ -23,21 +25,20 @@
- $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS)
+@@ -24,21 +26,20 @@
+ $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
install:
- if [ -x /usr/local/sbin ]; then \