Merge pull request #5394 from heitbaum/nt

network-tools: update addon to 109

packages/addons/addon-depends/network-tools-depends/irssi/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="irssi"
-PKG_VERSION="1.2.2"
-PKG_SHA256="6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578"
+PKG_VERSION="1.2.3"
+PKG_SHA256="a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.irssi.org/"
 PKG_URL="https://github.com/irssi/irssi/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/network-tools-depends/irssi/patches/001-irssi-1.2.2-glib-2-63.patch

@@ -1,38 +0,0 @@
-From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
-From: ailin-nemui <ailin-nemui@users.noreply.github.com>
-Date: Thu, 23 Apr 2020 21:45:15 +0200
-Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
-
-A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
-NUL / U+0000 is a valid Unicode character. This would occur when the
-user types Ctrl+Space. As a result, the input loop never manages to
-process the NUL-byte (and any other user input that follows, ever).
-
-This patch adds a manual check that properly advances the input loop if
-GLib returns -2 (incomplete character) despite the length being positive
-and a NUL is in first position.
-
-Fixes #1180
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
-https://gitlab.gnome.org/GNOME/glib/-/issues/2093
----
- src/fe-text/term-terminfo.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
-index 5235f72d2..78496a64f 100644
---- a/src/fe-text/term-terminfo.c
-+++ b/src/fe-text/term-terminfo.c
-@@ -672,7 +672,11 @@ void term_stop(void)
- 
- static int input_utf8(const unsigned char *buffer, int size, unichar *result)
- {
--	unichar c = g_utf8_get_char_validated((char *)buffer, size);
-+	unichar c = g_utf8_get_char_validated((char *) buffer, size);
-+
-+	/* GLib >= 2.63 do not accept Unicode NUL anymore */
-+	if (c == (unichar) -2 && *buffer == 0 && size > 0)
-+		c = 0;
- 
- 	switch (c) {
- 	case (unichar)-1:

packages/addons/addon-depends/network-tools-depends/lftp/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="lftp"
-PKG_VERSION="4.8.4"
-PKG_SHA256="4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62"
+PKG_VERSION="4.9.2"
+PKG_SHA256="c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d"
 PKG_LICENSE="GPLv3"
 PKG_SITE="http://lftp.yar.ru/"
 PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/network-tools-depends/lftp/patches/lftp-0001-link-readline-with-termcap.patch

@@ -1,12 +1,12 @@
 diff -Naur a/configure b/configure
 --- a/configure	2016-11-16 05:11:30.000000000 -0800
-+++ b/configure	2016-11-19 11:21:25.384243165 -0800
-@@ -48854,7 +48854,7 @@
- 	    readline_include_dir="$readline_include_dir/readline"
++++ b/configure	2021-04-17 14:18:59.000000000 +0000
+@@ -55428,7 +55428,7 @@
  	fi
          readline_ld_flags="-L$readline_prefix/lib"
+         if test -z "$readline_lib_flags"; then
 -            readline_lib_flags="-lreadline"
 +            readline_lib_flags="-lreadline -lncurses"
+         fi
          run_readline_test="yes"
      elif test "$readline_requested" = "yes"; then
-         if test -n "$readline_include_dir" -a -n "$readline_lib_flags"; then

packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rar2fs"
-PKG_VERSION="1.29.3"
-PKG_SHA256="e813ad62cccdc6081f00c081eb09b435e6ed58422a8f83e222e1aa9d7a0f0866"
+PKG_VERSION="1.29.5"
+PKG_SHA256="a56e9f2fd3d5037087b8405cff85ce7ffb74a904176f33f55b7bd15117cff2be"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/hasse69/rar2fs"
 PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz"

packages/addons/tools/network-tools/changelog.txt

@@ -1,3 +1,8 @@
+109
+- irssi: update to 1.2.3
+- lftp: update to 4.9.2
+- rar2fs: update to 1.29.5
+
 108
 - bwm-ng: update to 0.6.3
 - iftop: update to 2018-10-03

packages/addons/tools/network-tools/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="network-tools"
 PKG_VERSION="1.0"
-PKG_REV="108"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"