pure-ftpd: Update to 1.0.47, enable tls (#1779)

diff --git a/packages/pure-ftpd/build.sh b/packages/pure-ftpd/build.sh
index 56e742afce57752d6c96f6197a9e6d5942bd2e26..859830c604ac52c1f79aa30d3631091bf0e7f827 100644 (file)
--- a/packages/pure-ftpd/build.sh
+++ b/packages/pure-ftpd/build.sh
@@ -1,15 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://www.pureftpd.org/project/pure-ftpd
 TERMUX_PKG_DESCRIPTION="Pure-FTPd is a free (BSD), secure, production-quality and standard-conformant FTP server"
 TERMUX_PKG_HOMEPAGE=https://www.pureftpd.org/project/pure-ftpd
 TERMUX_PKG_DESCRIPTION="Pure-FTPd is a free (BSD), secure, production-quality and standard-conformant FTP server"

-TERMUX_PKG_VERSION=1.0.46
+TERMUX_PKG_VERSION=1.0.47

 TERMUX_PKG_SRCURL=https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SRCURL=https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-$TERMUX_PKG_VERSION.tar.gz

-TERMUX_PKG_SHA256=0609807335aade4d7145abdbb5cb05c9856a3e626babe90658cb0df315cb0a5c
-TERMUX_PKG_DEPENDS="libcrypt"
+TERMUX_PKG_SHA256=4740c316f5df879a2d68464489fb9b8b90113fe7dce58e2cdd2054a4768f27ad
+TERMUX_PKG_DEPENDS="libcrypt, openssl"

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

+ac_cv_lib_elf_elf_begin=no
+ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no

 --with-ftpwho
 --with-minimal
 --with-nonroot
 --with-puredb
 --with-ftpwho
 --with-minimal
 --with-nonroot
 --with-puredb

-ac_cv_lib_elf_elf_begin=no
-ac_cv_lib_sodium_crypto_pwhash_scryptsalsa208sha256_str=no
+--with-tls

 "
 TERMUX_PKG_CONFFILES="etc/pure-ftpd.conf"
 "
 TERMUX_PKG_CONFFILES="etc/pure-ftpd.conf"

diff --git a/packages/pure-ftpd/src-ftpd.h.patch b/packages/pure-ftpd/src-ftpd.h.patch
new file mode 100644 (file)
index 0000000..43cbb00
--- /dev/null
+++ b/packages/pure-ftpd/src-ftpd.h.patch
@@ -0,0 +1,12 @@
+diff -u -r ../pure-ftpd-1.0.47/src/ftpd.h ./src/ftpd.h
+--- ../pure-ftpd-1.0.47/src/ftpd.h     2017-08-19 01:47:43.000000000 +0200
++++ ./src/ftpd.h       2017-11-13 00:02:42.291967297 +0100
+@@ -416,7 +416,7 @@
+ 
+ #ifdef WITH_TLS
+ # ifndef TLS_CONFDIR
+-#  define TLS_CONFDIR "/etc/ssl/private"
++#  define TLS_CONFDIR CONFDIR "/ssl/private"
+ # endif
+ # ifndef TLS_CERTIFICATE_FILE
+ #  define TLS_CERTIFICATE_FILE TLS_CONFDIR "/pure-ftpd.pem"