From 93345fb2f8fd5fe89cb8b3c2d03eceae1b4593f2 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 9 Aug 2009 10:25:28 +0000
Subject: [PATCH] [package] update vsftpd to 2.1.2 (#5647)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17191 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/vsftpd/Makefile                    |  4 ++--
 net/vsftpd/patches/001-destdir.patch   | 12 +++++-------
 net/vsftpd/patches/002-find_libs.patch |  8 +++-----
 net/vsftpd/patches/003-chroot.patch    |  8 +++-----
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 4fd31e1a1..8085b623f 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vsftpd
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://vsftpd.beasts.org/users/cevans/
-PKG_MD5SUM:=b1fab0e6212738f9f3572e067c419778
+PKG_MD5SUM:=6a8c8579d50adf0d0fc07226c03bfb52
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/vsftpd/patches/001-destdir.patch b/net/vsftpd/patches/001-destdir.patch
index d729e89ff..33897b2b3 100644
--- a/net/vsftpd/patches/001-destdir.patch
+++ b/net/vsftpd/patches/001-destdir.patch
@@ -1,9 +1,7 @@
-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
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,8 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
+     ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o
  
  
 +DESTDIR =
@@ -11,7 +9,7 @@ Index: vsftpd-2.0.6/Makefile
  .c.o:
  	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
  
-@@ -24,21 +26,20 @@
+@@ -24,21 +26,20 @@ vsftpd: $(OBJS) 
  	$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
  
  install:
diff --git a/net/vsftpd/patches/002-find_libs.patch b/net/vsftpd/patches/002-find_libs.patch
index 86caffc64..11a0308c9 100644
--- a/net/vsftpd/patches/002-find_libs.patch
+++ b/net/vsftpd/patches/002-find_libs.patch
@@ -1,8 +1,6 @@
-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 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,8 +5,8 @@ IFLAGS  = -idirafter dummyinc
  #CFLAGS = -g
  CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
  
diff --git a/net/vsftpd/patches/003-chroot.patch b/net/vsftpd/patches/003-chroot.patch
index 4765c5800..bf7318e4f 100644
--- a/net/vsftpd/patches/003-chroot.patch
+++ b/net/vsftpd/patches/003-chroot.patch
@@ -1,8 +1,6 @@
-Index: vsftpd-2.0.6/tunables.c
-===================================================================
---- vsftpd-2.1.0.orig/tunables.c	2008-04-13 11:41:08.000000000 +0200
-+++ vsftpd-2.1.0/tunables.c	2008-04-13 11:41:09.000000000 +0200
-@@ -242,7 +242,7 @@
+--- a/tunables.c
++++ b/tunables.c
+@@ -244,7 +244,7 @@ tunables_load_defaults()
    /* -rw------- */
    tunable_chown_upload_mode = 0600;