update vsftpd to latest upstream release (v2.0.4) and fix patches

SVN-Revision: 2916
This commit is contained in:
Oliver Ertl 2006-01-11 17:40:24 +00:00
parent d83e8ab148
commit 80fa7cba82
3 changed files with 12 additions and 14 deletions

View file

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=vsftpd PKG_NAME:=vsftpd
PKG_VERSION:=1.2.2 PKG_VERSION:=2.0.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=5a38e1c69062e7688fbbdae6d1196de2 PKG_MD5SUM:=c0bf8c7b8e15ab15827172786fc56115
PKG_SOURCE_URL:=ftp://vsftpd.beasts.org/users/cevans/ PKG_SOURCE_URL:=ftp://vsftpd.beasts.org/users/cevans/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

View file

@ -1,7 +1,6 @@
diff -ruN vsftpd-1.2.2-orig/tunables.c vsftpd-1.2.2-3/tunables.c --- vsftpd-2.0.4-orig/tunables.c 2006-01-07 20:32:44.000000000 +0100
--- vsftpd-1.2.2-orig/tunables.c 2004-04-20 02:25:05.000000000 +0200 +++ vsftpd-2.0.4/tunables.c 2006-01-11 18:25:15.000000000 +0100
+++ vsftpd-1.2.2-3/tunables.c 2005-03-09 21:12:35.000000000 +0100 @@ -92,7 +92,7 @@
@@ -78,7 +78,7 @@
unsigned int tunable_max_per_ip = 0; unsigned int tunable_max_per_ip = 0;
unsigned int tunable_trans_chunk_size = 0; unsigned int tunable_trans_chunk_size = 0;

View file

@ -1,17 +1,16 @@
diff -ruN vsftpd-1.2.2-orig/Makefile vsftpd-1.2.2-3/Makefile --- vsftpd-2.0.4-orig/Makefile 2005-06-29 00:24:03.000000000 +0200
--- vsftpd-1.2.2-orig/Makefile 2003-09-15 13:41:58.000000000 +0200 +++ vsftpd-2.0.4/Makefile 2006-01-11 18:29:12.000000000 +0100
+++ vsftpd-1.2.2-3/Makefile 2005-03-09 22:23:12.000000000 +0100 @@ -17,6 +17,8 @@
@@ -16,6 +16,8 @@ ssl.o sysutil.o sysdeputil.o
tcpwrap.o ipv6parse.o access.o \
sysutil.o sysdeputil.o
+DESTDIR = +DESTDIR =
+ +
.c.o: .c.o:
$(CC) -c $*.c $(CFLAGS) $(IFLAGS) $(CC) -c $*.c $(CFLAGS) $(IFLAGS)
@@ -23,21 +25,20 @@ @@ -24,21 +26,20 @@
$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
install: install:
- if [ -x /usr/local/sbin ]; then \ - if [ -x /usr/local/sbin ]; then \