- Update to 1.0.22

- Convert TLS to an option, off by default since this is considered
  experimental
- Change PRIVSEP option on by default to reflect default configure

4 files changed, 16 insertions, 54 deletions

diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index 04959bdfbaa4..d9fdc136bcb5 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pure-ftpd
-PORTVERSION=	1.0.21
-PORTREVISION=	4
+PORTVERSION=	1.0.22
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
@@ -34,7 +33,6 @@ MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--with-everything \
 		--with-paranoidmsg \
 		--with-virtualchroot \
-		--with-tls \
 		--sysconfdir=${PREFIX}/etc
 
 MAN8=		pure-ftpd.8 pure-ftpwho.8 pure-mrtginfo.8 pure-statsdecode.8 \
@@ -45,7 +43,8 @@ OPTIONS=	LDAP		"Support for users in LDAP directories" off \
 		MYSQL		"Support for users in MySQL database" off \
 		PAM		"Support for PAM authentication" on \
 		PGSQL		"Support for users in PostgreSQL database" off \
-		PRIVSEP		"Enable privilege separation" off \
+		TLS		"Support for TLS (experimental)" off \
+		PRIVSEP		"Enable privilege separation" on \
 		PERUSERLIMITS	"Per-user concurrency limits" off \
 		THROTTLING	"Bandwidth throttling" off \
 		BANNER		"Show ${PORTNAME} welcome upon session start" on \
@@ -94,9 +93,13 @@ CONFIGURE_ARGS+=	--with-peruserlimits
 CONFIGURE_ARGS+=	--with-throttling
 .endif
 
+# TLS
+.if defined(WITH_TLS)
+CONFIGURE_ARGS+=	--with-tls
 # different certificate file location?
-.if defined(WITH_CERTFILE)
+. if defined(WITH_CERTFILE)
 CONFIGURE_ARGS+=	--with-certfile=${WITH_CERTFILE}
+. endif
 .endif
 
 # if mysql or ldap are disabled, enable pam
@@ -127,7 +130,7 @@ CONFIGURE_ARGS+=	--without-sendfile
 .endif
 
 .if defined(WITH_LARGEFILE)
-CONFIGURE_ARGS+=	--with-largefile
+CONFIGURE_ARGS+=	--enable-largefile
 .else
 CONFIGURE_ARGS+=	--disable-largefile
 .endif
@@ -138,7 +141,7 @@ PAM_TARGET?=	pure-ftpd
 
 PORTDOCS=	AUTHORS CONTACT COPYING HISTORY NEWS \
 		README README.Configuration-File README.Contrib README.LDAP \
-		README.Netfilter README.MySQL README.PGSQL README.Virtual-Users \
+		README.MySQL README.PGSQL README.Virtual-Users \
 		README.Authentication-Modules THANKS pure-ftpd.png \
 		pureftpd.schema README.TLS
 PORTEXAMPLES=	*
@@ -150,16 +153,14 @@ pre-fetch:
 	@${ECHO_MSG} "WITH_CERTFILE=/path   - Set different location of certificate file for TLS"
 	@${ECHO_MSG} "WITH_LANG=lang        - Enable compilation of language support, lang is one of"
 	@${ECHO_MSG} "  english, german, romanian, french, french-funny, polish, spanish,"
-	@${ECHO_MSG} "  dutch, italian, brazilian-portuguese, danish, slovak, korean,"
-	@${ECHO_MSG} "  norwegian, swedish, russian, traditional-chinese, simplified-chinese,"
-	@${ECHO_MSG} "  hungarian, catalan and czech."
+	@${ECHO_MSG} "  danish, dutch, italian, brazilian-portuguese, slovak, korean, swedish,"
+	@${ECHO_MSG} "  norwegian, russian, traditional-chinese, simplified-chinese, czech,"
+	@${ECHO_MSG} "  turkish, hungarian, catalan"
 	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${exec_prefix}|${PREFIX}|g' \
 		${WRKSRC}/configuration-file/pure-config.pl.in
-	@${REINPLACE_CMD} -e 's,SYNTAX SYNTAX,SYNTAX,' \
-		${WRKSRC}/pureftpd.schema
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pureftpd-ldap.conf ${PREFIX}/etc/pureftpd-ldap.conf.sample
diff --git a/ftp/pure-ftpd/distinfo b/ftp/pure-ftpd/distinfo
index 786df9622d85..72da442b0ffe 100644
--- a/ftp/pure-ftpd/distinfo
+++ b/ftp/pure-ftpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (pure-ftpd-1.0.21.tar.bz2) = ca8a8dbec0cd9c8ea92fc4c37ea9c410
-SHA256 (pure-ftpd-1.0.21.tar.bz2) = f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c
-SIZE (pure-ftpd-1.0.21.tar.bz2) = 476117
+MD5 (pure-ftpd-1.0.22.tar.bz2) = 7f9ceefafaf9eb8fca757d7358f474fa
+SHA256 (pure-ftpd-1.0.22.tar.bz2) = f362455d63899881b078c9ed51ee81348486cb77794defab7646cad218ad1a8f
+SIZE (pure-ftpd-1.0.22.tar.bz2) = 497553
diff --git a/ftp/pure-ftpd/files/patch-src_ftpd.c b/ftp/pure-ftpd/files/patch-src_ftpd.c
deleted file mode 100644
index ac00c7b570a5..000000000000
--- a/ftp/pure-ftpd/files/patch-src_ftpd.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/ftpd.c.orig	2006-02-21 16:14:49.000000000 +0300
-+++ src/ftpd.c	2009-02-13 17:55:48.000000000 +0300
-@@ -2541,7 +2541,7 @@
-     tm.tm_mon--;
-     tm.tm_year -= 1900;
-     if (tm.tm_mon < 0 || tm.tm_year <= 0 ||
--	(ts = mktime(&tm)) == (time_t) -1) {
-+	(ts = timegm(&tm)) == (time_t) -1) {
- 	addreply_noformat(501, MSG_TIMESTAMP_FAILURE);
- 	return;
-     }
-@@ -3439,14 +3439,14 @@
- # define FEAT_UTF8 ""
- #endif
-     
--    char feat[] = FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP FEAT_PASV FEAT_ESTA FEAT_TLS FEAT_UTF8;
-+    char feat[] = FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP FEAT_TLS FEAT_PASV FEAT_ESTA FEAT_UTF8;
- 
-     if (disallow_passive != 0) {
-         feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP] = 0;
-     }
- #ifndef MINIMAL
-     else if (STORAGE_FAMILY(force_passive_ip) != 0) {
--        feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP FEAT_PASV] = 0;
-+        feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP FEAT_TLS FEAT_PASV] = 0;
-     }
- #endif
-     addreply_noformat(0, feat);
diff --git a/ftp/pure-ftpd/files/patch-src_log_mysql_p.h b/ftp/pure-ftpd/files/patch-src_log_mysql_p.h
deleted file mode 100644
index c7ba8ffd52e5..000000000000
--- a/ftp/pure-ftpd/files/patch-src_log_mysql_p.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/log_mysql_p.h.orig	Mon Sep 11 11:57:13 2006
-+++ src/log_mysql_p.h	Mon Sep 11 11:57:23 2006
-@@ -3,6 +3,8 @@
- 
- #include <mysql.h>
- 
-+typedef unsigned long	ulong;
-+
- #ifdef MYSQL_VERSION_ID
- # if MYSQL_VERSION_ID < 32224
- #  define mysql_field_count(X) mysql_num_fields(X)