From 0dd954b2ce6f076025283180a58c86afe28f20de Mon Sep 17 00:00:00 2001
From: obsy <obsy@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 10 Apr 2012 13:57:26 +0000
Subject: [PATCH] [packages] vsftpd: update to 3.0.0

git-svn-id: svn://svn.openwrt.org/openwrt/packages@31239 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/vsftpd/Makefile                    | 6 +++---
 net/vsftpd/patches/002-find_libs.patch | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 710ba96d6..f6dd53dc3 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vsftpd
-PKG_VERSION:=2.3.4
-PKG_RELEASE:=4
+PKG_VERSION:=3.0.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://security.appspot.com/downloads/
-PKG_MD5SUM:=2ea5d19978710527bb7444d93b67767a
+PKG_MD5SUM:=ad9fa952558c2c5b0426ccaccff0f972
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/vsftpd/patches/002-find_libs.patch b/net/vsftpd/patches/002-find_libs.patch
index 11a0308c9..6f1ac3512 100644
--- a/net/vsftpd/patches/002-find_libs.patch
+++ b/net/vsftpd/patches/002-find_libs.patch
@@ -1,13 +1,13 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -5,8 +5,8 @@ IFLAGS  = -idirafter dummyinc
- #CFLAGS = -g
- CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
+@@ -8,8 +8,8 @@
+ 	-D_FORTIFY_SOURCE=2 \
+ 	#-pedantic -Wconversion
  
 -LIBS	=	`./vsf_findlibs.sh`
 -LINK	=	-Wl,-s
 +LIBS	=	-lcrypt -lnsl
 +LINK	=
+ LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
  
  OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
- 		tunables.o ftpdataio.o secbuf.o ls.o \