testing/proftpd: add patch for libressl

- improve -doc subpackage

- add new modules:
	auth_otp
	lang
	memcache
	redis
	statcache
	tls_fscache
	tls_memcache
	tls_redis
	wrap2 (with backends: file, redis, sql)

2 files changed, 80 insertions, 10 deletions

diff --git a/testing/proftpd/APKBUILD b/testing/proftpd/APKBUILD
index 7bc6701684..7b53965301 100644
--- a/testing/proftpd/APKBUILD
+++ b/testing/proftpd/APKBUILD
@@ -3,25 +3,27 @@
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=proftpd
 pkgver=1.3.6
-pkgrel=0
+pkgrel=1
 _pkgver=${pkgver/_rc/rc}
 pkgdesc="Highly configurable FTP server software"
 url="http://www.proftpd.org/"
 pkgusers=$pkgname
 pkggroups=$pkgname
-arch=""
+arch="all"
 license="GPL"
 options="!check"
 depends=""
 depends_dev="perl"
-makedepends="$depends_dev bash pcre-dev libressl-dev sqlite-dev mariadb-dev
-	unixodbc-dev postgresql-dev openldap-dev geoip-dev net-snmp-dev"
+makedepends="$depends_dev bash file pcre-dev libmemcached-dev libressl-dev sqlite-dev mariadb-dev
+	hiredis-dev unixodbc-dev postgresql-dev openldap-dev geoip-dev net-snmp-dev"
 install="$pkgname.pre-install"
-_modules="auth_file ban copy ctrls_admin deflate delay dnsbl dynmasq exec geoip facl facts ident
-	ifsession:=zz ifversion ldap load log_forensic qos quotatab:-- quotatab_file:quotatab
-	quotatab_ldap:quotatab quotatab_radius:quotatab quotatab_sql:quotatab,sql radius ratio
-	readme rewrite shaper site_misc sql:-- sql_passwd:sql sftp_sql:sftp,sql sql_sqlite:sql
-	sql_mysql:sql sql_odbc:sql sql_postgres:sql tls tls_shmcache:tls unique_id"
+_modules="auth_file auth_otp:sftp ban copy ctrls_admin deflate delay dnsbl dynmasq exec geoip
+	facl facts ident ifsession:=zz ifversion lang ldap load log_forensic memcache qos
+	quotatab:-- quotatab_file:quotatab quotatab_ldap:quotatab quotatab_radius:quotatab
+	quotatab_sql:quotatab,sql radius ratio readme redis rewrite sftp_sql:sftp,sql site_misc
+	shaper sql:-- sql_passwd:sql sql_sqlite:sql sql_mysql:sql sql_odbc:sql sql_postgres:sql
+	statcache tls tls_fscache:tls tls_memcache:tls tls_redis:tls tls_shmcache:tls unique_id
+	wrap2:-- wrap2_file:wrap2 wrap2_redis:wrap2,redis wrap2_sql:wrap2,sql"
 for _module in $_modules; do
 	[ -z "${_module##*:*}" ] && eval _load_mod_${_module%:*}=${_module#*:}
 	subpackages="$subpackages $pkgname-mod_${_module%:*}:_module"
@@ -37,6 +39,7 @@ source="ftp://ftp.proftpd.org/distrib/source/$pkgname-$_pkgver.tar.gz
 	mod_load.conf
 	mod_sftp.conf
 	mod_tls_shmcache.conf
+	libressl.patch
 	"
 builddir="$srcdir/$pkgname-$_pkgver"
 
@@ -83,6 +86,16 @@ dev() {
 	mv "$pkgdir"/usr/bin/prxs "$subpkgdir"/usr/bin
 }
 
+doc() {
+	default_doc || return 1
+	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname || return 1
+	cd "$builddir"
+	cp -r RELEASE_NOTES doc/* contrib/README* \
+		contrib/mod_quotatab_ldap.ldif \
+		contrib/mod_quotatab_ldap.schema \
+		"$subpkgdir"/usr/share/doc/$pkgname
+}
+
 utils() {
 	pkgdesc="$pkgdesc (utilities)"
 	depends="$pkgname perl perl-mail-sendmail"
@@ -143,4 +156,5 @@ a03124a88c0c9f3981762804c62aa479f36227f24408a60437bf737c1e783c539a2d2c0aed0b1d95
 e918e9fdf42e46953faeb55f5a8e7e7afc8951b861059182993f45b7ca870b9bdfa261fc893923772060bf500c44f98503d44878473dce7534f0825a7ff87831  mod_delay.conf
 06c149f4c1b8e0deb8102a0ddbe5314354d53cb70934c9315968ab69b9d2b1e16c33bf652aba05472eac4ca44137ce18c93214bb1257fad6c6e2e9b0728cf556  mod_load.conf
 557cbf2c1ca3a724216837f98c0f86b7d14df5f91564e1aceef721389c4774562edbd584d3ce2611ea4b2853c50acd569c33302f534e6e60452cf12b4b997ece  mod_sftp.conf
-768ce1e63b44eafb9033212655c9a5a9aa65a6f7e1b97b11210ccc0e49caf5c32dd2514dba10a098a4ab2c8bd5f3ad5167f337f5fa0a1cdd5efa4e37c980f6e5  mod_tls_shmcache.conf"
+768ce1e63b44eafb9033212655c9a5a9aa65a6f7e1b97b11210ccc0e49caf5c32dd2514dba10a098a4ab2c8bd5f3ad5167f337f5fa0a1cdd5efa4e37c980f6e5  mod_tls_shmcache.conf
+abee13da067175c1f3dd1c02f8055b551e2d1370cfc430d22e204a174a4518ccf0b55cb8415676362508f4504d28d1d711f4d27001e69b6b6ce7bd7ea3f521ef  libressl.patch"
diff --git a/testing/proftpd/libressl.patch b/testing/proftpd/libressl.patch
new file mode 100644
index 0000000000..60b0ef8004
--- /dev/null
+++ b/testing/proftpd/libressl.patch
@@ -0,0 +1,56 @@
+--- a/contrib/mod_sftp/kex.c
++++ b/contrib/mod_sftp/kex.c
+@@ -3778,7 +3778,7 @@
+     const unsigned char *hostkey_data, uint32_t hostkey_datalen,
+     const BIGNUM *k, unsigned char *client_curve25519,
+     unsigned char *server_curve25519, uint32_t *hlen) {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
+   EVP_MD_CTX ctx;
+ #endif /* prior to OpenSSL-1.1.0 */
+   EVP_MD_CTX *pctx;
+@@ -3822,7 +3822,7 @@
+   /* Shared secret */
+   sftp_msg_write_mpint(&buf, &buflen, k);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000LL
++#if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL)
+     pctx = EVP_MD_CTX_new();
+ #else
+     pctx = &ctx;
+@@ -3840,7 +3840,7 @@
+     BN_clear_free(kex->e);
+     kex->e = NULL;
+     pr_memscrub(ptr, bufsz);
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000LL
++# if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL)
+     EVP_MD_CTX_free(pctx);
+ # endif /* OpenSSL-1.1.0 and later */
+     return NULL;
+@@ -3856,7 +3856,7 @@
+     BN_clear_free(kex->e);
+     kex->e = NULL;
+     pr_memscrub(ptr, bufsz);
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000LL
++# if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL)
+     EVP_MD_CTX_free(pctx);
+ # endif /* OpenSSL-1.1.0 and later */
+     return NULL;
+@@ -3872,7 +3872,7 @@
+     BN_clear_free(kex->e);
+     kex->e = NULL;
+     pr_memscrub(ptr, bufsz);
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000LL
++# if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL)
+     EVP_MD_CTX_free(pctx);
+ # endif /* OpenSSL-1.1.0 and later */
+     return NULL;
+@@ -3881,7 +3881,7 @@
+   EVP_DigestFinal(pctx, kex_digest_buf, hlen);
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000LL
++#if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL)
+   EVP_MD_CTX_free(pctx);
+ #endif /* OpenSSL-1.1.0 and later */
+   BN_clear_free(kex->e);