Merge pull request #8530 from vpeter4/proftpd-master

proftpd: update to 1.3.8b and addon (1), fix issues

packages/addons/service/proftpd/changelog.txt

@@ -1 +1,6 @@
+1
+- proftpd bumped to 1.3.8b
+  use TLS protocols v1.2 and v1.3
+  use 2048-bit key length for certificate
+
 initial release

packages/addons/service/proftpd/package.mk

@@ -3,9 +3,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="proftpd"
-PKG_VERSION="1.3.8"
-PKG_SHA256="f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748"
-PKG_REV="0"
+PKG_VERSION="1.3.8b"
+PKG_SHA256="183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.proftpd.org/"

packages/addons/service/proftpd/source/bin/proftpd.start

@@ -24,7 +24,7 @@ fi
 [ -z "$Debuglevel" ] && Debuglevel=0
 
 if [ ! -f "$ADDON_HOME/proftpd.cert.pem" -o ! -f "$ADDON_HOME/proftpd.key.pem" ]; then
-  openssl req -newkey rsa:1024 -config $ADDON_HOME/openssl.cnf -new -x509 -days "$CertTTL" -nodes -out "$ADDON_HOME/proftpd.cert.pem" -keyout "$ADDON_HOME/proftpd.key.pem"
+  openssl req -newkey rsa:${CertBitStrength} -config $ADDON_HOME/openssl.cnf -new -x509 -days "$CertTTL" -nodes -out "$ADDON_HOME/proftpd.cert.pem" -keyout "$ADDON_HOME/proftpd.key.pem"
 fi
 
 # Edit proftpd.conf with user settings
@@ -98,7 +98,6 @@ touch /var/config/proftpd.passwd
 chmod 700 /var/config/proftpd.passwd
 
 for NUM in $(seq 1 100); do
-
   USERNAME=$(eval echo \$Username${NUM})
   USERPASS=$(eval echo \$Userpass${NUM})
   USERPATH=$(eval echo \$Userpath${NUM})

packages/addons/service/proftpd/source/etc/proftpd.conf

@@ -46,8 +46,7 @@ PersistentPasswd off
 
 <IfModule mod_tls.c>
   TLSEngine on
-  # Support both SSLv3 and TLSv1
-  TLSProtocol SSLv3 TLSv1
+  TLSProtocol TLSv1.2 TLSv1.3
   TLSRequired off
   TLSVerifyClient off
   TLSOptions NoSessionReuseRequired

packages/addons/service/proftpd/source/system.d/service.proftpd.service

@@ -11,4 +11,4 @@ RestartSec=2
 StartLimitInterval=0
 
 [Install]
-WantedBy=kodi.target
+WantedBy=multi-user.target