Merge pull request #7352 from heitbaum/binaries10

pvr.vuplus: update 19.0.0-Matrix to 19.0.1-Matrix

config/functions

@@ -741,8 +741,15 @@ check_project() {
 
 check_device() {
   local dashes="===========================" device_err_msg
-  if [ \( -z "${DEVICE}" -a -d "${PROJECT_DIR}/${PROJECT}/devices" \) -o \
-       \( -n "${DEVICE}" -a ! -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}" \) ]; then
+  if [ -n "${DEVICE}" -a ! -d "${PROJECT_DIR}/${PROJECT}/devices" ]; then
+    device_err_msg="\n $dashes$dashes$dashes"
+    device_err_msg="${device_err_msg}\n ERROR: You must not specify DEVICE for the $PROJECT project"
+    device_err_msg="${device_err_msg}\n $dashes$dashes$dashes"
+    device_err_msg="${device_err_msg}\n\n There are no devices for project: ${PROJECT}"
+
+    die "${device_err_msg}"
+  elif [ \( -z "${DEVICE}" -a -d "${PROJECT_DIR}/${PROJECT}/devices" \) -o \
+         \( -n "${DEVICE}" -a ! -d "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}" \) ]; then
     device_err_msg="\n $dashes$dashes$dashes"
     device_err_msg="${device_err_msg}\n ERROR: You need to specify a valid device for the $PROJECT project"
     device_err_msg="${device_err_msg}\n $dashes$dashes$dashes"

distributions/LibreELEC/options

@@ -87,6 +87,9 @@
 # build and install PulseAudio support (yes / no)
   PULSEAUDIO_SUPPORT="yes"
 
+# build and install eSpeak-NG support (yes / no)
+  ESPEAK_SUPPORT="no"
+
 # build and install with BluRay support (yes / no)
   KODI_BLURAY_SUPPORT="yes"
 

licenses/NextPVR.txt

@@ -0,0 +1,17 @@
+Software License Agreement for NextPVR
+
+IMPORTANT- PLEASE READ CAREFULLY BEFORE USING THIS SOFTWARE: THIS LICENSE AGREEMENT FOR NextPVR ("LICENSE AGREEMENT") IS A LEGAL AGREEMENT BETWEEN YOU (EITHER ON BEHALF OF YOURSELF AS AN INDIVIDUAL OR ON BEHALF OF AN ENTITY AS ITS AUTHORIZED REPRESENTATIVE) AND PINSTRIPE LIMITED. FOR THE NextPVR SOFTWARE ("SOFTWARE"). THIS LICENSE AGREEMENT FOR NextPVR SUPERSEDES PREVIOUS VERSIONS. BY INSTALLING THE SOFTWARE (AS DEFINED BELOW), COPYING OR OTHERWISE USING THE SOFTWARE YOU AGREE TO BE BOUND BY ALL OF THE TERMS OF THIS END USER LICENSE AGREEMENT REGARDING YOUR USE OF THE SOFTWARE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE AGREEMENT, UNINSTALL THE SOFTWARE, AND DO NOT COPY OR OTHERWISE USE THE SOFTWARE.
+
+GRANT OF LICENSE: Subject to the following terms, PINSTRIPE LIMITED hereby grants you a non-exclusive, perpetual, non-transferable license to install and to use the NextPVR software ("Software") for personal, non-commercial use. You may copy the Software for back-up or archival purposes.
+
+LICENSE RESTRICTIONS: You may not: (i) reverse engineer, decompile, or disassemble the Software; (ii) modify, or create derivative works based upon, the Software in whole or in part; (iii) distribute copies of the Software; (iv) remove any proprietary notices or labels on the Software; or (v) resell, lease, rent, transfer, sublicense, or otherwise transfer rights to the Software. You agree that the NextPVR software will not be used for commercial purposes without full written permission. Any such forbidden use shall immediately terminate your license to the software.
+
+TITLE: You agree that no title to the intellectual property in the Software is transferred to you. Title, ownership, rights, and intellectual property rights in and to the Software shall remain in PINSTRIPE LIMITED.
+
+UPDATES: From time to time, PINSTRIPE LIMITED may make updates to the Software generally available. You may download and install these software updates released by PINSTRIPE LIMITED. All updates to the Software shall be governed by this Agreement, unless other license terms are provided with the update. Under the Software's default configuration, if you are connected to the Internet, the Software is enabled by default to query latest version of Software and display if updates are available. You may choose to switch this version check off and not use it.
+
+TECHNICAL SUPPORT: Technical support for the software, as made available by PINSTRIPE LIMITED, is available on the web site at: http://www.nextpvr.com
+
+DISCLAIMER OF WARRANTY: The Software is provided to you at minimal charge. ACCORDINGLY, YOU AGREE THAT PINSTRIPE LIMITED HAS MADE NO EXPRESS WARRANTIES, ORAL OR WRITTEN, TO YOU REGARDING THE SOFTWARE AND THAT THE SOFTWARE IS BEING PROVIDED TO YOU "AS IS" WITHOUT WARRANTY OF ANY KIND. PINSTRIPE LIMITED DISCLAIMS ANY AND ALL OTHER WARRANTIES, WHETHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF NONINFRINGEMENT OF THIRD PARTY RIGHTS, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE. PINSTRIPE LIMITED SHALL NOT BE LIABLE FOR INDIRECT, INCIDENTAL, SPECIAL, COVER, RELIANCE, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, LOSS OF ANTICIPATED PROFIT) ARISING FROM ANY CAUSE UNDER OR RELATED TO THIS AGREEMENT.
+
+LIMITATION OF LIABILITY: You must assume the entire risk of using the program. IN NO EVENT SHALL PINSTRIPE LIMITED BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING ANY LOST PROFITS, LOST SAVINGS, OR OTHER INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND ARISING OUT OF THE USE OF THE PINSTRIPE LIMITED SOFTWARE, EVEN IF PINSTRIPE LIMITED HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN NO EVENT WILL PINSTRIPE LIMITED'S LIABILITY FOR ANY CLAIM, WHETHER IN CONTRACT, TORT, OR ANY OTHER THEORY OF LIABILITY, EXCEED THE LICENSE FEE PAID BY YOU, PROVIDED, HOWEVER, IF THE RELEVANT SOFTWARE WAS PROVIDED TO YOU AT NO CHARGE YOU AGREE PINSTRIPE LIMITED SHALL NOT BE LIABLE TO YOU FOR ANY DAMAGES. THIS LIMITATION SHALL APPLY TO CLAIMS OF PERSONAL INJURY TO THE EXTENT PERMITTED BY LAW.

packages/addons/addon-depends/ccid/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ccid"
-PKG_VERSION="1.4.34"
-PKG_SHA256="e6f7645b59a9a2844eb4b1a7eff512960d7f04a4654af02f7fd2f8aded5db40a"
+PKG_VERSION="1.5.1"
+PKG_SHA256="e7a78c398ec0d617a4f98bac70d5b64f78689284dd0ae87d4692e2857f117377"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://ccid.apdu.fr"
 PKG_URL="https://ccid.apdu.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk

@@ -3,16 +3,16 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="at-spi2-core"
-PKG_VERSION="2.40.3"
-PKG_SHA256="e49837c2ad30d71e1f29ca8e0968a54b95030272f7ff40b89b48968653f37a5c"
+PKG_VERSION="2.42.0"
+PKG_SHA256="4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gnome.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst"
 PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi."
 
-PKG_MESON_OPTS_TARGET="-Denable_docs=false \
-                       -Denable-introspection=no \
+PKG_MESON_OPTS_TARGET="-Ddocs=false \
+                       -Dintrospection=no \
                        -Ddbus_daemon=/usr/bin/dbus-daemon"
 
 pre_configure_target() {

packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk

@@ -9,10 +9,6 @@ PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libxkbcommon"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_MESON_OPTS_TARGET="${PKG_MESON_OPTS_TARGET} \
-                           -Denable-static=false \
-                           -Denable-shared=true"
-
 unpack() {
   mkdir -p ${PKG_BUILD}
   tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}

packages/addons/addon-depends/chrome-depends/cups/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cups"
-PKG_VERSION="2.3.3"
-PKG_SHA256="fe298713aad0cbb861de24760f140851122caae9f34d480dbfff0bd9211d961a"
+PKG_VERSION="2.3.3op2"
+PKG_SHA256="5d7dc1f05cde3d5c31d3a2b3b54d519ca74e42c1b25df1add9a1802cd13c65ad"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cups.org"
-PKG_URL="https://github.com/apple/cups/archive/v${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl zlib"
 PKG_LONGDESC="CUPS printing system."
 PKG_BUILD_FLAGS="+pic -sysroot"

packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk

@@ -13,6 +13,6 @@ PKG_DEPENDS_CONFIG="shared-mime-info"
 PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation."
 
 PKG_MESON_OPTS_TARGET="-Ddocs=false \
-                       -Dgir=false \
+                       -Dintrospection=disabled \
                        -Dman=false \
                        -Drelocatable=false"

packages/addons/addon-depends/chrome-depends/pango/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pango"
-PKG_VERSION="1.49.1"
-PKG_SHA256="c4266dc06c01bf0133d3815502426d209de5ea7abd895899e73e7edebaf48f6f"
+PKG_VERSION="1.49.3"
+PKG_SHA256="45c403b89910a121ad8eb6d57b5be1d8f19499d39b686435dc6f29b106d2be93"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.pango.org/"
 PKG_URL="https://download.gnome.org/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz"
@@ -14,5 +14,5 @@ PKG_LONGDESC="The Pango library for layout and rendering of internationalized te
 PKG_TOOLCHAIN="meson"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_MESON_OPTS_TARGET="-Denable_docs=false \
-                       -Dgir=false"
+PKG_MESON_OPTS_TARGET="-Dgtk_doc=false \
+                       -Dintrospection=disabled"

packages/addons/addon-depends/containerd/package.mk

@@ -3,17 +3,17 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="containerd"
-PKG_VERSION="1.3.9"
-PKG_SHA256="9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0"
+PKG_VERSION="1.6.6"
+PKG_SHA256="27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24"
 PKG_LICENSE="APL"
-PKG_SITE="https://containerd.tools/"
+PKG_SITE="https://containerd.io"
 PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_LONGDESC="A daemon to control runC, built for performance and density."
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/containerd/containerd/releases
-PKG_GIT_COMMIT="8fba4e9a7d01810a393d5d25a3621dc101981175"
+PKG_GIT_COMMIT="10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1"
 
 pre_make_target() {
 

packages/addons/addon-depends/dotnet-runtime-depends/aspnet5-runtime/package.mk

@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="aspnet5-runtime"
-PKG_VERSION="5.0.7"
-PKG_LICENSE="MIT"
-PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="ASP.NET Core Runtime enables you to run existing web/server applications."
-PKG_TOOLCHAIN="manual"
-
-case "${ARCH}" in
-  "aarch64")
-    PKG_SHA256="219f233d4e23e2381d93dc99a7cbdbe55c55e45da2e025b5d139d1338d11d62a"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d0a22fa3-b916-49ce-8284-97131b424cb3/cb884163ad34b83f1ae1dbd33e09d77a/aspnetcore-runtime-5.0.7-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_SHA256="c14e64527f2bf7356d1de154132a07b86de4a30c62129e138f3ca95a43c2dd54"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/2f690848-1342-4768-a7d7-45fa476a4a22/50dd1c50ed7864140b04fec057bb8bd6/aspnetcore-runtime-5.0.7-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_SHA256="22f9f93b4d6a00e76980918b721f7f62654421d7582d486e830ec478c365707c"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d6be94b3-458f-43c4-8bb5-9ba261de8c9c/bbe13b54208d088b5fdf428759b5bc0a/aspnetcore-runtime-5.0.7-linux-x64.tar.gz"
-    ;;
-esac
-PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="aspnet6-runtime"
+PKG_VERSION="6.0.12"
+PKG_LICENSE="MIT"
+PKG_SITE="https://dotnet.microsoft.com/"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="ASP.NET Core Runtime enables you to run existing web/server applications."
+PKG_TOOLCHAIN="manual"
+
+case "${ARCH}" in
+  "aarch64")
+    PKG_SHA256="0090d031615b7d49855186cff7e4cbc99636ba664880780f84ce0d5ce25e4b0b"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/8072e219-57e4-48c3-b138-2b4067844ab2/b0712ad06fd0740963bf4ba2eff7f5ea/aspnetcore-runtime-6.0.12-linux-arm64.tar.gz"
+    ;;
+  "arm")
+    PKG_SHA256="2131903c85087017ec680e44676c4eb46e7bd0a12f0683c2a7790ec75b243d75"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/57b2bdaf-8455-4b1a-b25b-5950c950bd38/471d6de036e6f367f3a4aae5252d885a/aspnetcore-runtime-6.0.12-linux-arm.tar.gz"
+    ;;
+  "x86_64")
+    PKG_SHA256="dd60c551d63eb66cd9bdc7ef223c00f49341e67f8ddda2e4ab412c3ee8997765"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4ba0f30d-0a77-4997-8d8d-1b113d60253b/5caeeb07572b0b6a26f2a82f7a4eb31d/aspnetcore-runtime-6.0.12-linux-x64.tar.gz"
+    ;;
+esac
+PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

packages/addons/addon-depends/dotnet-runtime-depends/dotnet3-runtime/package.mk

@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="dotnet3-runtime"
-PKG_VERSION="3.1.16"
-PKG_LICENSE="MIT"
-PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="ASP.NET Core Runtime runs applications built with .NET Core, a cross-platform .NET implementation."
-PKG_TOOLCHAIN="manual"
-
-case "${ARCH}" in
-  "aarch64")
-    PKG_SHA256="b76c049484efd86466d2e1cd88994521633c399d090adb1c6804128603816abe"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/64353333-3080-45f7-a3d5-33e391e4596c/e9d5d53cb318628485e8d1fbd26ec30d/aspnetcore-runtime-3.1.16-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_SHA256="a0163cd5c5ceae228bfffb40053f3509e155a110c23e81c38705757a870e24cc"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/bd734390-3b5f-402a-826f-e0eae538b8ba/5914dd937ede96cb9297e6e7a80f46f3/aspnetcore-runtime-3.1.16-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_SHA256="b1a2f61d8a49e2a3ca5eb9daa103b83eb49ea1bcf14914560e601222e94a3022"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/c20a5ac5-5174-46b8-a875-b916a416050d/b2ddd212a183260569178d880899bd94/aspnetcore-runtime-3.1.16-linux-x64.tar.gz"
-    ;;
-esac
-PKG_SOURCE_NAME="aspnetcore3-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

packages/addons/addon-depends/dotnet-runtime-depends/dotnet5-runtime/package.mk

@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="dotnet5-runtime"
-PKG_VERSION="5.0.7"
-PKG_LICENSE="MIT"
-PKG_SITE="https://dotnet.microsoft.com/"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC=".NET Runtime runs applications built with .NET Core, a cross-platform .NET implementation."
-PKG_TOOLCHAIN="manual"
-
-case "${ARCH}" in
-  "aarch64")
-    PKG_SHA256="375956c3d326f5030a1eff2cafdba8b994ed0e1b87db2dd812ce17e0bca5fb27"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/a9a37d9f-6158-43a4-a610-f0f9e8c2cb73/c69c6d22c668cb09b2d00bea8209335b/dotnet-runtime-5.0.7-linux-arm64.tar.gz"
-    ;;
-  "arm")
-    PKG_SHA256="fcc811f37cb6914bf3aa1c96040b1a46fad42939e6b1e1e7e0f513a9be1de680"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/09a24e9f-0096-454a-b761-70cdf9504775/eafe9578bbedd15c9319b7580d5a20d9/dotnet-runtime-5.0.7-linux-arm.tar.gz"
-    ;;
-  "x86_64")
-    PKG_SHA256="ed864299f0e736f9d284b655e62d8a29aee97c14741ef8baf13d5ff493f83a47"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/f229fc63-747e-46c8-89ac-88563c2e0b7d/8e59115deda958a26e1546f603cbad9a/dotnet-runtime-5.0.7-linux-x64.tar.gz"
-    ;;
-esac
-PKG_SOURCE_NAME="dotnet-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

packages/addons/addon-depends/faad2/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="faad2"
-PKG_VERSION="2.10.0"
-PKG_SHA256="0c6d9636c96f95c7d736f097d418829ced8ec6dbd899cc6cc82b728480a84bfb"
+PKG_VERSION="2.10.1"
+PKG_SHA256="4c16c71295ca0cbf7c3dfe98eb11d8fa8d0ac3042e41604cfd6cc11a408cf264"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/knik0/faad2/"
-PKG_URL="https://github.com/knik0/faad2/archive/${PKG_VERSION//./_}.tar.gz"
+PKG_URL="https://github.com/knik0/faad2/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="An MPEG-4 AAC decoder."
 PKG_TOOLCHAIN="configure"

packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libvpx"
-PKG_VERSION="1.10.0"
-PKG_SHA256="85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a"
+PKG_VERSION="1.11.0"
+PKG_SHA256="965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.webmproject.org"
 PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/ffmpegx/package.mk

@@ -7,7 +7,7 @@ PKG_SHA256="06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain aom bzip2 gnutls lame libvorbis opus x264 x265 zlib"
+PKG_DEPENDS_TARGET="toolchain aom bzip2 gnutls lame libvorbis opus x264 zlib"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
 PKG_BUILD_FLAGS="-gold -sysroot"
 
@@ -99,6 +99,12 @@ pre_configure_target() {
     --enable-libxcb-shm \
     --enable-libxcb-xfixes \
     --enable-libxcb-shape"
+  else
+    PKG_FFMPEG_X11_GRAB="\
+    --disable-libxcb \
+    --disable-libxcb-shm \
+    --disable-libxcb-xfixes \
+    --disable-libxcb-shape"
   fi
 }
 

packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="linuxconsoletools"
-PKG_VERSION="1.7.1"
-PKG_SHA256="bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547"
+PKG_VERSION="1.8.1"
+PKG_SHA256="4da29745c782b7db18f5f37c49e77bf163121dd3761e2fc7636fa0cbf35c2456"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sourceforge.net/projects/linuxconsole/"
 PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

packages/addons/addon-depends/game-tools/linuxconsoletools/patches/linuxconsoletools-0001-disable-building-ffmvforce.patch

@@ -1,12 +1,12 @@
 diff -Naur a/utils/Makefile b/utils/Makefile
---- a/utils/Makefile	2016-04-19 13:20:50.000000000 -0700
-+++ b/utils/Makefile	2016-10-20 00:31:34.238941511 -0700
-@@ -27,7 +27,7 @@
+--- a/utils/Makefile	2022-05-21 09:44:47.000000000 +0000
++++ b/utils/Makefile	2022-05-21 18:58:51.363206817 +0000
+@@ -37,7 +37,7 @@
+ endif
  
- CFLAGS		?= -g -O2 -Wall
- 
--PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS	= inputattach jstest jscal fftest ffset \
- 		  ffcfstress jscal-restore jscal-store evdev-joystick
+ ifndef DISABLE_FORCEFEEDBACK
+-PROGRAMS	+= fftest ffmvforce ffset ffcfstress
++PROGRAMS	+= fftest ffset ffcfstress
+ endif
  
  PREFIX          ?= /usr/local

packages/addons/addon-depends/go/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="go"
-PKG_VERSION="1.16.6"
-PKG_SHA256="498cd89c5c965ea2f2e23eef589e0a2dcb4b94f31c3f7dac575d4c35ae89caf7"
+PKG_VERSION="1.19.2"
+PKG_SHA256="8763d8e6bb595c3e2ad383e591f3009401df38ff682ef66b84efbe3ec62cf5f3"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/jre-depends/apache-ant/package.mk

@@ -7,7 +7,7 @@ PKG_VERSION="1.10.11"
 PKG_SHA256="baa049855cdecbefa62539555824058e52412e5ebe8f102e1db944cb762e06d9"
 PKG_LICENSE="Apache License 2.0"
 PKG_SITE="https://ant.apache.org/"
-PKG_URL="https://downloads.apache.org/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"
+PKG_URL="https://archive.apache.org/dist/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"
 PKG_DEPENDS_UNPACK="jdk-x86_64-zulu"
 PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software."
 PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/libmpdclient/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmpdclient"
-PKG_VERSION="2.19"
-PKG_SHA256="158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189"
+PKG_VERSION="2.20"
+PKG_SHA256="18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/libmpdclient/2/libmpdclient-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/libnetwork/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libnetwork"
-PKG_VERSION="a543cbc4871f904b0efe205708eb45d72e65fd8b"
-PKG_SHA256="3e3b0048aa468de0fe33ad2c08bf3891ac1a72fca434f92620312da51f344488"
+PKG_VERSION="339b972b464ee3d401b5788b2af9e31d09d6b7da" # 2022-03-16
+PKG_SHA256="335851e924078a8e274f0c27cb80aaba32d0c1059068740496f1eb31b55a6ec4"
 PKG_LICENSE="APL"
 PKG_SITE="https://github.com/docker/libnetwork"
 PKG_URL="https://github.com/docker/libnetwork/archive/${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/libzip/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libzip"
-PKG_VERSION="1.7.3"
-PKG_SHA256="a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132"
+PKG_VERSION="1.8.0"
+PKG_SHA256="f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libzip.org/"
 PKG_URL="https://libzip.org/download/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/libzip/patches/libzip-001-fix-typo-which-prevents-expansion-of-libdir-in-pkgconfig.patch

@@ -0,0 +1,105 @@
+From ca61524e05d785f0d14f40802c6a1a54a46b74bb Mon Sep 17 00:00:00 2001
+From: rezso <rezso@rezso.net>
+Date: Sat, 19 Jun 2021 01:50:26 +0200
+Subject: [PATCH] CMakeLists.txt: add missing regex for zstd
+
+Currently cmake provides an pc file with:
+Libs.private:  -lbz2 -llzma -lZstd::Zstd -lz
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 93b46a61..defc8745 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -299,6 +299,7 @@ foreach(LIB ${LIBS_PRIVATE})
+ endforeach()
+ string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS})
+ string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS})
++string(REGEX REPLACE "-lZstd::Zstd" "-lzstd" LIBS ${LIBS})
+ string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS})
+ string(REGEX REPLACE "-lZLIB::ZLIB" "-lz" LIBS ${LIBS})
+ string(REGEX REPLACE "-lGnuTLS::GnuTLS" "-lgnutls" LIBS ${LIBS})
+
+From c4af9182efd9cbb127bb43486b55d9ddf4a521ca Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Mon, 28 Jun 2021 11:52:15 +0200
+Subject: [PATCH] Try having relative paths in pkg-config file.
+
+Addresses #248
+---
+ CMakeLists.txt | 11 ++++++-----
+ libzip.pc.in   |  7 +++----
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8611a405..93f89df1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -281,11 +281,12 @@ endif()
+ 
+ 
+ # pkgconfig file
+-set(prefix ${CMAKE_INSTALL_PREFIX})
+-set(exec_prefix \${prefix})
+-SET(bindir ${CMAKE_INSTALL_FULL_BINDIR})
+-SET(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
+-SET(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
++file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR})
++set(bindir "\${prefix}/${pc_relative_bindir}")
++file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR})
++set(libdir "\${prefix)/${pc_relative_libdir}")
++file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
++set(includedir "\${prefix}/${pc_relative_includedir}")
+ if(CMAKE_SYSTEM_NAME MATCHES BSD)
+   set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
+ endif(CMAKE_SYSTEM_NAME MATCHES BSD)
+diff --git a/libzip.pc.in b/libzip.pc.in
+index 58b3dca7..d51b0ab6 100644
+--- a/libzip.pc.in
++++ b/libzip.pc.in
+@@ -1,10 +1,10 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
+ bindir=@bindir@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-zipcmp=@bindir@/zipcmp
++zipcmp=${bindir}/zipcmp
+ 
+ Name: libzip
+ Description: library for handling zip archives
+@@ -12,4 +12,3 @@ Version: @PROJECT_VERSION@
+ Libs: @PKG_CONFIG_RPATH@ -L${libdir} -lzip
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
+-
+
+From 28951cbf403ea3a788f823377bbc171d1e1359ba Mon Sep 17 00:00:00 2001
+From: Michael Heimpold <mhei@heimpold.de>
+Date: Sat, 3 Jul 2021 00:04:14 +0200
+Subject: [PATCH] Fix typo which prevents expansion of libdir in pkgconfig
+ files
+
+Signed-off-by: Michael Heimpold <mhei@heimpold.de>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 93f89df1..2fb87165 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -284,7 +284,7 @@ endif()
+ file(RELATIVE_PATH pc_relative_bindir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_BINDIR})
+ set(bindir "\${prefix}/${pc_relative_bindir}")
+ file(RELATIVE_PATH pc_relative_libdir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR})
+-set(libdir "\${prefix)/${pc_relative_libdir}")
++set(libdir "\${prefix}/${pc_relative_libdir}")
+ file(RELATIVE_PATH pc_relative_includedir ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+ set(includedir "\${prefix}/${pc_relative_includedir}")
+ if(CMAKE_SYSTEM_NAME MATCHES BSD)

packages/addons/addon-depends/mpd-mpc/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpd-mpc"
-PKG_VERSION="0.33"
-PKG_SHA256="4f40ccbe18f5095437283cfc525a97815e983cbfd3a29e48ff610fa4f1bf1296"
+PKG_VERSION="0.34"
+PKG_SHA256="691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmediainfo"
-PKG_VERSION="21.03"
-PKG_SHA256="56b7e9abf80cba48032165cd7a46fd8d43dd63e3af35765f66c3f134caaca4ca"
+PKG_VERSION="22.09"
+PKG_SHA256="b394d48285730cda53a41f41c82fd5ebf074c7158e1d6d4543777bfde0aa6927"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mediaarea.net/en/MediaInfo/Download/Source"
 PKG_URL="https://mediaarea.net/download/source/libmediainfo/${PKG_VERSION}/libmediainfo_${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mediainfo"
-PKG_VERSION="21.03"
-PKG_SHA256="de50ca0b2c607b8999d3c9e542d27c97030a59f31859b612335315be6850021e"
+PKG_VERSION="22.09"
+PKG_SHA256="67f301276a2b82d76cb9f4bd525caa51d2dc6d4359fce774fbd5f25f1d513044"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mediaarea.net/en/MediaInfo/Download/Source"
 PKG_URL="https://mediaarea.net/download/source/mediainfo/${PKG_VERSION}/mediainfo_${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpg123"
-PKG_VERSION="1.27.2"
-PKG_SHA256="52f6ceb962c05db0c043bb27acf5a721381f5f356ac4610e5221f50293891b04"
+PKG_VERSION="1.30.2"
+PKG_SHA256="c7ea863756bb79daed7cba2942ad3b267a410f26d2dfbd9aaf84451ff28a05d7"
 PKG_LICENSE="LGPLv2"
 PKG_SITE="http://www.mpg123.org/"
-PKG_URL="http://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain alsa-lib"
 PKG_LONGDESC="A console based real time MPEG Audio Player for Layer 1, 2 and 3."
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpv-drmprime"
-PKG_VERSION="0.33.1"
-PKG_SHA256="100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9"
+PKG_VERSION="0.34.1"
+PKG_SHA256="32ded8c13b6398310fa27767378193dc1db6d78b006b70dbcbd3123a1445e746"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mpv.io/"
 PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz"
@@ -12,22 +12,22 @@ PKG_LONGDESC="A media player based on MPlayer and mplayer2. It supports a wide v
 PKG_TOOLCHAIN="manual"
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
-                           --disable-libarchive \
-                           --disable-lua \
-                           --disable-javascript \
-                           --disable-uchardet \
-                           --disable-rubberband \
-                           --disable-lcms2 \
-                           --disable-vapoursynth \
-                           --disable-jack \
-                           --disable-wayland \
-                           --disable-x11 \
-                           --disable-vulkan \
-                           --disable-caca \
-                           --enable-drm \
-                           --enable-gbm \
-                           --enable-egl-drm"
+PKG_MANUAL_OPTS_TARGET="--prefix=/usr \
+                        --disable-libarchive \
+                        --disable-lua \
+                        --disable-javascript \
+                        --disable-uchardet \
+                        --disable-rubberband \
+                        --disable-lcms2 \
+                        --disable-vapoursynth \
+                        --disable-jack \
+                        --disable-wayland \
+                        --disable-x11 \
+                        --disable-vulkan \
+                        --disable-caca \
+                        --enable-drm \
+                        --enable-gbm \
+                        --enable-egl-drm"
 
 if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGLES}"
@@ -39,27 +39,27 @@ fi
 
 if [ "${VAAPI_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" libva"
-  PKG_CONFIGURE_OPTS_TARGET+=" --enable-vaapi --enable-vaapi-drm"
+  PKG_MANUAL_OPTS_TARGET+=" --enable-vaapi --enable-vaapi-drm"
 else
-  PKG_CONFIGURE_OPTS_TARGET+=" --disable-vaapi"
+  PKG_MANUAL_OPTS_TARGET+=" --disable-vaapi"
 fi
 
 if [ "${PULSEAUDIO_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" pulseaudio"
-  PKG_CONFIGURE_OPTS_TARGET+=" --enable-pulse"
+  PKG_MANUAL_OPTS_TARGET+=" --enable-pulse"
 else
-  PKG_CONFIGURE_OPTS_TARGET+=" --disable-pulse"
+  PKG_MANUAL_OPTS_TARGET+=" --disable-pulse"
 fi
 
 if [ "${KODI_BLURAY_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" libbluray"
-  PKG_CONFIGURE_OPTS_TARGET+=" --enable-libbluray"
+  PKG_MANUAL_OPTS_TARGET+=" --enable-libbluray"
 else
-  PKG_CONFIGURE_OPTS_TARGET+=" --disable-libbluray"
+  PKG_MANUAL_OPTS_TARGET+=" --disable-libbluray"
 fi
 
 configure_target() {
-  waf configure ${PKG_CONFIGURE_OPTS_TARGET}
+  waf configure ${PKG_MANUAL_OPTS_TARGET}
 }
 
 make_target() {

packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="squeezelite"
-PKG_VERSION="556de5689d27b4440adbfeb3c3012da02dbf438e" # 2021-05-14 # 1.9.9.1386
-PKG_SHA256="8de5348b0ee23f4a24371dad589c887d083194e24a0e526585417edcd34a4d86"
+PKG_VERSION="bc72c0de3fff771540a2a45aaafafed539387b3c" # 2022-04-10 # 1.9.9.1403
+PKG_SHA256="5aa312d678a593b9a08f79e080a6ebe329d8fc40e6507e28b6705807c408bf7a"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ralph-irving/squeezelite"
 PKG_URL="https://github.com/ralph-irving/squeezelite/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libpcap"
-PKG_VERSION="1.10.1"
-PKG_SHA256="ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4"
+PKG_VERSION="1.10.2"
+PKG_SHA256="db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.tcpdump.org/"
-PKG_URL="http://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"
+PKG_SITE="https://www.tcpdump.org/"
+PKG_URL="https://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A portable framework for low-level network monitoring."
 # use configure, not cmake. review cmake in future release.

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.3"
-PKG_SHA256="a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f"
+PKG_VERSION="1.4.3"
+PKG_SHA256="b93f715223a322e67f42b61a08a512ae29e34bd4a53d7f223766660aaa5a0434"
 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"
@@ -11,14 +11,7 @@ PKG_DEPENDS_TARGET="toolchain glib ncurses openssl"
 PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems."
 PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=${SYSROOT_PREFIX} \
-        --disable-glibtest \
-        --without-socks \
-        --with-textui \
-        --without-bot \
-        --without-proxy \
-        --without-perl"
-
-pre_configure_target() {
-  export CFLAGS="${CFLAGS} -I${PKG_BUILD}"
-}
+PKG_MESON_OPTS_TARGET="-Dwithout-textui=no \
+                       -Dwith-bot=no \
+                       -Dwith-proxy=no \
+                       -Dwith-perl=no"

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

@@ -7,13 +7,14 @@ PKG_SHA256="500c29914dd26f5aa6df07446388d49b60249622c9b0fd1f266f62a5706f056c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/jpr5/ngrep"
 PKG_URL="https://github.com/jpr5/ngrep/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libpcap"
+PKG_DEPENDS_TARGET="toolchain libpcap pcre2"
 PKG_LONGDESC="A tool like GNU grep applied to the network layer."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="-sysroot -parallel"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=${SYSROOT_PREFIX}/usr/include \
                            --enable-ipv6 \
+                           --enable-pcre2 \
                            --disable-dropprivs"
 
 pre_build_target() {

packages/addons/addon-depends/network-tools-depends/ngrep/patches/port-to-pcre2-api-and-enable-jit-compilation.patch

@@ -0,0 +1,252 @@
+From cfcf1e6e9c4f8a2404810d8d1d90e6d1eaa0abdd Mon Sep 17 00:00:00 2001
+From: Romain Francoise <romain@rfr.io>
+Date: Sat, 20 Nov 2021 23:28:15 +0100
+Subject: [PATCH] Port to PCRE2 API and enable JIT compilation
+
+The original PCRE API provided on most systems by libpcre3 is no longer
+maintained upstream and is superseded by the new PCRE2 API, which was
+first released in 2015. pcre3 will be removed from Debian in 2023, as
+noted in this bug report: https://bugs.debian.org/1000080
+
+This commit replaces the existing PCRE implementation with a new one
+using PCRE2, which is quite similar. One benefit is that PCRE2 provides
+a JIT compiler which can replace the interpretive regular expression
+evaluation code with native machine code on most modern platforms:
+https://pcre.org/current/doc/html/pcre2jit.html
+
+Depending on the length and complexity of the pattern used, enabling JIT
+compilation makes Ngrep 50x to 150x faster, testing in quiet mode on a
+multi-gigabyte PCAP file stored on tmpfs.
+---
+ configure.in |  24 ++++++------
+ ngrep.c      | 106 ++++++++++++++++++++++++++++++++++-----------------
+ 2 files changed, 82 insertions(+), 48 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index dbef39b..0806a62 100644
+--- a/configure.in
++++ b/configure.in
+@@ -141,16 +141,16 @@ dnl
+ REGEX_DIR=''
+ REGEX_OBJS=''
+ 
+-AC_ARG_ENABLE(pcre,
+-[  --enable-pcre           use PCRE instead of GNU regex (default GNU)],
+-[ use_pcre="$enableval" ],
+-[ use_pcre="no" ])
+-
+-if test $use_pcre = yes; then
+-  USE_PCRE="1"
+-  EXTRA_LIBS="$EXTRA_LIBS -lpcre"
++AC_ARG_ENABLE(pcre2,
++[  --enable-pcre2           use PCRE2 instead of GNU regex (default GNU)],
++[ use_pcre2="$enableval" ],
++[ use_pcre2="no" ])
++
++if test $use_pcre2 = yes; then
++  USE_PCRE2="1"
++  EXTRA_LIBS="$EXTRA_LIBS -lpcre2-8"
+ else
+-  USE_PCRE="0"
++  USE_PCRE2="0"
+ 
+   AC_MSG_RESULT
+   AC_MSG_RESULT(Configuring GNU Regular Expression library ...)
+@@ -476,7 +476,7 @@ dnl
+ AC_DEFINE_UNQUOTED(USE_PCAP_RESTART,          $USE_PCAP_RESTART,          [whether to call the BPF lexer restart function between multiple BPF filter compilation attempts (default no)])
+ AC_DEFINE_UNQUOTED(PCAP_RESTART_FUNC,         $PCAP_RESTART_FUNC,         [routine used for restarting the BPF lexer])
+ 
+-AC_DEFINE_UNQUOTED(USE_PCRE,                  $USE_PCRE,                  [whether to use PCRE (default GNU Regex)])
++AC_DEFINE_UNQUOTED(USE_PCRE2,                 $USE_PCRE2,                 [whether to use PCRE2 (default GNU Regex)])
+ AC_DEFINE_UNQUOTED(USE_IPv6,                  $USE_IPv6,                  [whether to use IPv6 (default off)])
+ AC_DEFINE_UNQUOTED(USE_TCPKILL,               $USE_TCPKILL,               [whether to enable tcpkill functionality (default off)])
+ AC_DEFINE_UNQUOTED(USE_VLAN_HACK,             $USE_VLAN_HACK,             [whether to automatically include VLAN frames (default on)])
+@@ -524,8 +524,8 @@ else
+     AC_MSG_RESULT(CONFIG: privilege dropping DISABLED)
+ fi
+ 
+-if test "$USE_PCRE" = "1"; then
+-    AC_MSG_RESULT(CONFIG: using PCRE regex library)
++if test "$USE_PCRE2" = "1"; then
++    AC_MSG_RESULT(CONFIG: using PCRE2 regex library)
+ else
+     AC_MSG_RESULT(CONFIG: using GNU regex library)
+ fi
+diff --git a/ngrep.c b/ngrep.c
+index 3df9389..dcf0555 100644
+--- a/ngrep.c
++++ b/ngrep.c
+@@ -91,8 +91,9 @@
+ #include <netinet/icmp6.h>
+ #endif
+ 
+-#if USE_PCRE
+-#include <pcre.h>
++#if USE_PCRE2
++#define PCRE2_CODE_UNIT_WIDTH 8
++#include <pcre2.h>
+ #else
+ #include <regex.h>
+ #endif
+@@ -128,12 +129,14 @@ char nonprint_char = '.';
+  * GNU Regex/PCRE
+  */
+ 
+-#if USE_PCRE
+-int32_t err_offset;
+-char *re_err = NULL;
++#if USE_PCRE2
++PCRE2_SIZE err_offset;
++int re_err;
+ 
+-pcre *pattern = NULL;
+-pcre_extra *pattern_extra = NULL;
++pcre2_code *re;
++pcre2_match_data *pcre2_md;
++PCRE2_SPTR pattern;
++uint32_t pcre2_jit_on = 0;
+ #else
+ const char *re_err = NULL;
+ 
+@@ -189,6 +192,7 @@ uint32_t ws_row, ws_col = 80, ws_col_forced = 0;
+ 
+ int main(int argc, char **argv) {
+     int32_t c;
++    const char *extra = "";
+ 
+     signal(SIGINT,   clean_exit);
+     signal(SIGABRT,  clean_exit);
+@@ -394,8 +398,12 @@ int main(int argc, char **argv) {
+         if (setup_matcher())
+             clean_exit(2);
+ 
++#if USE_PCRE2
++        if (pcre2_jit_on)
++            extra = " (JIT)";
++#endif
+         if (quiet < 2 && strlen(match_data))
+-            printf("%smatch: %s%s\n", invert_match?"don't ":"",
++            printf("%smatch%s: %s%s\n", invert_match?"don't ":"", extra,
+                    (bin_data && !strchr(match_data, 'x'))?"0x":"", match_data);
+ 
+         if (re_match_word) free(match_data);
+@@ -631,14 +639,14 @@ int setup_matcher(void) {
+ 
+     } else {
+ 
+-#if USE_PCRE
+-        uint32_t pcre_options = PCRE_UNGREEDY;
++#if USE_PCRE2
++        uint32_t pcre_options = PCRE2_UNGREEDY;
+ 
+         if (re_ignore_case)
+-            pcre_options |= PCRE_CASELESS;
++            pcre_options |= PCRE2_CASELESS;
+ 
+         if (re_multiline_match)
+-            pcre_options |= PCRE_DOTALL;
++            pcre_options |= PCRE2_DOTALL;
+ #else
+         re_syntax_options = RE_CHAR_CLASSES | RE_NO_BK_PARENS | RE_NO_BK_VBAR |
+             RE_CONTEXT_INDEP_ANCHORS | RE_CONTEXT_INDEP_OPS;
+@@ -673,15 +681,36 @@ int setup_matcher(void) {
+             match_data = word_regex;
+         }
+ 
+-#if USE_PCRE
+-        pattern = pcre_compile(match_data, pcre_options, (const char **)&re_err, &err_offset, 0);
++#if USE_PCRE2
++        re = pcre2_compile((PCRE2_SPTR8)match_data, PCRE2_ZERO_TERMINATED,
++            pcre_options, &re_err, &err_offset, NULL);
++        if (!re) {
++            PCRE2_UCHAR buffer[256];
++            pcre2_get_error_message(re_err, buffer, sizeof(buffer));
++            fprintf(stderr, "regex compile failed: %s (offset: %zd)\n", buffer,
++                err_offset);
++            return 1;
++        }
+ 
+-        if (!pattern) {
+-            fprintf(stderr, "compile failed: %s\n", re_err);
++        pcre2_md = pcre2_match_data_create_from_pattern(re, NULL);
++        if (!pcre2_md) {
++            fprintf(stderr, "unable to alloc pcre2 match data\n");
+             return 1;
+         }
+ 
+-        pattern_extra = pcre_study(pattern, 0, (const char **)&re_err);
++        pcre2_config(PCRE2_CONFIG_JIT, &pcre2_jit_on);
++        if (pcre2_jit_on) {
++            int rc;
++            size_t jitsz;
++
++            if (pcre2_jit_compile(re, PCRE2_JIT_COMPLETE) != 0) {
++                fprintf(stderr, "unable to JIT-compile pcre2 regular expression\n");
++                return 1;
++            }
++            rc = pcre2_pattern_info(re, PCRE2_INFO_JITSIZE, &jitsz);
++            if (rc || jitsz == 0)
++                pcre2_jit_on = 0;
++        }
+ #else
+         re_err = re_compile_pattern(match_data, strlen(match_data), &pattern);
+         if (re_err) {
+@@ -990,24 +1019,29 @@ void dump_packet(struct pcap_pkthdr *h, u_char *p, uint8_t proto, unsigned char
+ }
+ 
+ int8_t re_match_func(unsigned char *data, uint32_t len, uint16_t *mindex, uint16_t *msize) {
+-#if USE_PCRE
+-
+-    static int sub[2];
+-    switch(pcre_exec(pattern, 0, (char const *)data, (int32_t)len, 0, 0, 0, 0)) {
+-        case PCRE_ERROR_NULL:
+-        case PCRE_ERROR_BADOPTION:
+-        case PCRE_ERROR_BADMAGIC:
+-        case PCRE_ERROR_UNKNOWN_NODE:
+-        case PCRE_ERROR_NOMEMORY:
+-            perror("she's dead, jim\n");
+-            clean_exit(2);
++#if USE_PCRE2
++    int rc;
++    PCRE2_SIZE *ovector;
++    PCRE2_UCHAR errbuf[256];
+ 
+-        case PCRE_ERROR_NOMATCH:
+-            return 0;
++    if (pcre2_jit_on)
++        rc = pcre2_jit_match(re, data, len, 0, 0, pcre2_md, NULL);
++    else
++        rc = pcre2_match(re, data, len, 0, 0, pcre2_md, NULL);
+ 
+-        default:
+-            *mindex = sub[0];
+-            *msize  = sub[1] - sub[0];
++    if (rc < 0) {
++        switch (rc) {
++            case PCRE2_ERROR_NOMATCH:
++                return 0;
++            default:
++                pcre2_get_error_message(rc, errbuf, sizeof(errbuf));
++                fprintf(stderr, "she's dead, jim: %s (error %d)\n", errbuf, rc);
++                clean_exit(2);
++        }
++    } else {
++        ovector = pcre2_get_ovector_pointer(pcre2_md);
++        *mindex = ovector[0];
++        *msize = ovector[1] - ovector[0];
+     }
+ #else
+ 
+@@ -1479,9 +1513,9 @@ void clean_exit(int32_t sig) {
+     if (quiet < 1 && sig >= 0)
+         printf("exit\n");
+ 
+-#if USE_PCRE
+-    if (pattern)       pcre_free(pattern);
+-    if (pattern_extra) pcre_free(pattern_extra);
++#if USE_PCRE2
++    if (re)       pcre2_code_free(re);
++    if (pcre2_md) pcre2_match_data_free(pcre2_md);
+ #else
+     if (pattern.translate) free(pattern.translate);
+     if (pattern.fastmap)   free(pattern.fastmap);

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

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nmap"
-PKG_VERSION="7.91"
-PKG_SHA256="18cc4b5070511c51eb243cdd2b0b30ff9b2c4dc4544c6312f75ce3a67a593300"
+PKG_VERSION="7.93"
+PKG_SHA256="55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651"
 PKG_LICENSE="GPL"
-PKG_SITE="http://nmap.org/"
-PKG_URL="http://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_SITE="https://nmap.org/"
+PKG_URL="https://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain openssl"
 PKG_LONGDESC="Free Security Scanned for Network."
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-Build-based-on-OpenSSL-version--not-API-level.patch

@@ -0,0 +1,313 @@
+From d6bea8dcdee36a3902cece14097993350306f1b6 Mon Sep 17 00:00:00 2001
+From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
+Date: Tue, 6 Sep 2022 22:39:34 +0000
+Subject: [PATCH] Build based on OpenSSL version, not API level. Fixes #2516
+
+---
+ ncat/http_digest.c        |  2 +-
+ ncat/ncat_connect.c       |  4 ++--
+ ncat/ncat_ssl.c           |  6 +++---
+ ncat/ncat_ssl.h           | 12 ------------
+ ncat/test/test-wildcard.c |  4 ++--
+ nse_openssl.cc            | 28 +++++++---------------------
+ nse_ssl_cert.cc           | 24 ++++++------------------
+ nsock/src/nsock_ssl.c     |  4 ++--
+ nsock/src/nsock_ssl.h     | 15 +--------------
+ 9 files changed, 24 insertions(+), 75 deletions(-)
+
+diff --git a/ncat/http_digest.c b/ncat/http_digest.c
+index b5f80a920a..e6ff99175c 100644
+--- a/ncat/http_digest.c
++++ b/ncat/http_digest.c
+@@ -133,7 +133,7 @@ int http_digest_init_secret(void)
+     return 0;
+ }
+ 
+-#if OPENSSL_API_LEVEL < 10100
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #define EVP_MD_CTX_new EVP_MD_CTX_create
+ #define EVP_MD_CTX_free EVP_MD_CTX_destroy
+ #endif
+diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c
+index 0e4b50761c..3dd3291fc9 100644
+--- a/ncat/ncat_connect.c
++++ b/ncat/ncat_connect.c
+@@ -82,8 +82,8 @@
+ #include <openssl/err.h>
+ 
+ /* Deprecated in OpenSSL 3.0 */
+-#if OPENSSL_API_LEVEL >= 30000
+-#define SSL_get_peer_certificate SSL_get1_peer_certificate
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++# define SSL_get_peer_certificate SSL_get1_peer_certificate
+ #endif
+ #endif
+ 
+diff --git a/ncat/ncat_ssl.c b/ncat/ncat_ssl.c
+index 9226b48116..3818bfecc5 100644
+--- a/ncat/ncat_ssl.c
++++ b/ncat/ncat_ssl.c
+@@ -80,7 +80,7 @@
+ #define FUNC_ASN1_STRING_data ASN1_STRING_data
+ #endif
+ 
+-#if OPENSSL_API_LEVEL >= 30000
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #include <openssl/provider.h>
+ /* Deprecated in OpenSSL 3.0 */
+ #define SSL_get_peer_certificate SSL_get1_peer_certificate
+@@ -117,7 +117,7 @@ SSL_CTX *setup_ssl_listen(void)
+     OpenSSL_add_all_algorithms();
+     ERR_load_crypto_strings();
+     SSL_load_error_strings();
+-#elif OPENSSL_API_LEVEL >= 30000
++#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
+   if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
+   {
+     loguser("OpenSSL legacy provider failed to load.\n");
+@@ -477,7 +477,7 @@ static int ssl_gen_cert(X509 **cert, EVP_PKEY **key)
+     const char *commonName = "localhost";
+     char dNSName[128];
+     int rc;
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+     int ret = 0;
+     RSA *rsa = NULL;
+     BIGNUM *bne = NULL;
+diff --git a/ncat/ncat_ssl.h b/ncat/ncat_ssl.h
+index fca0b17716..458736e271 100644
+--- a/ncat/ncat_ssl.h
++++ b/ncat/ncat_ssl.h
+@@ -67,18 +67,6 @@
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+ 
+-/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
+-#ifndef OPENSSL_API_LEVEL
+-# if OPENSSL_API_COMPAT < 0x900000L
+-#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
+-# else
+-#  define OPENSSL_API_LEVEL \
+-     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
+-      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
+-# endif
+-#endif
+-
+ #define NCAT_CA_CERTS_FILE "ca-bundle.crt"
+ 
+ enum {
+diff --git a/ncat/test/test-wildcard.c b/ncat/test/test-wildcard.c
+index 428ece71c7..fe55e1997e 100644
+--- a/ncat/test/test-wildcard.c
++++ b/ncat/test/test-wildcard.c
+@@ -20,7 +20,7 @@ are rejected. The SSL transactions happen over OpenSSL BIO pairs.
+ 
+ #include "ncat_core.h"
+ #include "ncat_ssl.h"
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+ #include <openssl/bn.h>
+ #endif
+ 
+@@ -294,7 +294,7 @@ static int set_dNSNames(X509 *cert, const struct lstr dNSNames[])
+ static int gen_cert(X509 **cert, EVP_PKEY **key,
+     const struct lstr commonNames[], const struct lstr dNSNames[])
+ {
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+     int rc, ret=0;
+     RSA *rsa = NULL;
+     BIGNUM *bne = NULL;
+diff --git a/nse_openssl.cc b/nse_openssl.cc
+index 3ee5d73d3f..0f5b450e0c 100644
+--- a/nse_openssl.cc
++++ b/nse_openssl.cc
+@@ -20,6 +20,9 @@
+ #define FUNC_EVP_CIPHER_CTX_init EVP_CIPHER_CTX_reset
+ #define FUNC_EVP_CIPHER_CTX_cleanup EVP_CIPHER_CTX_reset
+ #define PASS_EVP_CTX(ctx) (ctx)
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
++# include <openssl/provider.h>
++#endif
+ #else
+ #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_init
+ #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_cleanup
+@@ -37,23 +40,6 @@ extern NmapOps o;
+ 
+ #include "nse_openssl.h"
+ 
+-/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
+-#ifndef OPENSSL_API_LEVEL
+-# if OPENSSL_API_COMPAT < 0x900000L
+-#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
+-# else
+-#  define OPENSSL_API_LEVEL \
+-     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
+-      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
+-# endif
+-#endif
+-
+-
+-#if OPENSSL_API_LEVEL >= 30000
+-#include <openssl/provider.h>
+-#endif
+-
+ #define NSE_SSL_LUA_ERR(_L) \
+     luaL_error(_L, "OpenSSL error: %s", ERR_error_string(ERR_get_error(), NULL))
+ 
+@@ -184,7 +170,7 @@ static int l_bignum_is_prime( lua_State *L ) /** bignum_is_prime( BIGNUM p ) */
+   bignum_data_t * p = (bignum_data_t *) luaL_checkudata( L, 1, "BIGNUM" );
+   BN_CTX * ctx = BN_CTX_new();
+   int is_prime =
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+     BN_is_prime_ex( p->bn, BN_prime_checks, ctx, NULL );
+ #else
+     BN_check_prime( p->bn, ctx, NULL );
+@@ -199,7 +185,7 @@ static int l_bignum_is_safe_prime( lua_State *L ) /** bignum_is_safe_prime( BIGN
+   bignum_data_t * p = (bignum_data_t *) luaL_checkudata( L, 1, "BIGNUM" );
+   BN_CTX * ctx = BN_CTX_new();
+   int is_prime =
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+     BN_is_prime_ex( p->bn, BN_prime_checks, ctx, NULL );
+ #else
+     BN_check_prime( p->bn, ctx, NULL );
+@@ -210,7 +196,7 @@ static int l_bignum_is_safe_prime( lua_State *L ) /** bignum_is_safe_prime( BIGN
+     BN_sub_word( n, (BN_ULONG)1 );
+     BN_div_word( n, (BN_ULONG)2 );
+     is_safe =
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+       BN_is_prime_ex( n, BN_prime_checks, ctx, NULL );
+ #else
+       BN_check_prime( n, ctx, NULL );
+@@ -582,7 +568,7 @@ LUALIB_API int luaopen_openssl(lua_State *L) {
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+   OpenSSL_add_all_algorithms();
+   ERR_load_crypto_strings();
+-#elif OPENSSL_API_LEVEL >= 30000
++#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
+   if (NULL == OSSL_PROVIDER_load(NULL, "legacy") && o.debugging > 1)
+   {
+     // Legacy provider may not be available.
+diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc
+index 5ae623a475..bc35019a1a 100644
+--- a/nse_ssl_cert.cc
++++ b/nse_ssl_cert.cc
+@@ -89,19 +89,7 @@
+ #define X509_get0_notAfter X509_get_notAfter
+ #endif
+ 
+-/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
+-#ifndef OPENSSL_API_LEVEL
+-# if OPENSSL_API_COMPAT < 0x900000L
+-#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
+-# else
+-#  define OPENSSL_API_LEVEL \
+-     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
+-      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
+-# endif
+-#endif
+-
+-#if OPENSSL_API_LEVEL >= 30000
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #include <openssl/core_names.h>
+ /* Deprecated in OpenSSL 3.0 */
+ #define SSL_get_peer_certificate SSL_get1_peer_certificate
+@@ -459,7 +447,7 @@ static const char *pkey_type_to_string(int type)
+ }
+ 
+ int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) {
+-#if OPENSSL_API_LEVEL >= 30000
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+   char tmp[64] = {0};
+   size_t len = 0;
+   /* This structure (ecdhparams.curve_params) comes from tls.lua */
+@@ -634,7 +622,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
+   else
+ #endif
+   if (pkey_type == EVP_PKEY_RSA) {
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+     RSA *rsa = EVP_PKEY_get1_RSA(pubkey);
+     if (rsa) {
+ #endif
+@@ -643,7 +631,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
+       luaL_getmetatable( L, "BIGNUM" );
+       lua_setmetatable( L, -2 );
+ #if HAVE_OPAQUE_STRUCTS
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+       const BIGNUM *n = NULL, *e = NULL;
+       data->should_free = false;
+       RSA_get0_key(rsa, &n, &e, NULL);
+@@ -663,7 +651,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
+       luaL_getmetatable( L, "BIGNUM" );
+       lua_setmetatable( L, -2 );
+ #if HAVE_OPAQUE_STRUCTS
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+       data->should_free = false;
+ #else
+       data->should_free = true;
+@@ -673,7 +661,7 @@ static int parse_ssl_cert(lua_State *L, X509 *cert)
+       data->bn = rsa->n;
+ #endif
+       lua_setfield(L, -2, "modulus");
+-#if OPENSSL_API_LEVEL < 30000
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+       RSA_free(rsa);
+     }
+ #endif
+diff --git a/nsock/src/nsock_ssl.c b/nsock/src/nsock_ssl.c
+index 1ef7d521f0..23db5513ea 100644
+--- a/nsock/src/nsock_ssl.c
++++ b/nsock/src/nsock_ssl.c
+@@ -64,7 +64,7 @@
+ #include "netutils.h"
+ 
+ #if HAVE_OPENSSL
+-#if OPENSSL_API_LEVEL >= 30000
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ #include <openssl/provider.h>
+ #endif
+ 
+@@ -120,7 +120,7 @@ static SSL_CTX *ssl_init_helper(const SSL_METHOD *method) {
+     SSL_library_init();
+ #else
+     OPENSSL_atexit(nsock_ssl_atexit);
+-#if OPENSSL_API_LEVEL >= 30000
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+     if (NULL == OSSL_PROVIDER_load(NULL, "legacy"))
+     {
+       nsock_log_error("OpenSSL legacy provider failed to load.\n");
+diff --git a/nsock/src/nsock_ssl.h b/nsock/src/nsock_ssl.h
+index bb99b1b5e1..1af473d629 100644
+--- a/nsock/src/nsock_ssl.h
++++ b/nsock/src/nsock_ssl.h
+@@ -69,20 +69,7 @@
+ #include <openssl/err.h>
+ #include <openssl/rand.h>
+ 
+-/* OPENSSL_API_LEVEL per OpenSSL 3.0: decimal MMmmpp */
+-#ifndef OPENSSL_API_LEVEL
+-# if OPENSSL_API_COMPAT < 0x900000L
+-#  define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
+-# else
+-#  define OPENSSL_API_LEVEL \
+-     (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
+-      + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+-      + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
+-# endif
+-#endif
+-
+-
+-#if OPENSSL_API_LEVEL >= 30000
++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ /* Deprecated in OpenSSL 3.0 */
+ #define SSL_get_peer_certificate SSL_get1_peer_certificate
+ #endif

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

@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tcpdump"
-PKG_VERSION="4.99.1"
-PKG_SHA256="79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe"
-PKG_SITE="http://www.tcpdump.org/"
-PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
+PKG_VERSION="4.99.2"
+PKG_SHA256="f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5"
+PKG_SITE="https://www.tcpdump.org/"
+PKG_URL="https://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpcap libtirpc"
 PKG_LONGDESC="A program that allows you to dump the traffic on a network."
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/pcre2/package.mk

@@ -6,7 +6,7 @@ PKG_VERSION="10.36"
 PKG_SHA256="a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.pcre.org/"
-PKG_URL="https://ftp.pcre.org/pub/pcre/pcre2-${PKG_VERSION}.tar.bz2"
+PKG_URL="${SOURCEFORGE_SRC}/pcre/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A set of functions that implement regular expression pattern matching using the same syntax."
 PKG_TOOLCHAIN="cmake"

packages/addons/addon-depends/pcsc-lite/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pcsc-lite"
-PKG_VERSION="1.9.0"
-PKG_SHA256="0148d403137124552c5d0f10f8cdab2cbb8dfc7c6ce75e018faf667be34f2ef9"
+PKG_VERSION="1.9.9"
+PKG_SHA256="cbcc3b34c61f53291cecc0d831423c94d437b188eb2b97b7febc08de1c914e8a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://pcsclite.apdu.fr"
 PKG_URL="https://pcsclite.apdu.fr/files/pcsc-lite-${PKG_VERSION}.tar.bz2"

packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="RPi.GPIO"
-PKG_VERSION="0.7.1a4"
-PKG_SHA256="21f4378d81525979ad3bbd60e88fc3d9fac1879bcb17151e1c665f32658f9362"
+PKG_VERSION="0.7.1"
+PKG_SHA256="cd61c4b03c37b62bba4a5acfea9862749c33c618e0295e7e90aa4713fb373b70"
 PKG_ARCH="arm"
 PKG_LICENSE="MIT"
-PKG_SITE="http://sourceforge.net/p/raspberry-gpio-python/"
+PKG_SITE="https://sourceforge.net/projects/raspberry-gpio-python/"
 PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="A module to control Raspberry Pi GPIO channels."

packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk

@@ -5,8 +5,8 @@ PKG_NAME="libfastjson"
 PKG_VERSION="0.99.9"
 PKG_SHA256="a330e1bdef3096b7ead53b4bad1a6158f19ba9c9ec7c36eda57de7729d84aaee"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.rsyslog.com/tag/libfastjson"
-PKG_URL="http://download.rsyslog.com/libfastjson/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_SITE="https://www.rsyslog.com/tag/libfastjson"
+PKG_URL="https://download.rsyslog.com/libfastjson/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A fast json library for C."
 PKG_BUILD_FLAGS="+pic"

packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk

@@ -6,7 +6,7 @@ PKG_VERSION="1.0.6"
 PKG_SHA256="338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.liblogging.org"
-PKG_URL="http://download.rsyslog.com/liblogging/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="https://download.rsyslog.com/liblogging/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain systemd"
 PKG_LONGDESC="An easy to use and lightweight signal-safe logging library."
 

packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk

@@ -5,7 +5,7 @@ PKG_NAME="liblognorm"
 PKG_VERSION="2.0.6"
 PKG_SHA256="594ea3318ef419cb7f21cf81c513db35a838b32207999a11a82b709da9ff9a2b"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.liblognorm.com"
+PKG_SITE="https://www.liblognorm.com"
 PKG_URL="https://github.com/rsyslog/liblognorm/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libestr libfastjson"
 PKG_TOOLCHAIN="autotools"

packages/addons/addon-depends/rsyslog-depends/librelp/package.mk

@@ -6,7 +6,7 @@ PKG_VERSION="1.10.0"
 PKG_SHA256="148db4e4d1a23e8136e9ec08810929a55faf5d45e24c2e3186d5ab34355dab31"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.rsyslog.com/category/librelp/"
-PKG_URL="http://download.rsyslog.com/librelp/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="https://download.rsyslog.com/librelp/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Provides reliable event logging over the network."
 PKG_TOOLCHAIN="autotools"

packages/addons/addon-depends/runc/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="runc"
-PKG_VERSION="1.0.0-rc93"
-PKG_SHA256="e42456078d2f76c925cdd656e4f423b918525d8188521de05e893b6bb473a6f8"
+PKG_VERSION="1.1.3"
+PKG_SHA256="fc1c70e095d662e38a5889bc6de41857762ce022caaf8be2852663198c533a63"
 PKG_LICENSE="APL"
 PKG_SITE="https://github.com/opencontainers/runc"
 PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz"
@@ -13,7 +13,7 @@ PKG_LONGDESC="A CLI tool for spawning and running containers according to the OC
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/opencontainers/runc/releases
-PKG_GIT_COMMIT="12644e614e25b05da6fd08a38ffa0cfe1903fdec"
+PKG_GIT_COMMIT="6724737f999df9ee0d8ca5c6d7b81f97adc34374"
 
 pre_make_target() {
   go_configure

packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="alsa-plugins"
-PKG_VERSION="1.2.2"
-PKG_SHA256="1c0f06450c928d711719686c9dbece2d480184f36fab11b8f0534cb7b41e337d"
+PKG_VERSION="1.2.6"
+PKG_SHA256="068818a4b55d8c029daa00015d853d45113f56b224b7c64e1e117988c825b2a0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
 PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

packages/addons/addon-depends/snapcast-depends/asio/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="asio"
-PKG_VERSION="1.18.2"
-PKG_SHA256="9071370beb50f4e974042a2a8604e761397cc34a2021a49b5712571b5e1536d7"
+PKG_VERSION="1.21.0"
+PKG_SHA256="2edd7af3b5aa5746a0e552dfcd68b47d765a81695c4479c70027a378851a1bdc"
 PKG_LICENSE="BSL"
 PKG_SITE="http://think-async.com/Asio"
 PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip"

packages/addons/addon-depends/snapcast-depends/popl/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="popl"
-PKG_VERSION="1.2.0"
-PKG_SHA256="dee63eed9bac3da9ec0008902c7ec72caa319461b20fc116e57e45948671a0bf"
+PKG_VERSION="1.3.0"
+PKG_SHA256="7c59554371da3c6c093bd79c2f403f921c1938bd523f1a48682352e0d92883a6"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/badaix/popl"
 PKG_URL="https://github.com/badaix/popl/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/snapcast-depends/snapcast/package.mk

@@ -2,12 +2,12 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="snapcast"
-PKG_VERSION="0.25.0"
-PKG_SHA256="c4e449cb693e091261727421f4965492be049632537e034fa9c59c92d091a846"
+PKG_VERSION="0.26.0"
+PKG_SHA256="166353267a5c461a3a0e7cbd05d78c4bfdaebeda078801df3b76820b54f27683"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/badaix/snapcast"
 PKG_URL="https://github.com/badaix/snapcast/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl boost opus"
+PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl pulseaudio boost opus"
 PKG_LONGDESC="Synchronous multi-room audio player."
 PKG_TOOLCHAIN="make"
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/system-tools-depends/bottom/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bottom"
-PKG_VERSION="0.6.1"
-PKG_SHA256="aa9c26e7e8e1300e9827c098317efa28cc28ae8acabfdb12f14e4ba65f42a57c"
+PKG_VERSION="0.6.8"
+PKG_SHA256="4e4eb251972a7af8c46dd36bcf1335fea334fb670569434fbfd594208905b2d9"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/ClementTsang/bottom"
 PKG_URL="https://github.com/ClementTsang/bottom/archive/${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="efivar"
-PKG_VERSION="cff88dd96b9d43e2c5875a24ba6180b196890ded" # 16 Oct 2020
-PKG_SHA256="016dfae596b691c8d38e488f8bfac3ba437befc260a6f32e60dd390595c9f3e9"
+PKG_VERSION="b920a6ca82250504167066d24aa8731ad29a0de8" # 10 Dec 2021
+PKG_SHA256="def327792854bdb5bc442e2907e1871c954e55e33d67045dcd2d2988f8a08afd"
 PKG_ARCH="x86_64"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://github.com/rhboot/efivar"
@@ -11,6 +11,7 @@ PKG_URL="https://github.com/rhboot/efivar/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain efivar:host"
 PKG_LONGDESC="Tools and library to manipulate EFI variables."
+PKG_BUILD_FLAGS="-gold"
 
 pre_make_host() {
   export TOPDIR=${PKG_BUILD}
@@ -26,7 +27,7 @@ pre_make_target() {
 }
 
 make_target() {
-  make -C src/ libefivar.a libefiboot.a efivar.h efivar
+  make CROSS_COMPILE=${TARGET_NAME}- -C src/ libefivar.a libefiboot.a efivar.h efivar
 }
 
 makeinstall_host() {

packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch

@@ -1,11 +1,11 @@
 --- a/src/Makefile	2018-10-01 21:30:06.000000000 +0200
 +++ b/src/Makefile	2018-10-17 14:16:46.000000000 +0200
-@@ -69,7 +69,7 @@ libefivar.so : | $(GENERATED_SOURCES) li
+@@ -93,7 +93,7 @@
  libefivar.so : LIBS=dl
  libefivar.so : MAP=libefivar.map
  
--efivar : efivar.c | libefivar.so
-+efivar : efivar.c | libefivar.a
+-efivar : $(EFIVAR_OBJECTS) | libefivar.so
++efivar : $(EFIVAR_OBJECTS) | libefivar.a
  efivar : LIBS=efivar dl
  
- efivar-static : efivar.c $(patsubst %.o,%.static.o,$(LIBEFIVAR_OBJECTS))
+ efivar-static : $(EFIVAR_OBJECTS) $(patsubst %.o,%.static.o,$(LIBEFIVAR_OBJECTS))

packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libmtp"
-PKG_VERSION="1.1.18"
-PKG_SHA256="7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0"
+PKG_VERSION="1.1.20"
+PKG_SHA256="c9191dac2f5744cf402e08641610b271f73ac21a3c802734ec2cedb2c6bc56d0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libmtp.sourceforge.net/"
 PKG_URL="${SOURCEFORGE_SRC}/project/${PKG_NAME}/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libssh2"
-PKG_VERSION="1.9.0"
-PKG_SHA256="d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd"
+PKG_VERSION="1.10.0"
+PKG_SHA256="2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.libssh2.org"
 PKG_URL="https://www.libssh2.org/download/libssh2-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="oniguruma"
-PKG_VERSION="6.9.7.1"
-PKG_SHA256="6444204b9c34e6eb6c0b23021ce89a0370dad2b2f5c00cd44c342753e0b204d9"
+PKG_VERSION="6.9.8"
+PKG_SHA256="28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e"
 PKG_LICENSE="BSD"
 PKG_SITE="https://github.com/kkos/oniguruma"
 PKG_URL="https://github.com/kkos/oniguruma/releases/download/v${PKG_VERSION}/onig-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/system-tools-depends/diffutils/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="diffutils"
-PKG_VERSION="3.7"
-PKG_SHA256="b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26"
+PKG_VERSION="3.8"
+PKG_SHA256="a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/diffutils/"
 PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="efibootmgr"
-PKG_VERSION="edc8b9b6ec1c7751ccb9a483405c99141ba237fc" # Apr 28, 2020
-PKG_SHA256="e951ce9e0534c63bb71ba8b2a3830d4402e51440cb4d524d18c1ef40ae5ee218"
+PKG_VERSION="18"
+PKG_SHA256="442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rhboot/efibootmgr"

packages/addons/addon-depends/system-tools-depends/evtest/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="evtest"
-PKG_VERSION="1.34"
-PKG_SHA256="8e2431cdc83587925048157a5772aa0c79b79a64ae5815bf004634cbe53597d0"
+PKG_VERSION="1.35"
+PKG_SHA256="a224abeb783561193660999b0c986216d691cb271b5ec3af88c6bb37b55ff51c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"
 PKG_URL="https://repo.or.cz/evtest.git/snapshot/evtest-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/system-tools-depends/fdupes/package.mk

@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="fdupes"
-PKG_VERSION="2.1.2"
-PKG_SHA256="cd5cb53b6d898cf20f19b57b81114a5b263cc1149cd0da3104578b083b2837bd"
+PKG_VERSION="2.2.1"
+PKG_SHA256="846bb79ca3f0157856aa93ed50b49217feb68e1b35226193b6bc578be0c5698d"
 PKG_LICENSE="GPL"
-PKG_SITE="http://premium.caribe.net/~adrian2/fdupes.html"
+PKG_SITE="https://github.com/adrianlopezroche/fdupes"
 PKG_URL="https://github.com/adrianlopezroche/fdupes/releases/download/v${PKG_VERSION}/fdupes-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="A program for identifying or deleting duplicate files residing within specified directories."

packages/addons/addon-depends/system-tools-depends/file/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="file"
-PKG_VERSION="5.40"
-PKG_SHA256="35488116b068042320374f60e505e37c2c61b899402f9968e070b63dc39286d4"
+PKG_VERSION="5.43"
+PKG_SHA256="58da4fd66c858a1a883105d593320906d64f8835311683184952a33defc9da6d"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.darwinsys.com/file/"
 PKG_URL="https://github.com/file/file/archive/FILE${PKG_VERSION/./_}.tar.gz"

packages/addons/addon-depends/system-tools-depends/htop/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="htop"
-PKG_VERSION="3.0.5"
-PKG_SHA256="4c2629bd50895bd24082ba2f81f8c972348aa2298cc6edc6a21a7fa18b73990c"
+PKG_VERSION="3.2.1"
+PKG_SHA256="b5ffac1949a8daaabcffa659c0964360b5008782aae4dfa7702d2323cfb4f438"
 PKG_LICENSE="GPL"
 PKG_SITE="https://hisham.hm/htop"
 PKG_URL="https://github.com/htop-dev/htop/archive/${PKG_VERSION}.tar.gz"
@@ -14,3 +14,7 @@ PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-unicode \
                            HTOP_NCURSES_CONFIG_SCRIPT=ncurses-config"
+
+pre_configure_target() {
+  export LDFLAGS="${LDFLAGS} -pthread"
+}

packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="i2c-tools"
-PKG_VERSION="4.2"
-PKG_SHA256="37f2dabc7082d185903ff21d1f584b5dcb4dd2eb2c879bbd8d7c50ae900dacd6"
+PKG_VERSION="4.3"
+PKG_SHA256="1f899e43603184fac32f34d72498fc737952dbc9c97a8dd9467fadfdf4600cf9"
 PKG_LICENSE="GPL"
 PKG_SITE="https://i2c.wiki.kernel.org/index.php/I2C_Tools"
 PKG_URL="https://www.kernel.org/pub/software/utils/i2c-tools/${PKG_NAME}-${PKG_VERSION}.tar.xz"
@@ -37,6 +37,7 @@ makeinstall_target() {
   make  EXTRA="py-smbus" \
         DESTDIR=${INSTALL} \
         PREFIX="/usr" \
+        prefix="/usr" \
         PYTHON=${TOOLCHAIN}/bin/python3 \
         install
 }

packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="inotify-tools"
-PKG_VERSION="3.20.11.0"
-PKG_SHA256="58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14"
+PKG_VERSION="3.22.6.0"
+PKG_SHA256="c6b7e70f1df09e386217102a1fe041cfc15fa4f3d683d2970140b6814cf2ed12"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://wiki.github.com/inotify-tools/inotify-tools/"
 PKG_URL="https://github.com/inotify-tools/inotify-tools/archive/${PKG_VERSION}.tar.gz"
@@ -15,5 +15,5 @@ PKG_BUILD_FLAGS="-sysroot"
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-doxygen"
 
 pre_configure_target() {
-  CFLAGS+=" -Wno-error=misleading-indentation"
+  CFLAGS+=" -Wno-error=misleading-indentation -Wno-error=unused-parameter"
 }

packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libgpiod"
+PKG_VERSION="1.6.3"
+PKG_SHA256="eb446070be1444fd7d32d32bbca53c2f3bbb0a21193db86198cf6050b7a28441"
+PKG_LICENSE="GPLv2+"
+PKG_SITE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"
+PKG_URL="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Tools for interacting with the linux GPIO character device."
+PKG_TOOLCHAIN="autotools"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
+                           --enable-tools \
+                           --disable-shared"

packages/addons/addon-depends/system-tools-depends/mc/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mc"
-PKG_VERSION="4.8.27"
-PKG_SHA256="31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4"
+PKG_VERSION="4.8.28"
+PKG_SHA256="e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.midnight-commander.org"
 PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/system-tools-depends/mc/patches/mc-001-ticket_4200_ncurses_disable_widec.patch

@@ -1,71 +0,0 @@
-See https://midnight-commander.org/ticket/4200
-
-diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
-index 5cddf5059..2c117ef4b 100644
---- a/lib/tty/tty-ncurses.c
-+++ b/lib/tty/tty-ncurses.c
-@@ -560,6 +560,7 @@ tty_fill_region (int y, int x, int rows, int cols, unsigned char ch)
- void
- tty_colorize_area (int y, int x, int rows, int cols, int color)
- {
-+#ifdef ENABLE_SHADOWS
-     cchar_t *ctext;
-     wchar_t wch[10];            /* TODO not sure if the length is correct */
-     attr_t attrs;
-@@ -585,6 +586,13 @@ tty_colorize_area (int y, int x, int rows, int cols, int color)
-     }
- 
-     g_free (ctext);
-+#else
-+    (void) y;
-+    (void) x;
-+    (void) rows;
-+    (void) cols;
-+    (void) color;
-+#endif /* ENABLE_SHADOWS */
- }
- 
- /* --------------------------------------------------------------------------------------------- */
-diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h
-index d75df9533..8feb17ccd 100644
---- a/lib/tty/tty-ncurses.h
-+++ b/lib/tty/tty-ncurses.h
-@@ -30,6 +30,11 @@
- #define NCURSES_CONST const
- #endif
- 
-+/* do not draw shadows if NCurses is built with --disable-widec */
-+#if defined(NCURSES_WIDECHAR) && NCURSES_WIDECHAR
-+#define ENABLE_SHADOWS 1
-+#endif
-+
- /*** typedefs(not structures) and defined constants **********************************************/
- 
- /*** enums ***************************************************************************************/
-diff --git a/lib/tty/tty-slang.h b/lib/tty/tty-slang.h
-index c36785ffc..15fd00a94 100644
---- a/lib/tty/tty-slang.h
-+++ b/lib/tty/tty-slang.h
-@@ -27,6 +27,8 @@
- #define COLS  SLtt_Screen_Cols
- #define LINES SLtt_Screen_Rows
- 
-+#define ENABLE_SHADOWS 1
-+
- /*** enums ***************************************************************************************/
- 
- enum
-diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c
-index ed16d04dd..4c1f5ba84 100644
---- a/src/filemanager/boxes.c
-+++ b/src/filemanager/boxes.c
-@@ -280,7 +280,9 @@ appearance_box_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm
-     switch (msg)
-     {
-     case MSG_INIT:
-+#ifdef ENABLE_SHADOWS
-         if (!tty_use_colors ())
-+#endif
-         {
-             Widget *shadow;
- 

packages/addons/addon-depends/system-tools-depends/mmc-utils/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="mmc-utils"
+PKG_VERSION="c62dd8e415b12cc7f9a362db23cd384caf77ff03" # 2022-11-09
+PKG_SHA256="181ec6a2657f19472672372a80488a624be3e9368176b836404ca29c1405374a"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.kernel.org/doc/html/latest/driver-api/mmc/mmc-tools.html"
+PKG_URL="https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Configure MMC storage devices from userspace."
+PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/system-tools-depends/nmon/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nmon"
-PKG_VERSION="16m" # 25 Sep 2019
-PKG_SHA256="2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1"
+PKG_VERSION="16n"
+PKG_SHA256="c0012cc2d925dee940c37ceae297abac64ba5a5c30e575e7418b04028613f5f2"
 PKG_LICENSE="GPL"
 PKG_SITE="http://nmon.sourceforge.net/pmwiki.php?n=Site.CompilingNmon"
-PKG_URL="http://sourceforge.net/projects/nmon/files/lmon16m.c"
+PKG_URL="http://sourceforge.net/projects/nmon/files/lmon16n.c"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Systems administrator, tuner, benchmark tool gives you a huge amount of important performance information in one go."
 PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/system-tools-depends/pv/package.mk

@@ -2,13 +2,13 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pv"
-PKG_VERSION="1.6.6"
-PKG_SHA256="608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1"
+PKG_VERSION="1.6.20"
+PKG_SHA256="e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603"
 PKG_LICENSE="GNU"
 PKG_SITE="http://www.ivarch.com/programs/pv.shtml"
 PKG_URL="http://www.ivarch.com/programs/sources/pv-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="Pipe Viwer can be inserted into any normal pipeline between two processes."
+PKG_LONGDESC="Pipe Viewer can be inserted into any normal pipeline between two processes."
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static-nls"

packages/addons/addon-depends/system-tools-depends/screen/package.mk

@@ -2,14 +2,15 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="screen"
-PKG_VERSION="4.8.0"
-PKG_SHA256="6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1"
+PKG_VERSION="4.9.0"
+PKG_SHA256="f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/screen/"
 PKG_URL="http://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes"
 PKG_BUILD_FLAGS="-sysroot -parallel"
+PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
                            --enable-colors256 \

packages/addons/addon-depends/system-tools-depends/sdparm/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="sdparm"
+PKG_VERSION="1.12"
+PKG_SHA256="c4c9efafdbeb662e2f9712707ec490932bd4d010bb1129ae7a99526546eeadbe"
+PKG_LICENSE="BSD"
+PKG_SITE="https://sg.danny.cz/sg/sdparm.html"
+PKG_URL="https://sg.danny.cz/sg/p/sdparm-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="The sdparm utility accesses SCSI device parameters."
+PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="smartmontools"
-PKG_VERSION="7.2"
-PKG_SHA256="5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6"
+PKG_VERSION="7.3"
+PKG_SHA256="a544f8808d0c58cfb0e7424ca1841cb858a974922b035d505d4e4c248be3a22b"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.smartmontools.org"
 PKG_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/system-tools-depends/st/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="st"
-PKG_VERSION="0.8.4"
-PKG_SHA256="d42d3ceceb4d6a65e32e90a5336e3d446db612c3fbd9ebc1780bc6c9a03346a6"
+PKG_VERSION="0.9"
+PKG_SHA256="f36359799734eae785becb374063f0be833cf22f88b4f169cd251b99324e08e7"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://st.suckless.org/"

packages/addons/addon-depends/system-tools-depends/st/patches/st-001-le_fixes.patch

@@ -4,7 +4,7 @@
 
 --- a/x.c	2020-06-19 11:29:45.000000000 +0200
 +++ b/x.c	2020-06-26 01:07:13.000000000 +0200
-@@ -752,6 +752,7 @@
+@@ -754,6 +754,7 @@
  xloadcolor(int i, const char *name, Color *ncolor)
  {
  	XRenderColor color = { .alpha = 0xffff };
@@ -12,7 +12,7 @@
  
  	if (!name) {
  		if (BETWEEN(i, 16, 255)) { /* 256 color */
-@@ -769,6 +770,14 @@
+@@ -771,6 +772,14 @@
  			name = colorname[i];
  	}
  
@@ -27,16 +27,3 @@
  	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
  }
  
-@@ -1585,8 +1594,10 @@
- 	XTextProperty prop;
- 	DEFAULT(p, opt_title);
- 
--	Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
--			&prop);
-+	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
-+						&prop) < 0)
-+		return;
-+
- 	XSetWMName(xw.dpy, xw.win, &prop);
- 	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
- 	XFree(prop.value);

packages/addons/addon-depends/system-tools-depends/st/patches/st-002-scrollback-20200419-72e3f6c.patch

@@ -51,8 +51,8 @@ index 0ce6ac2..641edc0 100644
 -static void tscrolldown(int, int);
 +static void tscrollup(int, int, int);
 +static void tscrolldown(int, int, int);
- static void tsetattr(int *, int);
- static void tsetchar(Rune, Glyph *, int, int);
+ static void tsetattr(const int *, int);
+ static void tsetchar(Rune, const Glyph *, int, int);
  static void tsetdirt(int, int);
 @@ -415,10 +422,10 @@ tlinelen(int y)
  {

packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="stress-ng"
-PKG_VERSION="0.12.11"
-PKG_SHA256="971393075321c24c3d5769acfabb705911d1f411ced5937b7cfea58528c1b4e6"
+PKG_VERSION="0.14.06"
+PKG_SHA256="54f6c3f84b20efedafd3394ec168e53632a685cfdd76f24270653e898d9ede08"
 PKG_LICENSE="GPLv2"
-PKG_SITE="https://kernel.ubuntu.com/~cking/stress-ng/"
-PKG_URL="https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-${PKG_VERSION}.tar.xz"
+PKG_SITE="https://github.com/ColinIanKing/stress-ng"
+PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain attr keyutils libaio libcap zlib"
 PKG_LONGDESC="stress-ng will stress test a computer system in various selectable ways"
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/system-tools-depends/stress-ng/patches/fix-parallel-build.patch

@@ -1,11 +0,0 @@
---- a/Makefile	2021-05-09 11:37:35.000000000 +0000
-+++ b/Makefile	2021-05-09 11:37:43.000000000 +0000
-@@ -390,7 +390,7 @@
- 	$(V)sync
- 
- config.h:
--	+$(MAKE) -f Makefile.config STATIC=$(STATIC) -j
-+	+$(MAKE) -f Makefile.config STATIC=$(STATIC) -j1
- 
- .PHONY:
- makeconfig: config.h

packages/addons/addon-depends/system-tools-depends/unrar/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="unrar"
-PKG_VERSION="6.0.7"
-PKG_SHA256="a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518"
+PKG_VERSION="6.2.2"
+PKG_SHA256="477d6ca7e246caec5412cc83b36c15a4ac837726a892df022919800129107cd5"
 PKG_LICENSE="free"
 PKG_SITE="https://www.rarlab.com/rar_add.htm"
 PKG_URL="https://www.rarlab.com/rar/unrarsrc-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/system-tools-depends/vim/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vim"
-PKG_VERSION="8.2.3095"
-PKG_SHA256="31588e2a074e2e2ea170704e5a40c61413f2a825788db325d1419c334e6d50b6"
+PKG_VERSION="9.0.0905"
+PKG_SHA256="7503d2fcefa79d1f7f4493eeaf2e9187dd09c071cc072179cfdc4a0246c27c51"
 PKG_LICENSE="VIM"
 PKG_SITE="http://www.vim.org/"
 PKG_URL="https://github.com/vim/vim/archive/v${PKG_VERSION}.tar.gz"
@@ -22,6 +22,7 @@ PKG_CONFIGURE_OPTS_TARGET="vim_cv_getcwd_broken=no \
                            ac_cv_sizeof_int=4 \
                            ac_cv_small_wchar_t=no \
                            --datarootdir=/storage/.kodi/addons/virtual.system-tools/data \
+                           --disable-canberra \
                            --disable-nls \
                            --enable-selinux=no \
                            --enable-gui=no \

packages/addons/addon-depends/ttyd-depends/libuv/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libuv"
-PKG_VERSION="1.40.0"
-PKG_SHA256="70fe1c9ba4f2c509e8166c0ca2351000237da573bb6c82092339207a9715ba6b"
+PKG_VERSION="1.44.2"
+PKG_SHA256="e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/libuv/libuv"
 PKG_URL="https://github.com/libuv/libuv/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libwebsockets"
-PKG_VERSION="4.1.6"
-PKG_SHA256="402e9a8df553c9cd2aff5d7a9758e9e5285bf3070c82539082864633db3deb83"
+PKG_VERSION="4.3.2"
+PKG_SHA256="6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1"
 PKG_LICENSE="MIT"
 PKG_SITE="https://libwebsockets.org"
 PKG_URL="https://github.com/warmcat/libwebsockets/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/vdr/package.mk

@@ -4,8 +4,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr"
-PKG_VERSION="2.4.7"
-PKG_SHA256="8d2b34ea3b1139d1d92826477c4afe8db7c7bf4a0cc67ab34062480aaca443cf"
+PKG_VERSION="2.4.8"
+PKG_SHA256="4dce19d99c0ab04c032ce33e7b27a84c73b004d520c28baef572466f43b066d5"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
 PKG_URL="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PKG_VERSION};sf=tbz2"

packages/addons/addon-depends/whois/package.mk

@@ -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.7"
-PKG_SHA256="ae389c1486cdeae99f5f02940f98f5d7ff1f08ac0f96810365159b27b0189b5e"
-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}
-}

packages/addons/browser/chrome/changelog.txt

@@ -1,3 +1,18 @@
+111
+- chrome: update to 96.0.4664.45
+- pango: update to 1.49.3
+
+110
+- fix dark mode toggle
+- versions >=91 use new flags to enable hardware accelerated video decode
+- allow setting a custom user-agent
+- use pulseaudio when available
+
+109
+- chrome: update to 95.0.4638.54
+- at-spi2-core: update to 2.42.0
+- cups: update to 2.3.3op2
+
 108
 - chrome: update to 93.0.4577.63
 - harfbuzz: update to 2.9.0

packages/addons/browser/chrome/package.mk

@@ -4,8 +4,8 @@
 PKG_NAME="chrome"
 PKG_VERSION="1.0"
 # curl -s http://dl.google.com/linux/chrome/deb/dists/stable/main/binary-amd64/Packages | grep -B 1 Version
-PKG_VERSION_NUMBER="93.0.4577.63"
-PKG_REV="108"
+PKG_VERSION_NUMBER="96.0.4664.45"
+PKG_REV="111"
 PKG_ARCH="x86_64"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.google.com/chrome"
@@ -67,4 +67,6 @@ addon() {
 post_install_addon() {
   sed -e "s/@DISTRO_PKG_SETTINGS_ID@/${DISTRO_PKG_SETTINGS_ID}/g" -i "${INSTALL}/default.py"
   sed -e "s/@CHROME_VERSION@/${PKG_VERSION_NUMBER}/g" -i "${INSTALL}/bin/chrome-downloader"
+  sed -e "s/@CHROME_VERSION@/${PKG_VERSION_NUMBER}/g" -i "${INSTALL}/resources/settings.xml"
+  sed -e "s/@CHROME_VERSION@/${PKG_VERSION_NUMBER}/g" -i "${INSTALL}/settings-default.xml"
 }

packages/addons/browser/chrome/source/bin/chrome-start

@@ -44,15 +44,15 @@ LIBVA_DRIVER_NAME=''
 case $VAAPI_MODE in
   'intel')
       LIBVA_DRIVER_NAME='i965'
-      chrome_OPTS="$chrome_OPTS --enable-accelerated-video"
+      chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder"
       ;;
   'amd')
       LIBVA_DRIVER_NAME='vdpau'
-      chrome_OPTS="$chrome_OPTS --enable-accelerated-video"
+      chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder"
       ;;
   'nvidia')
       LIBVA_DRIVER_NAME='vdpau'
-      chrome_OPTS="$chrome_OPTS --enable-accelerated-video --allow-no-sandbox-job --disable-gpu-sandbox"
+      chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder --allow-no-sandbox-job --disable-gpu-sandbox"
       ;;
   *)
       LIBGL_ALWAYS_SOFTWARE='1'
@@ -73,16 +73,29 @@ case $RASTER_MODE in
 esac
 
 # alsa
-if [ ! -z $ALSA_DEVICE ]; then
-  chrome_OPTS="$chrome_OPTS --alsa-output-device=$ALSA_DEVICE"
+if [ "$AUDIO_DEVICE_TYPE" == "ALSA" ]; then
+  # stop pulseaudio when using an Alsa device
+  systemctl stop pulseaudio
+  if [ ! -z $ALSA_DEVICE ]; then
+    chrome_OPTS="$chrome_OPTS --alsa-output-device=$ALSA_DEVICE"
+  fi
 fi
 
-# HACK!!! to get sound at Chrome stop pulseaudio
-systemctl stop pulseaudio
+# dark mode
+if [ "$DARK_MODE" == "true" ]
+then
+  chrome_OPTS="$chrome_OPTS --force-dark-mode"
+fi
+
+# User-Agent
+if [ ! -z "$USER_AGENT" ]; then
+  USER_AGENT="--user-agent=$USER_AGENT"
+fi
 
 # start chrome
 LD_PRELOAD=/usr/lib/libGL.so $ADDON_DIR/chrome-bin/chrome \
   $chrome_OPTS \
+  "$USER_AGENT" \
   --no-sandbox \
   --user-data-dir=$ADDON_HOME/profile \
   --test-type $@ \
@@ -94,12 +107,8 @@ then
   kill $UNCLUTTER_PID
 fi
 
-# dark mode
-if [ "$DARK_MODE" == "true" ]
-then
-  chrome_OPTS="$chrome_OPTS --force-dark-mode"
-fi
-
-# HACK!!! to get sound at Kodi start pulseaudio
 sleep 5
-systemctl start pulseaudio
+if [ "$AUDIO_DEVICE_TYPE" == "ALSA" ]; then
+  # restart pulseaudio when using an Alsa device
+  systemctl start pulseaudio
+fi

packages/addons/browser/chrome/source/default.py

@@ -35,13 +35,20 @@ def startchrome(args):
     new_env['RASTER_MODE'] = __addon__.getSetting('RASTER_MODE')
     new_env['DARK_MODE'] = __addon__.getSetting('DARK_MODE')
 
-    new_env['ALSA_DEVICE'] = ''
     if __addon__.getSetting('USE_CUST_AUDIODEVICE') == 'true':
-      alsa_device = __addon__.getSetting('CUST_AUDIODEVICE_STR')
+      audio_device = __addon__.getSetting('CUST_AUDIODEVICE_STR')
     else:
-      alsa_device = getAudioDevice()
-    if not alsa_device == None and not alsa_device == '':
-      new_env['ALSA_DEVICE'] = alsa_device
+      audio_device = getAudioDevice()
+
+    new_env['AUDIO_DEVICE_TYPE'] = getAudioDeviceType(audio_device)
+    if new_env['AUDIO_DEVICE_TYPE'] == "ALSA":
+      new_env['ALSA_DEVICE'] = ''
+      alsa_device = getAlsaAudioDevice(audio_device)
+      if not alsa_device == None and not alsa_device == '':
+        new_env['ALSA_DEVICE'] = alsa_device
+
+    if __addon__.getSetting('USE_CUST_USERAGENT') == 'true':
+      new_env['USER_AGENT'] = __addon__.getSetting('CUST_USERAGENT_STR')
 
     chrome_params = args + ' ' + \
                     __addon__.getSetting('HOMEPAGE')
@@ -57,7 +64,7 @@ def isRuning(pname):
   return False
 
 def getAudioDevice():
-  dev = json.loads(xbmc.executeJSONRPC(json.dumps({
+  return json.loads(xbmc.executeJSONRPC(json.dumps({
                       "jsonrpc": "2.0",
                       "method": "Settings.GetSettingValue",
                       "params": {
@@ -65,15 +72,20 @@ def getAudioDevice():
                                 },
                       "id": 1,
                    })))['result']['value']
+
+def getAudioDeviceType(dev):
   if dev.startswith("ALSA:"):
-    dev = dev.split("ALSA:")[1]
-    if dev == "@":
-      return None
-    if dev.startswith("@:"):
-      dev = dev.split("@:")[1]
-  else:
-    # not ALSA
+    return "ALSA"
+  if dev.startswith("PULSE:"):
+    return "PULSE"
+  return None
+
+def getAlsaAudioDevice(dev):
+  dev = dev.split("ALSA:")[1]
+  if dev == "@":
     return None
+  if dev.startswith("@:"):
+    dev = dev.split("@:")[1]
   if dev.startswith("CARD="):
     dev = "plughw:" + dev
   return dev

packages/addons/browser/chrome/source/resources/language/English/strings.po

@@ -48,3 +48,11 @@ msgstr ""
 msgctxt "#30010"
 msgid "Dark Mode"
 msgstr ""
+
+msgctxt "#30011"
+msgid "Use Custom User-Agent"
+msgstr ""
+
+msgctxt "#30012"
+msgid "User-Agent"
+msgstr ""

packages/addons/browser/chrome/source/resources/settings.xml

@@ -12,5 +12,7 @@
         <setting id="CUST_AUDIODEVICE_STR" type="text" label="30008" visible="eq(-1,true)" subsetting="true" default="" />
         <setting id="HIDE_CURSOR" type="bool" label="30009" default="false" />
         <setting id="DARK_MODE" type="bool" label="30010" default="false" />
+        <setting id="USE_CUST_USERAGENT" type="bool" label="30011" default="false" />
+        <setting id="CUST_USERAGENT_STR" type="text" label="30012" visible="eq(-1,true)" subsetting="true" default="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/@CHROME_VERSION@" />
     </category>
 </settings>

packages/addons/browser/chrome/source/settings-default.xml

@@ -8,4 +8,6 @@
     <setting id="VAAPI_MODE" default="true">intel</setting>
     <setting id="WINDOW_MODE" default="true">maximized</setting>
     <setting id="DARK_MODE" default="true">false</setting>   
+    <setting id="USE_CUST_USERAGENT" default="true">false</setting>
+    <setting id="CUST_USERAGENT_STR" default="true">Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/@CHROME_VERSION@</setting>
 </settings>

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,6 +1,9 @@
+8.0.107
+- rebuild to include new driver version
+
 8.0.106
 - updates for Python 3
-  
+
 8.0.105
 - use new output from mediaclient
   use xmlstartlet to parse settings.xml file

packages/addons/driver/sundtek-mediatv/package.mk

@@ -4,7 +4,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="7.0"
-PKG_REV="106"
+PKG_REV="107"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/service/docker/changelog.txt

@@ -1,3 +1,8 @@
+134
+- containerd: update to 1.6.6
+- libnetwork: update to 2022-03-16
+- runc: update to 1.1.3
+
 133
 - Update to docker 19.03.15
 - runc: update to 1.0.0-rc93

packages/addons/service/docker/package.mk

@@ -5,7 +5,7 @@
 PKG_NAME="docker"
 PKG_VERSION="19.03.15"
 PKG_SHA256="f2f31dd4137eaa735a26e590c9718fb06867afff4d8415cc80feb6cdc9e4a8cd"
-PKG_REV="133"
+PKG_REV="134"
 PKG_ARCH="any"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"

packages/addons/service/inadyn/changelog.txt

@@ -1,3 +1,6 @@
+108
+- Update to 2.9.1
+
 107
 - Update to 2.8.1
 

packages/addons/service/inadyn/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="inadyn"
-PKG_VERSION="2.8.1"
-PKG_SHA256="bf575d2c4330821f834f947ff7a30afb83538f0f5802924e8e645a03922a8036"
-PKG_REV="107"
+PKG_VERSION="2.9.1"
+PKG_SHA256="a5e5039a2eb5cd15799490e3ae54127c381a8a0ed05e1a78e798627895d8ab99"
+PKG_REV="108"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://troglobit.com/inadyn.html"

packages/addons/service/jellyfin/changelog.txt

@@ -1,2 +1,35 @@
+111
+- Update to Jellyfin 10.8.8
+
+110
+- Update to Jellyfin 10.8.7
+
+109
+- Update to Jellyfin 10.8.6
+
+108
+- Update to Jellyfin 10.8.5
+
+107
+- Update to Jellyfin 10.8.4
+
+106
+- Update to Jellyfin 10.8.3
+
+105
+- Update to Jellyfin 10.8.1
+
+104
+- Not released for LibreELEC 10.0
+
+103
+- Not released for LibreELEC 10.0
+
+102
+- Not released for LibreELEC 10.0
+
+101
+- Update Jellyfin to 2.7.7
+
 100
 - Initial release

packages/addons/service/jellyfin/package.mk

@@ -3,8 +3,8 @@
 
 PKG_NAME="jellyfin"
 PKG_VERSION="1.0"
-PKG_VERSION_NUMBER="10.7.6"
-PKG_REV="100"
+PKG_VERSION_NUMBER="10.8.8"
+PKG_REV="111"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://jellyfin.org/"

packages/addons/service/librespot/changelog.txt

@@ -1,3 +1,6 @@
+129
+- Update to 0.3.1
+
 128
 - Python: fix Librespot output is utf-8