From c63229ca148a98714dd1318d1cba17177c28f35e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 21 Aug 2009 00:48:29 +0200
Subject: update to latest upstream

- use TARGET_CFLAGS
---
 package/vsftpd/Makefile               |  5 ++---
 package/vsftpd/patches/patch-Makefile | 14 ++++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'package/vsftpd')

diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index e0cb84ec2..8456fac83 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vsftpd
-PKG_VERSION:=		2.1.2
+PKG_VERSION:=		2.2.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6a8c8579d50adf0d0fc07226c03bfb52
+PKG_MD5SUM:=		e4eb190af270ae65d57a84274a38ec31
 PKG_DESCR:=		a fast and secure FTP server
 PKG_SECTION:=		net
 PKG_URL:=		http://vsftpd.beasts.org
@@ -17,7 +17,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,VSFTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		auto
-XAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS}
 ALL_TARGET:=		vsftpd
 INSTALL_STYLE:=		auto
 
diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile
index eecb47336..a6ebc0f30 100644
--- a/package/vsftpd/patches/patch-Makefile
+++ b/package/vsftpd/patches/patch-Makefile
@@ -1,9 +1,15 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- vsftpd-2.1.2.orig/Makefile	2009-05-22 21:44:52.000000000 +0200
-+++ vsftpd-2.1.2/Makefile	2009-06-04 22:15:07.000000000 +0200
-@@ -5,8 +5,8 @@ IFLAGS  = -idirafter dummyinc
+--- vsftpd-2.2.0.orig/Makefile	2009-05-22 21:44:52.000000000 +0200
++++ vsftpd-2.2.0/Makefile	2009-08-21 00:46:32.980346849 +0200
+@@ -1,12 +1,12 @@
+ # Makefile for systems with GNU tools
+-CC 	=	gcc
++CC 	?=	gcc
+ INSTALL	=	install
+ IFLAGS  = -idirafter dummyinc
  #CFLAGS = -g
- CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
+-CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
++CFLAGS	?=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
  
 -LIBS	=	`./vsf_findlibs.sh`
 -LINK	=	-Wl,-s
-- 
cgit v1.2.3