svn commit: r390767 - head/ftp/pure-ftpd

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Jun 28 09:45:16 2015
New Revision: 390767
URL: https://svnweb.freebsd.org/changeset/ports/390767

Log:
  - Update to 1.0.41
  - Remove TLS_CERTFILE: it is added to pure-ftpd.conf and configurable at runtime
  
  Changes:	https://github.com/jedisct1/pure-ftpd/blob/master/ChangeLog

Modified:
  head/ftp/pure-ftpd/Makefile
  head/ftp/pure-ftpd/distinfo

Modified: head/ftp/pure-ftpd/Makefile
==============================================================================
--- head/ftp/pure-ftpd/Makefile	Sun Jun 28 09:45:11 2015	(r390766)
+++ head/ftp/pure-ftpd/Makefile	Sun Jun 28 09:45:16 2015	(r390767)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pure-ftpd
-PORTVERSION=	1.0.40
+PORTVERSION=	1.0.41
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/releases/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
@@ -62,7 +62,6 @@ LANG?=		english
 PAM_DIR?=	${EXAMPLESDIR}/pam
 PAM_TARGET?=	pure-ftpd
 PAM_TEMPL?=	${FILESDIR}/pam.conf.5
-TLS_CERTFILE?=	/etc/ssl/private/pure-ftpd.pem
 
 ANONDELETE_CPPFLAGS=	-DANON_CAN_DELETE
 ANONRENAME_CPPFLAGS=	-DANON_CAN_RENAME
@@ -80,8 +79,7 @@ PRIVSEP_CONFIGURE_WITH=	privsep
 SCRYPT_LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
 SENDFILE_CONFIGURE_WITH=sendfile
 THROTTLING_CONFIGURE_WITH=	throttling
-TLS_CONFIGURE_OFF=	--without-tls
-TLS_CONFIGURE_ON=	--with-certfile=${TLS_CERTFILE} --with-tls
+TLS_CONFIGURE_WITH=	tls
 TLS_CPPFLAGS=		-I${OPENSSLINC}
 TLS_LDFLAGS=		-L${OPENSSLLIB}
 TLS_USE=		OPENSSL=yes
@@ -107,9 +105,6 @@ pre-fetch:
 	@${ECHO_MSG} "  norwegian, polish, romanian, russian, simplified-chinese, slovak,"
 	@${ECHO_MSG} "  spanish, swedish, traditional-chinese, turkish"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "TLS_CERTFILE=/path/to/file (default: /etc/ssl/private/pure-ftpd.pem)"
-	@${ECHO_MSG} "- Custom location of certificate file for TLS"
-	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@PERL@|${PERL}|; s|$${exec_prefix}|${PREFIX}|g' ${WRKSRC}/configuration-file/pure-config.pl.in

Modified: head/ftp/pure-ftpd/distinfo
==============================================================================
--- head/ftp/pure-ftpd/distinfo	Sun Jun 28 09:45:11 2015	(r390766)
+++ head/ftp/pure-ftpd/distinfo	Sun Jun 28 09:45:16 2015	(r390767)
@@ -1,2 +1,2 @@
-SHA256 (pure-ftpd-1.0.40.tar.bz2) = 004dd4e991537f100fb6cdcdcd43460ed49847aefb60bc4577466839de95aa20
-SIZE (pure-ftpd-1.0.40.tar.bz2) = 495141
+SHA256 (pure-ftpd-1.0.41.tar.bz2) = 1d48f650f366b8151d86b86c79f4bb874e95143bdac0e767038eda832d28a010
+SIZE (pure-ftpd-1.0.41.tar.bz2) = 496457