X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1e6617a93fcb0a411301a9e950263258cad22d41..f83f6b641dd97ef5fa348696972a8a631a1da99a:/openwrt/package/vsftpd/Makefile

diff --git a/openwrt/package/vsftpd/Makefile b/openwrt/package/vsftpd/Makefile
index a8b32f1e8..d3c72c859 100644
--- a/openwrt/package/vsftpd/Makefile
+++ b/openwrt/package/vsftpd/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vsftpd
-PKG_VERSION:=1.2.2
+PKG_VERSION:=2.0.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=5a38e1c69062e7688fbbdae6d1196de2
+PKG_MD5SUM:=c0bf8c7b8e15ab15827172786fc56115
 
 PKG_SOURCE_URL:=ftp://vsftpd.beasts.org/users/cevans/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -19,17 +19,17 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,VSFTPD,vsftpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)"
+	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	touch $(PKG_BUILD_DIR)/.built
+		vsftpd install
+	touch $@
 
 $(IPKG_VSFTPD):
 	install -d -m0755 $(IDIR_VSFTPD)/etc
@@ -37,6 +37,6 @@ $(IPKG_VSFTPD):
 	install -d -m0755 $(IDIR_VSFTPD)/etc/init.d
 	install -m0755 ./files/vsftpd.init $(IDIR_VSFTPD)/etc/init.d/vsftpd
 	install -d -m0755 $(IDIR_VSFTPD)/usr/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(IDIR_VSFTPD)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(IDIR_VSFTPD)/usr/sbin/
 	$(RSTRIP) $(IDIR_VSFTPD)
 	$(IPKG_BUILD) $(IDIR_VSFTPD) $(PACKAGE_DIR)