X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fpure-ftpd%2FMakefile;h=f62eb99c76abf1fa6f7d822b07d838793ae6ed82;hb=986bfabff7d884ade4cca00ccf6710a4de9a1318;hp=96c112708adbed31c6893c114002f24e7b611449;hpb=8f327c6e2dd9c924ad13cd35254c77df81c5b7f7;p=packages.git

diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 96c112708..f62eb99c7 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -9,17 +9,19 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pure-ftpd
 PKG_VERSION:=1.0.29
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.pureftpd.org/pub/pure-ftpd/releases
 PKG_MD5SUM:=12a074824b509f9e7684fab333ed6915
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/pure-ftpd
+define Package/pure-ftpd/Default
   SUBMENU:=FTP
   SECTION:=net
   CATEGORY:=Network
@@ -28,6 +30,18 @@ define Package/pure-ftpd
   URL:=http://www.pureftpd.org/project/pure-ftpd
 endef
 
+define Package/pure-ftpd
+  $(call Package/pure-ftpd/Default)
+  TITLE+= (no TLS)
+  VARIANT:=notls
+endef
+
+define Package/pure-ftpd-tls
+  $(call Package/pure-ftpd/Default)
+  TITLE+= (TLS)
+  VARIANT:=tls
+endef
+
 define Package/pure-ftpd/description
  Pure-FTPd is a free (BSD), secure, production-quality and standard-conformant
  FTP server. It doesn't provide useless bells and whistles, but focuses on
@@ -36,13 +50,23 @@ define Package/pure-ftpd/description
  personal users as well as hosting providers.
 endef
 
+Package/pure-ftpd-tls/description=$(Package/pure-ftpd/description)
+
 define Package/pure-ftpd/conffiles
 /etc/config/pure-ftpd
 endef
 
+Package/pure-ftpd-tls/conffiles=$(Package/pure-ftpd/conffiles)
+
 CONFIGURE_ARGS += \
 	--with-everything \
-	--with-virtualchroot \
+	--with-virtualchroot
+
+ifeq ($(BUILD_VARIANT),tls)
+CONFIGURE_ARGS += \
+	--with-certfile=/etc/ssl/private/pure-ftpd.pem \
+	--with-tls
+endif
 
 define Package/pure-ftpd/install
 	$(INSTALL_DIR) $(1)/etc/config
@@ -60,4 +84,7 @@ define Package/pure-ftpd/install
 		$(1)/usr/sbin/
 endef
 
+Package/pure-ftpd-tls/install=$(Package/pure-ftpd/install)
+
 $(eval $(call BuildPackage,pure-ftpd))
+$(eval $(call BuildPackage,pure-ftpd-tls))