From: obsy <obsy@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 7 Apr 2013 09:26:08 +0000 (+0000)
Subject: [packages] vsftpd: add TLS variant
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=52f8e6eda14af630eb5712eff59c55a1f6f0f013;p=packages.git

[packages] vsftpd: add TLS variant

git-svn-id: svn://svn.openwrt.org/openwrt/packages@36238 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 8d155b239..bf4bfcd24 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,15 +9,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vsftpd
 PKG_VERSION:=3.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://security.appspot.com/downloads/
 PKG_MD5SUM:=8b00c749719089401315bd3c44dddbb2
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
-define Package/vsftpd
+define Package/vsftpd/Default
   SUBMENU:=File Transfer
   SECTION:=net
   CATEGORY:=Network
@@ -26,17 +28,47 @@ define Package/vsftpd
   MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
 endef
 
+
+define Package/vsftpd
+$(call Package/vsftpd/Default)
+  VARIANT:=notls
+  TITLE+= (no TLS)
+endef
+
+define Package/vsftpd-tls
+$(call Package/vsftpd/Default)
+  VARIANT:=tls
+  TITLE+= (TLS)
+  DEPENDS+=+libopenssl
+endef
+
 define Package/vsftpd/conffiles
 /etc/vsftpd.conf
 endef
 
-define Build/Compile
+Package/vsftpd-tls/conffiles=$(Package/vsftpd/conffiles)
+
+ifeq ($(BUILD_VARIANT),notls)
+ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 		vsftpd
-endef
+ endef
+endif
+
+ifeq ($(BUILD_VARIANT),tls)
+ define Build/Compile
+	$(SED) 's/#undef VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(PKG_BUILD_DIR)/builddefs.h
+	$(SED) 's/-lcrypt -lnsl/-lcrypt -lnsl -lssl -lcrypto/' $(PKG_BUILD_DIR)/Makefile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		vsftpd
+ endef
+endif
 
 define Package/vsftpd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
@@ -47,4 +79,7 @@ define Package/vsftpd/install
 	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
 endef
 
+Package/vsftpd-tls/install=$(Package/vsftpd/install)
+
 $(eval $(call BuildPackage,vsftpd))
+$(eval $(call BuildPackage,vsftpd-tls))