From b83a51da813e8ca1d15529e76c3815955b22f761 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 1 Jul 2022 21:49:06 +0000
Subject: [PATCH 1/5] net-snmp: update to 5.9.2

---
 packages/addons/service/net-snmp/changelog.txt | 3 +++
 packages/addons/service/net-snmp/package.mk    | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/addons/service/net-snmp/changelog.txt b/packages/addons/service/net-snmp/changelog.txt
index 28a87947d3..926829b3fc 100644
--- a/packages/addons/service/net-snmp/changelog.txt
+++ b/packages/addons/service/net-snmp/changelog.txt
@@ -1,3 +1,6 @@
+110
+- update to 5.9.2
+
 109
 - update to 5.9.1
 
diff --git a/packages/addons/service/net-snmp/package.mk b/packages/addons/service/net-snmp/package.mk
index a3a0fbbcc7..9df9011002 100644
--- a/packages/addons/service/net-snmp/package.mk
+++ b/packages/addons/service/net-snmp/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="net-snmp"
-PKG_VERSION="5.9.1"
-PKG_SHA256="eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f"
-PKG_REV="109"
+PKG_VERSION="5.9.2"
+PKG_SHA256="21e86b06c8b54639f915781c9bf6433a79da5b7aa109087ea47a9b5378a6c5fd"
+PKG_REV="110"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.net-snmp.org"

From 50c8ed1a1396cb3c6504a528901932d162efcc99 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Tue, 29 Jun 2021 06:19:49 +0000
Subject: [PATCH 2/5] proftpd: drop use of basename

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 packages/addons/service/proftpd/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/service/proftpd/package.mk b/packages/addons/service/proftpd/package.mk
index b9ed69df8a..8763b48987 100644
--- a/packages/addons/service/proftpd/package.mk
+++ b/packages/addons/service/proftpd/package.mk
@@ -54,6 +54,6 @@ addon() {
 
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/locale
     for i in ${PKG_INSTALL}/storage/.kodi/addons/${PKG_ADDON_ID}/locale/*; do
-      cp ${i}/LC_MESSAGES/proftpd.mo ${ADDON_BUILD}/${PKG_ADDON_ID}/locale/$(basename ${i}).mo
+      cp ${i}/LC_MESSAGES/proftpd.mo ${ADDON_BUILD}/${PKG_ADDON_ID}/locale/${i##*/}.mo
     done
 }

From de1b3c3b4d1082d7ac8450de8fdf56c31e619833 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Tue, 29 Jun 2021 06:35:15 +0000
Subject: [PATCH 3/5] proftpd: replace mkpasswd with python

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 packages/addons/service/proftpd/package.mk     |  4 +---
 .../service/proftpd/source/bin/proftpd.start   | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/addons/service/proftpd/package.mk b/packages/addons/service/proftpd/package.mk
index 8763b48987..564d2061e3 100644
--- a/packages/addons/service/proftpd/package.mk
+++ b/packages/addons/service/proftpd/package.mk
@@ -10,7 +10,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.proftpd.org/"
 PKG_URL="https://github.com/proftpd/proftpd/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libcap openssl ncurses pcre whois"
+PKG_DEPENDS_TARGET="toolchain libcap openssl ncurses pcre"
 PKG_SECTION="service"
 PKG_SHORTDESC="ProFTPD: a FTP server for linux"
 PKG_LONGDESC="ProFTPD (${PKG_VERSION}): is a secure and configurable FTP server with SSL/TLS support"
@@ -50,8 +50,6 @@ addon() {
     cp ${PKG_INSTALL}/usr/bin/ftpwho ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
     cp ${PKG_INSTALL}/usr/bin/ftptop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 
-    cp $(get_install_dir whois)/usr/bin/mkpasswd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/locale
     for i in ${PKG_INSTALL}/storage/.kodi/addons/${PKG_ADDON_ID}/locale/*; do
       cp ${i}/LC_MESSAGES/proftpd.mo ${ADDON_BUILD}/${PKG_ADDON_ID}/locale/${i##*/}.mo
diff --git a/packages/addons/service/proftpd/source/bin/proftpd.start b/packages/addons/service/proftpd/source/bin/proftpd.start
index 234ff8f493..d1dcc1907f 100755
--- a/packages/addons/service/proftpd/source/bin/proftpd.start
+++ b/packages/addons/service/proftpd/source/bin/proftpd.start
@@ -4,6 +4,7 @@
 # Copyright (C) 2012 x23
 # Copyright (C) 2009-2013 Stephan Raue (stephan@openelec.tv)
 # Copyright (C) 2012-2015 ultraman
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 . /etc/profile
 
@@ -25,7 +26,7 @@ fi
 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"
 fi
-  
+
 # Edit proftpd.conf with user settings
 if [ "$TLSEngine" = "false" ]; then
   sed -i 's/TLSEngine.*/TLSEngine off/g' $ADDON_HOME/proftpd.conf
@@ -91,24 +92,25 @@ fi
 
 cd "$ADDON_DIR/bin"
 
-case "$CryptoHash" in
-  "0") CryptoHash="sha-512"; SALTLength="16";;
-  "1") CryptoHash="sha-256"; SALTLength="16";;
-  "2") CryptoHash="md5";     SALTLength="8";;
-esac
-
 mkdir -p /var/config/
 rm -f /var/config/proftpd.passwd
 touch /var/config/proftpd.passwd
 chmod 700 /var/config/proftpd.passwd
 
 for NUM in $(seq 1 100); do
+
+  case "$CryptoHash" in
+    "0") password_salt=$(python -c "import crypt; print(crypt.mksalt(crypt.METHOD_SHA512))");;
+    "1") password_salt=$(python -c "import crypt; print(crypt.mksalt(crypt.METHOD_SHA256))");;
+    "2") password_salt=$(python -c "import crypt; print(crypt.mksalt(crypt.METHOD_MD5))");;
+  esac
+
   USERNAME=$(eval echo \$Username${NUM})
   USERPASS=$(eval echo \$Userpass${NUM})
   USERPATH=$(eval echo \$Userpath${NUM})
 
   if [ -n "$USERNAME" ]; then
-    echo $USERNAME:$(./mkpasswd --hash=$CryptoHash --salt=$(cat /dev/urandom | tr -cd "[:alnum:]" | head -c $SALTLength) $USERPASS):10:10::$USERPATH:/bin/false >> /var/config/proftpd.passwd
+    echo $USERNAME:$(python -c "import crypt; print(crypt.crypt('${USERPASS}', '${password_salt}'))"):10:10::$USERPATH:/bin/false >> /var/config/proftpd.passwd
     # user writes with different user/group
     mkdir -p "$USERPATH"
     chmod 777 "$USERPATH"

From 55440d187efb787b2b32daaf0981c42be8e2df17 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 8 Mar 2022 04:23:56 +0000
Subject: [PATCH 4/5] whois: drop package

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 .../addons/addon-depends/whois/package.mk     | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 packages/addons/addon-depends/whois/package.mk

diff --git a/packages/addons/addon-depends/whois/package.mk b/packages/addons/addon-depends/whois/package.mk
deleted file mode 100644
index fe1b23e9c9..0000000000
--- a/packages/addons/addon-depends/whois/package.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="whois"
-PKG_VERSION="5.5.11"
-PKG_SHA256="e0e051773df982f12d000566b5eea433f7055b965f76bb6febda04ba5bf213fa"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.linux.it/~md/software/"
-PKG_URL="https://github.com/rfc1036/whois/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="A tool that queries the whois directory service for information pertaining to a particular domain name."
-PKG_BUILD_FLAGS="-sysroot"
-
-make_target() {
-  make mkpasswd
-}
-
-makeinstall_target() {
-  make install BASEDIR=${INSTALL}
-}

From f4acb2992d4bc72b5d9f737bd91ffcc79b00c2f0 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 6 May 2022 06:01:40 +0000
Subject: [PATCH 5/5] addons/proftpd: update to 1.3.7e, use python for password
 hash gen

new and release notes:
- http://www.proftpd.org/docs/RELEASE_NOTES-1.3.7d
- http://www.proftpd.org/docs/NEWS-1.3.7d
- http://www.proftpd.org/docs/RELEASE_NOTES-1.3.7e
- http://www.proftpd.org/docs/NEWS-1.3.7e

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 packages/addons/service/proftpd/changelog.txt | 8 ++++++++
 packages/addons/service/proftpd/package.mk    | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/addons/service/proftpd/changelog.txt b/packages/addons/service/proftpd/changelog.txt
index 0c892ea3d7..c95e3e2d7e 100644
--- a/packages/addons/service/proftpd/changelog.txt
+++ b/packages/addons/service/proftpd/changelog.txt
@@ -1,3 +1,11 @@
+106
+- update to proftpd 1.3.7e
+- generate password hashes with python
+- drop whois requirement
+
+105
+- not released for LibreELEC 10
+
 104
 - update to proftpd 1.3.7c
 - update to whois 5.5.11
diff --git a/packages/addons/service/proftpd/package.mk b/packages/addons/service/proftpd/package.mk
index 564d2061e3..b8ffc682bb 100644
--- a/packages/addons/service/proftpd/package.mk
+++ b/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.7c"
-PKG_SHA256="7070968b9b6cf614ce7f756c8c1a66c32c1afa4f961784a62301790a801400da"
-PKG_REV="104"
+PKG_VERSION="1.3.7e"
+PKG_SHA256="6e716a3b53ee069290399fce6dccf4c229fafe6ec2cb14db3778b7aa3f9a8c92"
+PKG_REV="106"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.proftpd.org/"