Index: head/databases/proftpd-mod_sql_tds/Makefile
===================================================================
--- head/databases/proftpd-mod_sql_tds/Makefile	(revision 446746)
+++ head/databases/proftpd-mod_sql_tds/Makefile	(revision 446747)
@@ -1,33 +1,38 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mod_sql_tds
 DISTVERSION=	4.13
 PORTREVISION=	0
 CATEGORIES=	databases ftp
 PKGNAMEPREFIX=	proftpd-
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	TDS ProFTPD module
 
 LICENSE=	GPLv2
 
 DESCR=		${.CURDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
 LIB_DEPENDS+=	libsybdb.so.5:databases/freetds
 _PROFTPD_MODULE_DISTFILES=	mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds
 _PROFTPD_MODULE_EXTRACT_ONLY=	mod_sql_tds-4.13${EXTRACT_SUFX}
 _PROFTPD_MODULE_MASTER_SITES=	http://labratsoftware.com/mod_sql_tds/:sql_tds \
 		                LOCAL/beech:sql_tds
 
 INCLUDEDIRS=	${LOCALBASE}/include
 LIBDIRS=	${LOCALBASE}/lib
 
 _BUILDING_PROFTPD_MODULE=	${PORTNAME}
 
 post-extract:
 	@${MV} ${WRKDIR}/mod_sql_tds.c ${WRKSRC}/contrib
 
+post-patch:
+	@${REINPLACE_CMD} -e 's| ERROR_MSG| PR_ERROR_MSG|g' \
+		-e 's| HANDLED| PR_HANDLED|g' \
+		${WRKSRC}/contrib/mod_sql_tds.c
+
 .include "${MASTERDIR}/Makefile"
Index: head/ftp/proftpd/Makefile
===================================================================
--- head/ftp/proftpd/Makefile	(revision 446746)
+++ head/ftp/proftpd/Makefile	(revision 446747)
@@ -1,226 +1,232 @@
 # Created by: Stephane Legrand
 # $FreeBSD$
 
 PORTNAME?=	proftpd
 .if !defined(DISTVERSION)
 PORTVERSION?=	${PROFTPD_VERSION}
 .endif
 PORTREVISION?=	0
 CATEGORIES?=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		https://github.com/downloads/proftpd/proftpd.github.com/ \
 		ftp://ftpmirror.uk/ftp.proftpd.org/distrib/source/ \
 		http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/
 .if defined(_BUILDING_PROFTPD_MODULE)
 DISTNAME=	proftpd-${PROFTPD_VERSION}
 .endif
 
 MAINTAINER?=	mm@FreeBSD.org
 COMMENT?=	Highly configurable FTP daemon
 
 LICENSE?=	GPLv2
 LICENSE_FILE?=	${WRKSRC}/COPYING
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 BUILD_DEPENDS+=	${LOCALBASE}/sbin/proftpd:ftp/proftpd
 RUN_DEPENDS+=	${LOCALBASE}/sbin/proftpd:ftp/proftpd
 .endif
 
-PROFTPD_VERSION=	1.3.5e
+PROFTPD_VERSION=	1.3.6
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY+=	${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}/proftpd-${PROFTPD_VERSION}
 . if defined(_PROFTPD_MODULE_EXTRACT_ONLY)
 EXTRACT_ONLY+=	${_PROFTPD_MODULE_EXTRACT_ONLY}
 . endif
 . if defined(_PROFTPD_MODULE_DISTFILES)
 DISTFILES+=	${_PROFTPD_MODULE_DISTFILES}
 . endif
 . if defined(_PROFTPD_MODULE_MASTER_SITES)
 MASTER_SITES+=	${_PROFTPD_MODULE_MASTER_SITES}
 . endif
 .endif
 
 .if !defined(_BUILDING_PROFTPD_MODULE)
 PORTDOCS=	*
 .endif
 
 MAKE_JOBS_UNSAFE=	yes
 USES+=		cpe gmake libtool
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 
 .if !defined(_BUILDING_PROFTPD_MODULE)
 USES+=		ssl
 USE_RC_SUBR=	proftpd
 .endif
 
 LOCALSTATEDIR?=	/var/run
 
 CONFIGURE_ARGS=--localstatedir=${LOCALSTATEDIR} \
 		--libexecdir=${PREFIX}/libexec/proftpd \
 		--with-pkgconfig=libdata/pkgconfig \
 		--sysconfdir=${PREFIX}/etc \
 		--enable-ctrls \
 		--enable-dso \
 		--disable-sendfile
 
 CONFIGURE_ENV+=	install_user=`${ID} -u` \
 		install_group=`${ID} -g`
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 MODULES=		${_BUILDING_PROFTPD_MODULE}
 .for m in ${MODULES}
 __MODULES:=${__MODULES}:${m}
 .endfor
 CONFIGURE_ARGS+=	--with-shared=${__MODULES:C/^://g}
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include/proftpd
 ALL_TARGET=	shared
 BUILD_WRKSRC=	${WRKSRC}/modules
 INSTALL_WRKSRC=	${WRKSRC}/modules
 PLIST=		${WRKDIR}/PLIST
 .for m in ${MODULES}
 PLIST_FILES+=	libexec/proftpd/${m}.a \
 		libexec/proftpd/${m}.so
 .endfor
 .else
-OPTIONS_DEFINE=	DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE
+OPTIONS_DEFINE=	DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE REDIS
 OPTIONS_DEFAULT=	PCRE
 
 HTMLDOCS_DESC=		Include HTML documentation
 MEMCACHE_DESC=		Memcache support using libmemcached
+REDIS_DESC=		Redis support using hiredis
 
 PLIST_SUB+=	LOCALSTATEDIR="${LOCALSTATEDIR}"
 OPTIONS_SUB=	yes
 
 .endif #!defined(_BUILDING_PROFTPD_MODULE)
 
 .if !defined(_BUILDING_PROFTPD_MODULE)
 CPPFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
 LIBS+=		-lssl -lcrypto -L${OPENSSLLIB}
 LDFLAGS+=	-lpthread
 .endif
 
 .if !defined(_BUILDING_PROFTPD_MODULE)
 LIBDIRS?=	${LOCALBASE}/lib
 INCLUDEDIRS?=	${LOCALBASE}/include
 
 # Always built modules
 MODULES+=	mod_ban \
 		mod_copy \
 		mod_ctrls_admin \
 		mod_deflate \
 		mod_dnsbl \
 		mod_dynmasq \
 		mod_exec \
 		mod_ifsession \
 		mod_ifversion \
 		mod_qos \
 		mod_quotatab \
 		mod_quotatab_file \
 		mod_quotatab_radius \
 		mod_quotatab_sql \
 		mod_radius \
 		mod_ratio \
 		mod_readme \
 		mod_rewrite \
 		mod_sftp \
 		mod_sftp_pam \
 		mod_sftp_sql \
 		mod_shaper \
 		mod_site_misc \
 		mod_snmp \
 		mod_sql \
 		mod_sql_passwd \
 		mod_tls \
 		mod_tls_shmcache \
 		mod_unique_id \
 		mod_wrap2 \
 		mod_wrap2_file \
 		mod_wrap2_sql
 
 IPV6_CONFIGURE_ENABLE=ipv6
 
 NLS_CONFIGURE_ON=	--enable-nls
 NLS_USES=		gettext iconv
 
 PCRE_CONFIGURE_ENABLE=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
 MEMCACHE_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 MEMCACHE_CONFIGURE_ENABLE=	memcache
 MEMCACHE_VARS=		MODULES+="mod_memcache mod_tls_memcache" \
 			LIBS+="-L${LOCALBASE}/lib -lmemcached -lmemcachedutil"
+
+REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
+REDIS_CONFIGURE_ENABLE=		redis
+REDIS_VARS=		MODULES+="mod_redis mod_tls_redis mod_wrap2_redis" \
+			LIBS+="-L${LOCALBASE}/lib -lhiredis"
 
 .include <bsd.port.options.mk>
 
 # Generate modules configuration string
 .for m in ${MODULES}
 _MODULES:=${_MODULES}:${m}
 .endfor
 
 # Keep this here below, in case similar constructs need to be made
 CONFIGURE_ARGS+=	--with-shared=${_MODULES:C/^://g}
 
 .endif #!defined(_BUILDING_PROFTPD_MODULE)
 
 CONFIGURE_ARGS+=	--with-includes=${INCLUDEDIRS}
 CONFIGURE_ARGS+=	--with-libraries=${LIBDIRS}
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 .if !defined(_BUILDING_PROFTPD_MODULE)
 
 .if empty(ICONV_PREFIX)
 CONFIGURE_ARGS+=	ac_cv_lib_iconv_iconv_open=no \
 			ac_cv_lib_iconv_libiconv_open=no
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|proftpd\.conf |proftpd.conf.sample |g' ${WRKSRC}/Makefile.in
 
 pre-configure:
 	@${ECHO_MSG} "==> Configuring with following modules:"
 	@${ECHO_MSG} "${MODULES:C/^://g}"
 
 post-configure:
 	${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules
 	${REINPLACE_CMD} -e 's:/usr/sbin:${PREFIX}/sbin:' \
 		-e 's:/usr/bin:${PREFIX}/bin:' \
 		${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \
 		${WRKSRC}/utils/ftpcount.1
 
 .endif #!defined(_BUILDING_PROFTPD_MODULE)
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 pre-build:
 	@cd ${WRKSRC} && ${MAKE} include/buildstamp.h
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/proftpd
 
 .else
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/proftpd
 .if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} license.txt ${STAGEDIR}${DOCSDIR}
 . if ${PORT_OPTIONS:MHTMLDOCS}
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html
 	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} Configuration.html faq.html ${STAGEDIR}${DOCSDIR}/html
 	@${CP} -RP ${WRKSRC}/doc/contrib ${STAGEDIR}${DOCSDIR}/html/contrib
 	@${CP} -RP ${WRKSRC}/doc/modules ${STAGEDIR}${DOCSDIR}/html/modules
 	@${CP} -RP ${WRKSRC}/doc/howto ${STAGEDIR}${DOCSDIR}/html/howto
 . endif
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 .endif #!defined(_BUILDING_PROFTPD_MODULE)
 
 .include <bsd.port.post.mk>
Index: head/ftp/proftpd/distinfo
===================================================================
--- head/ftp/proftpd/distinfo	(revision 446746)
+++ head/ftp/proftpd/distinfo	(revision 446747)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1499982806
-SHA256 (proftpd-1.3.5e.tar.gz) = 8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d
-SIZE (proftpd-1.3.5e.tar.gz) = 29968142
+TIMESTAMP = 1499982985
+SHA256 (proftpd-1.3.6.tar.gz) = 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf
+SIZE (proftpd-1.3.6.tar.gz) = 20251898
 SHA256 (mod_clamav-v0.14rc2.tar.gz) = 0a865a659541f7ff5c46532c79aac652cdd004f604fb6a874f57dfb95bfe5a1e
 SIZE (mod_clamav-v0.14rc2.tar.gz) = 19721
 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
 SIZE (mod_sql_tds-4.13.tar.gz) = 11688
Index: head/ftp/proftpd/files/patch-doc__Configuration.html
===================================================================
--- head/ftp/proftpd/files/patch-doc__Configuration.html	(revision 446746)
+++ head/ftp/proftpd/files/patch-doc__Configuration.html	(nonexistent)
@@ -1,18 +0,0 @@
---- ./doc/Configuration.html.orig	Wed Jan 29 12:27:24 2003
-+++ ./doc/Configuration.html	Sat Mar 15 11:34:14 2003
-@@ -4226,7 +4226,7 @@
- ></DT
- ><DD
- ><P
-->ftp</P
-+>ftpd</P
- ></DD
- ><DT
- ><PRE
-@@ -32252,4 +32252,4 @@
- ></DIV
- ></BODY
- ></HTML
-->
-\ No newline at end of file
-+>

Property changes on: head/ftp/proftpd/files/patch-doc__Configuration.html
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ftp/proftpd/files/patch-contrib_mod__tls.c
===================================================================
--- head/ftp/proftpd/files/patch-contrib_mod__tls.c	(revision 446746)
+++ head/ftp/proftpd/files/patch-contrib_mod__tls.c	(nonexistent)
@@ -1,200 +0,0 @@
---- contrib/mod_tls.c.orig	2017-01-16 01:13:01 UTC
-+++ contrib/mod_tls.c
-@@ -96,7 +96,7 @@ static DH *get_dh(BIGNUM *p, BIGNUM *g) 
-     return NULL;
-   }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   if (DH_set0_pqg(dh, p, NULL, g) != 1) {
-     pr_trace_msg(trace_channel, 3, "error setting DH p/q parameters: %s",
-       ERR_error_string(ERR_get_error(), NULL));
-@@ -114,7 +114,7 @@ static DH *get_dh(BIGNUM *p, BIGNUM *g) 
- static X509 *read_cert(FILE *fh, SSL_CTX *ssl_ctx) {
-   X509 *cert;
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   cert = PEM_read_X509(fh, NULL, SSL_CTX_get_default_passwd_cb(ssl_ctx),
-     SSL_CTX_get_default_passwd_cb_userdata(ssl_ctx));
- #else
-@@ -128,7 +128,7 @@ static X509 *read_cert(FILE *fh, SSL_CTX
- static int get_pkey_type(EVP_PKEY *pkey) {
-   int pkey_type;
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   pkey_type = EVP_PKEY_id(pkey);
- #else
-   pkey_type = EVP_PKEY_type(pkey->type);
-@@ -609,7 +609,7 @@ static void tls_diags_cb(const SSL *ssl,
-         break;
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-       case TLS_ST_OK:
- #else
-       case SSL_ST_OK:
-@@ -633,7 +633,7 @@ static void tls_diags_cb(const SSL *ssl,
- 
-     ssl_state = SSL_get_state(ssl);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     if (ssl_state == TLS_ST_SR_CLNT_HELLO) {
- #else
-     if (ssl_state == SSL3_ST_SR_CLNT_HELLO_A ||
-@@ -675,7 +675,7 @@ static void tls_diags_cb(const SSL *ssl,
-       }
- 
- #if OPENSSL_VERSION_NUMBER >= 0x009080cfL && \
--    OPENSSL_VERSION_NUMBER < 0x10100000L
-+    (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-     } else if (ssl_state & SSL_ST_RENEGOTIATE) {
-       if ((ssl == ctrl_ssl && !tls_ctrl_need_init_handshake) ||
-           (ssl != ctrl_ssl && !tls_data_need_init_handshake)) {
-@@ -2932,7 +2932,8 @@ static int tls_init_ctx(void) {
-   }
- 
-   SSL_CTX_set_tmp_dh_callback(ssl_ctx, tls_dh_cb);
--#if defined(PR_USE_OPENSSL_ECC) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(PR_USE_OPENSSL_ECC) && \
-+	(OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
-   SSL_CTX_set_tmp_ecdh_callback(ssl_ctx, tls_ecdh_cb);
- #endif /* PR_USE_OPENSSL_ECC */
- 
-@@ -4837,7 +4838,7 @@ static int tls_dotlogin_allow(const char
- 
-     pr_signals_handle();
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     X509_get0_signature(&client_sig, NULL, client_cert);
-     X509_get0_signature(&file_sig, NULL, file_cert);
- #else
-@@ -4845,7 +4846,7 @@ static int tls_dotlogin_allow(const char
-     file_sig = file_cert->signature;
- #endif /* OpenSSL-1.1.x and later */
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     if (!ASN1_STRING_cmp(client_sig, file_sig)) {
- #else
-     if (!M_ASN1_BIT_STRING_cmp(client_sig, file_sig)) {
-@@ -5320,7 +5321,7 @@ static void tls_setup_cert_dn_environ(co
-   int nentries;
-   char *k, *v;
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   nentries = X509_NAME_entry_count(name);
- #else
-   nentries = sk_X509_NAME_ENTRY_num(name->entries);
-@@ -5333,7 +5334,7 @@ static void tls_setup_cert_dn_environ(co
- 
-     pr_signals_handle();
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     entry = X509_NAME_get_entry(name, i);
-     nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(entry));
-     entry_data = ASN1_STRING_data(X509_NAME_ENTRY_get_data(entry));
-@@ -5512,7 +5513,7 @@ static void tls_setup_cert_environ(const
-     BIO_free(bio);
- 
-     bio = BIO_new(BIO_s_mem());
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     X509_get0_signature(NULL, &algo, cert);
- #else
-     algo = cert->cert_info->signature;
-@@ -5528,7 +5529,7 @@ static void tls_setup_cert_environ(const
-     BIO_free(bio);
- 
-     bio = BIO_new(BIO_s_mem());
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     pubkey = X509_get_X509_PUBKEY(cert);
-     X509_PUBKEY_get0_param(NULL, NULL, NULL, &algo, pubkey);
- #else
-@@ -5587,7 +5588,7 @@ static void tls_setup_environ(SSL *ssl) 
-       const unsigned char *sess_data;
-       unsigned int sess_datalen;
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-       sess_data = SSL_SESSION_get_id(ssl_session, &sess_datalen);
- #else
-       sess_datalen = ssl_session->session_id_length;
-@@ -5738,7 +5739,7 @@ static int tls_verify_cb(int ok, X509_ST
-     X509 *cert = X509_STORE_CTX_get_current_cert(ctx);
-     int ctx_error, depth = X509_STORE_CTX_get_error_depth(ctx);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     verify_err = X509_STORE_CTX_get_error(ctx);
- #else
-     verify_err = ctx->error;
-@@ -5755,7 +5756,7 @@ static int tls_verify_cb(int ok, X509_ST
-       X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_CHAIN_TOO_LONG);
-     }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     ctx_error = X509_STORE_CTX_get_error(ctx);
- #else
-     ctx_error = ctx->error;
-@@ -5886,7 +5887,7 @@ static int tls_verify_crl(int ok, X509_S
-   X509_STORE_CTX_init(store_ctx, tls_crl_store, NULL, NULL);
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   crls = X509_STORE_CTX_get1_crls(store_ctx, subject);
- #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-   crls = X509_STORE_get1_crls(store_ctx, subject);
-@@ -5906,14 +5907,14 @@ static int tls_verify_crl(int ok, X509_S
-       X509_NAME_print(b, issuer, 0);
- 
-       BIO_printf(b, ", lastUpdate: ");
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-       ASN1_UTCTIME_print(b, X509_CRL_get_lastUpdate(crl));
- #else
-       ASN1_UTCTIME_print(b, crl->crl->lastUpdate);
- #endif /* OpenSSL-1.1.x and later */
- 
-       BIO_printf(b, ", nextUpdate: ");
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-       ASN1_UTCTIME_print(b, X509_CRL_get_nextUpdate(crl));
- #else
-       ASN1_UTCTIME_print(b, crl->crl->nextUpdate);
-@@ -5983,7 +5984,7 @@ static int tls_verify_crl(int ok, X509_S
-    * the current certificate in order to check for revocation.
-    */
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   crls = X509_STORE_CTX_get1_crls(store_ctx, subject);
- #elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-   crls = X509_STORE_get1_crls(store_ctx, subject);
-@@ -6005,7 +6006,7 @@ static int tls_verify_crl(int ok, X509_S
-         ASN1_INTEGER *sn;
- 
-         revoked = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-         sn = X509_REVOKED_get0_serialNumber(revoked);
- #else
-         sn = revoked->serialNumber;
-@@ -6371,7 +6372,7 @@ static int tls_verify_ocsp_url(X509_STOR
-     return FALSE;
-   }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   store = X509_STORE_CTX_get0_store(ctx);
- #else
-   store = ctx->ctx;

Property changes on: head/ftp/proftpd/files/patch-contrib_mod__tls.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ftp/proftpd/files/patch-8-src-fsio.c
===================================================================
--- head/ftp/proftpd/files/patch-8-src-fsio.c	(revision 446746)
+++ head/ftp/proftpd/files/patch-8-src-fsio.c	(nonexistent)
@@ -1,44 +0,0 @@
---- src/fsio.c.orig	2010-04-12 21:00:00.000000000 +0200
-+++ src/fsio.c	2011-12-29 21:51:33.844925577 +0100
-@@ -50,6 +50,10 @@
- # include <acl/libacl.h>
- #endif
- 
-+#if defined(__FreeBSD__)
-+#include <dlfcn.h>
-+#endif
-+
- typedef struct fsopendir fsopendir_t;
- 
- struct fsopendir {
-@@ -284,7 +288,30 @@
- #endif
- }
- 
-+#if defined(__FreeBSD__)
-+static int
-+enter_freebsd_restricted_mode()
-+{
-+  typedef void frmode_t();
-+  frmode_t *frmode;
-+
-+  frmode = (frmode_t *)dlfunc(
-+    RTLD_NEXT, "__FreeBSD_libc_enter_restricted_mode");
-+  if (frmode == NULL) {
-+    pr_log_pri(PR_LOG_ERR,
-+      "error: FreeBSD with vulnerable chroot (FreeBSD-SA-11:07.chroot)");
-+    return 1;
-+  }
-+  frmode();
-+  return 0;
-+}
-+#endif
-+
- static int sys_chroot(pr_fs_t *fs, const char *path) {
-+#if defined(__FreeBSD__)
-+  if (enter_freebsd_restricted_mode() != 0)
-+    return -1;
-+#endif
-   if (chroot(path) < 0)
-     return -1;
- 

Property changes on: head/ftp/proftpd/files/patch-8-src-fsio.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in
===================================================================
--- head/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in	(revision 446746)
+++ head/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in	(nonexistent)
@@ -1,14 +0,0 @@
---- contrib/mod_sftp/Makefile.in.orig	2009-09-16 08:09:57.000000000 +0200
-+++ contrib/mod_sftp/Makefile.in	2010-03-24 17:38:46.947039120 +0100
-@@ -45,8 +45,9 @@
- 	fi
- 
- install-misc:
--	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem 
--	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
-+	$(INSTALL) -d -m 0755 $(DESTDIR)$(sysconfdir)/proftpd
-+	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/proftpd/dhparams.pem.sample
-+	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/proftpd/blacklist.dat.sample
- 
- clean:
- 	$(RM) $(MODULE_NAME).a *.o *.la *.lo

Property changes on: head/ftp/proftpd/files/patch-contrib-mod_sftp-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in
===================================================================
--- head/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in	(nonexistent)
+++ head/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in	(revision 446747)
@@ -0,0 +1,14 @@
+--- contrib/mod_sftp/Makefile.in.orig	2017-04-10 02:31:02 UTC
++++ contrib/mod_sftp/Makefile.in
+@@ -60,8 +60,9 @@ install: install-misc
+ 	fi
+ 
+ install-misc:
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem 
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(sysconfdir)/proftpd
++	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/proftpd/dhparams.pem.sample
++	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/proftpd/blacklist.dat.sample
+ 
+ clean:
+ 	$(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o

Property changes on: head/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/ftp/proftpd/files/patch-doc_Configuration.html
===================================================================
--- head/ftp/proftpd/files/patch-doc_Configuration.html	(nonexistent)
+++ head/ftp/proftpd/files/patch-doc_Configuration.html	(revision 446747)
@@ -0,0 +1,18 @@
+--- doc/Configuration.html.orig	2017-04-10 02:31:02 UTC
++++ doc/Configuration.html
+@@ -4359,7 +4359,7 @@ CLASS="SYNOPSIS"
+ ></DT
+ ><DD
+ ><P
+->ftp</P
++>ftpd</P
+ ></DD
+ ><DT
+ ><PRE
+@@ -35399,4 +35399,4 @@ CLASS="LITERALLAYOUT"
+ ></TABLE
+ ></BODY
+ ></HTML
+->
+\ No newline at end of file
++>

Property changes on: head/ftp/proftpd/files/patch-doc_Configuration.html
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/ftp/proftpd/files/patch-sample-configurations_basic.conf
===================================================================
--- head/ftp/proftpd/files/patch-sample-configurations_basic.conf	(revision 446746)
+++ head/ftp/proftpd/files/patch-sample-configurations_basic.conf	(revision 446747)
@@ -1,87 +1,83 @@
---- sample-configurations/basic.conf.orig	2008-01-21 08:44:06.000000000 -0900
-+++ sample-configurations/basic.conf	2009-01-28 11:25:31.000000000 -0900
+--- sample-configurations/basic.conf.orig	2017-04-10 02:31:02 UTC
++++ sample-configurations/basic.conf
 @@ -1,3 +1,7 @@
 +#
 +# For more information about Proftpd configuration
 +# see http://www.proftpd.org/
 +#
  # This is a basic ProFTPD configuration file (rename it to 
  # 'proftpd.conf' for actual use.  It establishes a single server
  # and a single anonymous login.  It assumes that you have a user/group
 @@ -6,12 +10,13 @@
  ServerName			"ProFTPD Default Installation"
  ServerType			standalone
  DefaultServer			on
 +ScoreboardFile		/var/run/proftpd/proftpd.scoreboard
  
  # Port 21 is the standard FTP port.
  Port				21
  
 -# Don't use IPv6 support by default.
 -UseIPv6				off
 +# Use IPv6 support by default.
 +UseIPv6				on
  
  # Umask 022 is a good standard umask to prevent new dirs and files
  # from being group and world writable.
-@@ -25,6 +30,8 @@
+@@ -25,6 +30,8 @@ Umask				022
  # (such as xinetd).
  MaxInstances			30
  
 +CommandBufferSize	512
 +
  # Set the user and group under which the server will run.
  User				nobody
  Group				nogroup
-@@ -43,23 +50,31 @@
+@@ -43,23 +50,31 @@ AllowOverwrite		on
  
  # A basic anonymous configuration, no upload directories.  If you do not
  # want anonymous users, simply delete this entire <Anonymous> section.
 -<Anonymous ~ftp>
 -  User				ftp
 -  Group				ftp
--
+ 
 -  # We want clients to be able to login with "anonymous" as well as "ftp"
 -  UserAlias			anonymous ftp
--
--  # Limit the maximum number of anonymous logins
--  MaxClients			10
--
--  # We want 'welcome.msg' displayed at login, and '.message' displayed
--  # in each newly chdired directory.
--  DisplayLogin			welcome.msg
--  DisplayChdir			.message
--
--  # Limit WRITE everywhere in the anonymous chroot
--  <Limit WRITE>
--    DenyAll
--  </Limit>
--</Anonymous>
-+
 +#########################################################################
 +#                                                                       #
 +# Uncomment lines with only one # to allow basic anonymous access       #
 +#                                                                       #
 +#########################################################################
-+
+ 
+-  # Limit the maximum number of anonymous logins
+-  MaxClients			10
 +#<Anonymous ~ftp>
 +#   User				ftp
 +#   Group				ftp
-+
+ 
+-  # We want 'welcome.msg' displayed at login, and '.message' displayed
+-  # in each newly chdired directory.
+-  DisplayLogin			welcome.msg
+-  DisplayChdir			.message
 +  ### We want clients to be able to login with "anonymous" as well as "ftp"
 +  # UserAlias			anonymous ftp
 +
 +  ### Limit the maximum number of anonymous logins
 +  # MaxClients			10
 +
 +  ### We want 'welcome.msg' displayed at login, and '.message' displayed
 +  ### in each newly chdired directory.
 +  # DisplayLogin			welcome.msg
 +  # DisplayFirstChdir		.message
 +
 +  ### Limit WRITE everywhere in the anonymous chroot
 +  # <Limit WRITE>
 +  #   DenyAll
 +  # </Limit>
 +#</Anonymous>
-+
+ 
+-  # Limit WRITE everywhere in the anonymous chroot
+-  <Limit WRITE>
+-    DenyAll
+-  </Limit>
+-</Anonymous>
Index: head/ftp/proftpd/files/patch-src_fsio.c
===================================================================
--- head/ftp/proftpd/files/patch-src_fsio.c	(nonexistent)
+++ head/ftp/proftpd/files/patch-src_fsio.c	(revision 446747)
@@ -0,0 +1,44 @@
+--- src/fsio.c.orig	2017-04-10 02:31:02 UTC
++++ src/fsio.c
+@@ -69,6 +69,10 @@ static size_t copy_iter_count = 0;
+ # define NFS_SUPER_MAGIC	0x6969
+ #endif
+ 
++#if defined(__FreeBSD__)
++#include <dlfcn.h>
++#endif
++
+ typedef struct fsopendir fsopendir_t;
+ 
+ struct fsopendir {
+@@ -1041,7 +1045,30 @@ static int sys_fsetxattr(pool *p, pr_fh_
+   return res;
+ }
+ 
++#if defined(__FreeBSD__)
++static int
++enter_freebsd_restricted_mode()
++{
++  typedef void frmode_t();
++  frmode_t *frmode;
++
++  frmode = (frmode_t *)dlfunc(
++    RTLD_NEXT, "__FreeBSD_libc_enter_restricted_mode");
++  if (frmode == NULL) {
++    pr_log_pri(PR_LOG_ERR,
++      "error: FreeBSD with vulnerable chroot (FreeBSD-SA-11:07.chroot)");
++    return 1;
++  }
++  frmode();
++  return 0;
++}
++#endif
++
+ static int sys_chroot(pr_fs_t *fs, const char *path) {
++#if defined(__FreeBSD__)
++  if (enter_freebsd_restricted_mode() != 0)
++    return -1;
++#endif
+   if (chroot(path) < 0) {
+     return -1;
+   }

Property changes on: head/ftp/proftpd/files/patch-src_fsio.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/ftp/proftpd/pkg-plist
===================================================================
--- head/ftp/proftpd/pkg-plist	(revision 446746)
+++ head/ftp/proftpd/pkg-plist	(revision 446747)
@@ -1,180 +1,191 @@
 bin/ftpasswd
 bin/ftpcount
 bin/ftpdctl
 bin/ftpmail
 bin/ftpquota
 bin/ftptop
 bin/ftpwho
 bin/prxs
 etc/PROFTPD-MIB.txt
 @sample etc/proftpd.conf.sample
 @sample etc/proftpd/dhparams.pem.sample
 @sample etc/proftpd/blacklist.dat.sample
 include/proftpd/ascii.h
 include/proftpd/auth.h
 include/proftpd/bindings.h
 include/proftpd/buildstamp.h
+include/proftpd/ccan-json.h
 include/proftpd/child.h
 include/proftpd/class.h
 include/proftpd/cmd.h
 include/proftpd/compat.h
 include/proftpd/conf.h
 include/proftpd/config.h
+include/proftpd/configdb.h
 include/proftpd/ctrls.h
 include/proftpd/data.h
 include/proftpd/default_paths.h
 include/proftpd/dirtree.h
 include/proftpd/display.h
 include/proftpd/encode.h
 include/proftpd/env.h
 include/proftpd/event.h
 include/proftpd/expr.h
 include/proftpd/feat.h
 include/proftpd/filter.h
 include/proftpd/fsio.h
 include/proftpd/ftp.h
 include/proftpd/glibc-glob.h
+include/proftpd/hanson-tpl.h
 include/proftpd/help.h
 include/proftpd/ident.h
 include/proftpd/inet.h
+include/proftpd/json.h
 include/proftpd/lastlog.h
 include/proftpd/libsupp.h
 include/proftpd/log.h
+include/proftpd/logfmt.h
 include/proftpd/memcache.h
 include/proftpd/mkhome.h
 include/proftpd/mod_ctrls.h
 include/proftpd/mod_dnsbl.h
-include/proftpd/mod_log.h
 include/proftpd/mod_quotatab.h
 include/proftpd/mod_sftp.h
 include/proftpd/mod_snmp.h
 include/proftpd/mod_sql.h
 include/proftpd/mod_tls.h
 include/proftpd/mod_wrap2.h
 include/proftpd/modules.h
 include/proftpd/netacl.h
 include/proftpd/netaddr.h
 include/proftpd/netio.h
 include/proftpd/options.h
 include/proftpd/parser.h
 include/proftpd/pidfile.h
 include/proftpd/pool.h
 include/proftpd/pr-syslog.h
 include/proftpd/privs.h
 include/proftpd/proctitle.h
 include/proftpd/proftpd.h
+include/proftpd/redis.h
 include/proftpd/regexp.h
 include/proftpd/response.h
 include/proftpd/rlimit.h
 include/proftpd/scoreboard.h
 include/proftpd/session.h
 include/proftpd/sets.h
+include/proftpd/signals.h
 include/proftpd/stash.h
 include/proftpd/str.h
 include/proftpd/support.h
 include/proftpd/table.h
 include/proftpd/throttle.h
 include/proftpd/timers.h
-include/proftpd/tpl.h
 include/proftpd/trace.h
 include/proftpd/utf8.h
 include/proftpd/var.h
 include/proftpd/version.h
 include/proftpd/xferlog.h
 libdata/pkgconfig/proftpd.pc
 libexec/proftpd/mod_ban.a
 libexec/proftpd/mod_ban.so
 libexec/proftpd/mod_copy.a
 libexec/proftpd/mod_copy.so
 libexec/proftpd/mod_ctrls_admin.a
 libexec/proftpd/mod_ctrls_admin.so
 libexec/proftpd/mod_deflate.a
 libexec/proftpd/mod_deflate.so
 libexec/proftpd/mod_dnsbl.a
 libexec/proftpd/mod_dnsbl.so
 libexec/proftpd/mod_dynmasq.a
 libexec/proftpd/mod_dynmasq.so
 libexec/proftpd/mod_exec.a
 libexec/proftpd/mod_exec.so
 libexec/proftpd/mod_ifversion.a
 libexec/proftpd/mod_ifversion.so
 libexec/proftpd/mod_ifsession.a
 libexec/proftpd/mod_ifsession.so
 %%MEMCACHE%%libexec/proftpd/mod_memcache.a
 %%MEMCACHE%%libexec/proftpd/mod_memcache.so
 libexec/proftpd/mod_qos.a
 libexec/proftpd/mod_qos.so
 libexec/proftpd/mod_quotatab.a
 libexec/proftpd/mod_quotatab.so
 libexec/proftpd/mod_quotatab_file.a
 libexec/proftpd/mod_quotatab_file.so
 libexec/proftpd/mod_quotatab_sql.a
 libexec/proftpd/mod_quotatab_sql.so
 libexec/proftpd/mod_quotatab_radius.a
 libexec/proftpd/mod_quotatab_radius.so
 libexec/proftpd/mod_radius.a
 libexec/proftpd/mod_radius.so
 libexec/proftpd/mod_ratio.a
 libexec/proftpd/mod_ratio.so
 libexec/proftpd/mod_readme.a
 libexec/proftpd/mod_readme.so
 libexec/proftpd/mod_rewrite.a
 libexec/proftpd/mod_rewrite.so
 libexec/proftpd/mod_shaper.a
 libexec/proftpd/mod_shaper.so
 libexec/proftpd/mod_sftp.a
 libexec/proftpd/mod_sftp.so
 libexec/proftpd/mod_sftp_pam.a
 libexec/proftpd/mod_sftp_pam.so
 libexec/proftpd/mod_sftp_sql.a
 libexec/proftpd/mod_sftp_sql.so
 libexec/proftpd/mod_site_misc.a
 libexec/proftpd/mod_site_misc.so
 libexec/proftpd/mod_snmp.a
 libexec/proftpd/mod_snmp.so
+%%REDIS%%libexec/proftpd/mod_redis.a
+%%REDIS%%libexec/proftpd/mod_redis.so
 libexec/proftpd/mod_sql.a
 libexec/proftpd/mod_sql.so
 libexec/proftpd/mod_sql_passwd.a
 libexec/proftpd/mod_sql_passwd.so
 libexec/proftpd/mod_tls.a
 libexec/proftpd/mod_tls.so
 %%MEMCACHE%%libexec/proftpd/mod_tls_memcache.a
 %%MEMCACHE%%libexec/proftpd/mod_tls_memcache.so
+%%REDIS%%libexec/proftpd/mod_tls_redis.a
+%%REDIS%%libexec/proftpd/mod_tls_redis.so
 libexec/proftpd/mod_tls_shmcache.a
 libexec/proftpd/mod_tls_shmcache.so
 libexec/proftpd/mod_unique_id.a
 libexec/proftpd/mod_unique_id.so
 libexec/proftpd/mod_wrap2.a
 libexec/proftpd/mod_wrap2.so
 libexec/proftpd/mod_wrap2_file.a
 libexec/proftpd/mod_wrap2_file.so
+%%REDIS%%libexec/proftpd/mod_wrap2_redis.a
+%%REDIS%%libexec/proftpd/mod_wrap2_redis.so
 libexec/proftpd/mod_wrap2_sql.a
 libexec/proftpd/mod_wrap2_sql.so
 man/man1/ftpcount.1.gz
 man/man1/ftpmail.1.gz
 man/man1/ftpasswd.1.gz
 man/man1/ftpquota.1.gz
 man/man1/ftpwho.1.gz
 man/man1/ftptop.1.gz
 man/man5/proftpd.conf.5.gz
 man/man5/xferlog.5.gz
 man/man8/proftpd.8.gz
 man/man8/ftpscrub.8.gz
 man/man8/ftpshut.8.gz
 man/man8/ftpdctl.8.gz
 sbin/ftpscrub
 sbin/ftpshut
 sbin/in.proftpd
 sbin/proftpd
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/en_US/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/es_ES/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/it_IT/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/ja_JP/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/ru_RU/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo
 %%NLS%%share/locale/ko_KR/LC_MESSAGES/proftpd.mo
 @dir lib/proftpd
 @dir %%LOCALSTATEDIR%%/proftpd