add patch from #196

[openwrt.git] / openwrt / package / vsftpd / Makefile

diff --git a/openwrt/package/vsftpd/Makefile b/openwrt/package/vsftpd/Makefile
index a8b32f1..d3c72c8 100644 (file)
--- 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)