From 1001e88e83429343b348dbcda4d9f040b0f2c9cf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 13 Oct 2011 21:07:19 +0200
Subject: update

---
 package/vsftpd/Makefile               | 9 ++++-----
 package/vsftpd/patches/patch-Makefile | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'package/vsftpd')

diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index 61e1f80da..a275f1aad 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -4,25 +4,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vsftpd
-PKG_VERSION:=		2.2.0
+PKG_VERSION:=		2.3.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e4eb190af270ae65d57a84274a38ec31
+PKG_MD5SUM:=		2ea5d19978710527bb7444d93b67767a
 PKG_DESCR:=		a fast and secure FTP server
 PKG_SECTION:=		www
 PKG_URL:=		http://vsftpd.beasts.org/
-PKG_SITES:=		ftp://vsftpd.beasts.org/users/cevans/
+PKG_SITES:=		http://security.appspot.com/downloads/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VSFTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=          manual
-
 ALL_TARGET:=		vsftpd
 
 post-install:
 	${INSTALL_DIR} ${IDIR_VSFTPD}/etc ${IDIR_VSFTPD}/usr/sbin
 	${INSTALL_DATA} ./files/vsftpd.conf ${IDIR_VSFTPD}/etc/vsftpd.conf
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/vsftpd ${IDIR_VSFTPD}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/vsftpd ${IDIR_VSFTPD}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile
index a6ebc0f30..83d21ca48 100644
--- a/package/vsftpd/patches/patch-Makefile
+++ b/package/vsftpd/patches/patch-Makefile
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- 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
+--- vsftpd-2.3.4.orig/Makefile	2009-05-22 21:44:52.000000000 +0200
++++ vsftpd-2.3.4/Makefile	2011-10-13 21:01:57.600352003 +0200
 @@ -1,12 +1,12 @@
  # Makefile for systems with GNU tools
 -CC 	=	gcc
@@ -27,7 +27,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  .c.o:
  	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
  
-@@ -24,21 +26,20 @@ vsftpd: $(OBJS) 
+@@ -24,21 +26,20 @@ vsftpd: $(OBJS)
  	$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
  
  install:
-- 
cgit v1.2.3