Merge pull request #9439 from heitbaum/pkg

Add keymap for xoro hrk 7660

config/docker/source/bin/docker

@@ -8,4 +8,4 @@ name="$(basename $0)"
 oe_setup_addon "$name"
 
 docker rm "$name" 2>/dev/null
-docker run --name="$name" \
+docker run --name="$name"

config/functions

@@ -299,25 +299,18 @@ get_target_linker() {
 
 setup_toolchain() {
   if [ "$LTO_SUPPORT" = "yes" ]; then
-    if flag_enabled "lto-parallel" "no"; then
-      TARGET_CFLAGS+=" $FLAGS_OPTIM_LTO_PARALLEL $FLAGS_OPTIM_LTO_NO_FAT"
-      TARGET_CXXFLAGS+=" $FLAGS_OPTIM_LTO_PARALLEL $FLAGS_OPTIM_LTO_NO_FAT"
-      TARGET_LDFLAGS+=" $LDFLAGS_OPTIM_LTO_COMMON $FLAGS_OPTIM_LTO_PARALLEL"
-    elif flag_enabled "lto-fat" "no"; then
-      TARGET_CFLAGS+=" $FLAGS_OPTIM_LTO_NO_PARALLEL $FLAGS_OPTIM_LTO_FAT"
-      TARGET_CXXFLAGS+=" $FLAGS_OPTIM_LTO_NO_PARALLEL $FLAGS_OPTIM_LTO_FAT"
-      TARGET_LDFLAGS+=" $LDFLAGS_OPTIM_LTO_COMMON $FLAGS_OPTIM_LTO_NO_PARALLEL"
+    if flag_enabled "lto-fat" "no"; then
+      TARGET_CFLAGS+=" $FLAGS_OPTIM_LTO $FLAGS_OPTIM_LTO_FAT"
+      TARGET_CXXFLAGS+=" $FLAGS_OPTIM_LTO $FLAGS_OPTIM_LTO_FAT"
     elif flag_enabled "lto" "no"; then
-      TARGET_CFLAGS+=" $FLAGS_OPTIM_LTO_NO_PARALLEL $FLAGS_OPTIM_LTO_NO_FAT"
-      TARGET_CXXFLAGS+=" $FLAGS_OPTIM_LTO_NO_PARALLEL $FLAGS_OPTIM_LTO_NO_FAT"
-      TARGET_LDFLAGS+=" $LDFLAGS_OPTIM_LTO_COMMON $FLAGS_OPTIM_LTO_NO_PARALLEL"
+      TARGET_CFLAGS+=" $FLAGS_OPTIM_LTO $FLAGS_OPTIM_LTO_NO_FAT"
+      TARGET_CXXFLAGS+=" $FLAGS_OPTIM_LTO $FLAGS_OPTIM_LTO_NO_FAT"
     fi
   fi
 
   if flag_enabled "lto-off" "no"; then
     TARGET_CFLAGS+=" $FLAGS_OPTIM_LTO_OFF"
     TARGET_CXXFLAGS+=" $FLAGS_OPTIM_LTO_OFF"
-    TARGET_LDFLAGS+=" $FLAGS_OPTIM_LTO_OFF"
   fi
 
   local linker="$(get_target_linker)"
@@ -1384,6 +1377,15 @@ python_fix_abi() {
   done
 }
 
+# arg1: python command for target
+python_target_env() {
+  _PYTHON_HOST_PLATFORM="linux-${TARGET_ARCH}" \
+  _PYTHON_PROJECT_BASE="$(get_install_dir Python3)" \
+  _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata__linux_${TARGET_ARCH}-linux-gnu${TARGET_ABI}" \
+  PYTHONPATH="$(get_install_dir Python3)/usr/lib/${PKG_PYTHON_VERSION}" \
+  PYTHONNOUSERSITE=1 $@
+}
+
 ### KERNEL HELPERS ###
 kernel_path() {
   get_build_dir linux

config/graphic

@@ -45,7 +45,7 @@ get_graphicdrivers() {
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "etnaviv"; then
-    GALLIUM_DRIVERS+=" etnaviv kmsro"
+    GALLIUM_DRIVERS+=" etnaviv"
     V4L2_SUPPORT="yes"
     VAAPI_SUPPORT="no"
     VDPAU_SUPPORT="no"
@@ -74,7 +74,7 @@ get_graphicdrivers() {
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "lima"; then
-    GALLIUM_DRIVERS+=" kmsro lima"
+    GALLIUM_DRIVERS+=" lima"
     V4L2_SUPPORT="yes"
   fi
 
@@ -99,7 +99,7 @@ get_graphicdrivers() {
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
-    GALLIUM_DRIVERS+=" kmsro panfrost"
+    GALLIUM_DRIVERS+=" panfrost"
     VULKAN_DRIVERS_MESA+=" panfrost"
     V4L2_SUPPORT="yes"
   fi
@@ -132,7 +132,7 @@ get_graphicdrivers() {
   fi
 
   if listcontains "${GRAPHIC_DRIVERS}" "vc4"; then
-    GALLIUM_DRIVERS+=" vc4 v3d kmsro"
+    GALLIUM_DRIVERS+=" vc4 v3d"
     VULKAN_DRIVERS_MESA+=" broadcom"
     V4L2_SUPPORT="yes"
     VAAPI_SUPPORT="no"

config/noobs/partition_setup.sh

@@ -6,7 +6,8 @@
 MOUNTPOINT="/tmp/LibreELEC-System"
 
 md5sumCheck() {
-  ( cd $MOUNTPOINT
+  (
+    cd $MOUNTPOINT
     echo "checking MD5: $1"
     md5sum -c $1.md5
     if [ "$?" = "1" ]; then
@@ -35,19 +36,19 @@ if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2 ]; then
 fi
 
 # create mountpoint
-  mkdir -p $MOUNTPOINT
+mkdir -p $MOUNTPOINT
 
 # mount needed partition
-  mount $part1 $MOUNTPOINT
+mount $part1 $MOUNTPOINT
 
 # check md5sum
-  md5sumCheck kernel.img
-  md5sumCheck SYSTEM
+md5sumCheck kernel.img
+md5sumCheck SYSTEM
 
 # create bootloader configuration
-  echo "creating bootloader configuration..."
-  echo "boot=$id1 disk=$id2 quiet @EXTRA_CMDLINE@" > $MOUNTPOINT/cmdline.txt
+echo "creating bootloader configuration..."
+echo "boot=$id1 disk=$id2 quiet @EXTRA_CMDLINE@" >$MOUNTPOINT/cmdline.txt
 
 # cleanup mountpoint
-  umount $MOUNTPOINT
-  rmdir $MOUNTPOINT
+umount $MOUNTPOINT
+rmdir $MOUNTPOINT

config/optimize

@@ -20,12 +20,10 @@ HOST_CFLAGS="$HOST_CFLAGS -Wno-format-security"
 HOST_CXXFLAGS="$HOST_CXXFLAGS -Wno-format-security" 
 
 # lto flags
-FLAGS_OPTIM_LTO_NO_PARALLEL="-flto"
-FLAGS_OPTIM_LTO_PARALLEL="-flto=${CONCURRENCY_MAKE_LEVEL}"
+FLAGS_OPTIM_LTO="-flto -Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing"
 FLAGS_OPTIM_LTO_NO_FAT="-fno-fat-lto-objects"
 FLAGS_OPTIM_LTO_FAT="-ffat-lto-objects"
 FLAGS_OPTIM_LTO_OFF="-fno-lto"
-LDFLAGS_OPTIM_LTO_COMMON="-fuse-linker-plugin"
 
 # linker specific flags
 LDFLAGS_OPTIM_LINKER_COMPILER_DEFAULT=""

config/options

@@ -144,6 +144,11 @@ if [ "${OEM}" = "yes" -o "${OEM}" = "no" ]; then
   OEM_SUPPORT="${OEM}"
 fi
 
+# use /bin/dash as config shell if installed on the build host
+if [ -z "${CONFIG_SHELL}" ] && [ -x "/bin/dash" ]; then
+  export CONFIG_SHELL="/bin/dash"
+fi
+
 check_config
 
 . config/graphic

config/show_config

@@ -37,8 +37,9 @@ show_config() {
   config_message+="\n - LLVM support:\t\t\t ${LLVM_SUPPORT}"
   config_message+="\n - DEBUG:\t\t\t\t ${DEBUG:-no}"
   config_message+="\n - CFLAGS:\t\t\t\t ${TARGET_CFLAGS}"
-  config_message+="\n - LDFLAGS:\t\t\t\t $(sed 's/^ *//' <<< ${TARGET_LDFLAGS})"
+  config_message+="\n - LDFLAGS:\t\t\t\t $(sed 's/^ *//' <<<${TARGET_LDFLAGS})"
   config_message+="\n - Local Ccache:\t\t\t ${LOCAL_CCACHE:-no}"
+  config_message+="\n - CONFIG_SHELL:\t\t\t ${CONFIG_SHELL:-auto}"
 
   # Misc. hardware configuration
 
@@ -103,7 +104,7 @@ show_config() {
   config_message+="\n ${dashes}${dashes}"
   config_message+="\n - Graphic Drivers:\t\t\t ${GRAPHIC_DRIVERS}"
   config_message+="\n - Display Server:\t\t\t ${DISPLAYSERVER}"
-  if [ "${DISPLAYSERVER}" = "x11" ] ; then
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
     for drv in ${XORG_DRIVERS}; do
       XORG_DRIVERS_CONFIG+="xf86-video-${drv} "
     done
@@ -112,11 +113,11 @@ show_config() {
   fi
   config_message+="\n - Window Manager / Compositor:\t\t ${WINDOWMANAGER}"
   config_message+="\n - OpenGL (GLX) support (provider):\t ${OPENGL_SUPPORT}"
-    [ "${OPENGL}" != "no" ] && config_message+=" (${OPENGL})"
+  [ "${OPENGL}" != "no" ] && config_message+=" (${OPENGL})"
   config_message+="\n - OpenGL ES support (provider):\t ${OPENGLES_SUPPORT}"
-    [ "${OPENGLES}" != "no" ] && config_message+=" (${OPENGLES})"
+  [ "${OPENGLES}" != "no" ] && config_message+=" (${OPENGLES})"
   config_message+="\n - Vulkan API support (provider):\t ${VULKAN_SUPPORT}"
-    [ "${VULKAN}" != "no" ] && config_message+=" (${VULKAN})"
+  [ "${VULKAN}" != "no" ] && config_message+=" (${VULKAN})"
   if [ "${VULKAN_SUPPORT}" = "yes" ]; then
     config_message+="\n - Vulkan Graphic Drivers:\t\t ${VULKAN_DRIVERS_CONFIG}"
   fi

distributions/LibreELEC/options

@@ -64,7 +64,7 @@
 # for a list of additional drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192DU RTL8812AU"
+  ADDITIONAL_DRIVERS="RTL8812AU"
 
 # Default size of system partition, in MB, eg. 512
   SYSTEM_SIZE=512

distributions/LibreELEC/version

@@ -2,7 +2,7 @@
   LIBREELEC_VERSION="devel"
 
 # OS_VERSION: OS Version
-  OS_VERSION="12.0"
+  OS_VERSION="13.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="12.0.0"
+  ADDON_VERSION="12.80.1"

licenses/LLVM.txt

@@ -0,0 +1,70 @@
+==============================================================================
+LLVM Release License
+==============================================================================
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2003-2014 University of Illinois at Urbana-Champaign.
+All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+Copyrights and Licenses for Third Party Software Distributed with LLVM:
+==============================================================================
+The LLVM software contains code written by third parties.  Such software will
+have its own individual LICENSE.TXT file in the directory in which it appears.
+This file will describe the copyrights, license, and restrictions which apply
+to that code.
+
+The disclaimer of warranty in the University of Illinois Open Source License
+applies to all code in the LLVM Distribution, and nothing in any of the
+other licenses gives permission to use the names of the LLVM Team or the
+University of Illinois to endorse or promote products derived from this
+Software.
+
+The following pieces of software have additional or alternate copyrights,
+licenses, and/or restrictions:
+
+Program             Directory
+-------             ---------
+Autoconf            llvm/autoconf
+                    llvm/projects/ModuleMaker/autoconf
+Google Test         llvm/utils/unittest/googletest
+OpenBSD regex       llvm/lib/Support/{reg*, COPYRIGHT.regex}
+pyyaml tests        llvm/test/YAMLParser/{*.data, LICENSE.TXT}
+ARM contributions   llvm/lib/Target/ARM/LICENSE.TXT
+md5 contributions   llvm/lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h

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

@@ -9,7 +9,7 @@ PKG_SITE="http://argtable.sourceforge.net/"
 PKG_URL="https://downloads.sourceforge.net/project/argtable/argtable/argtable-${PKG_VERSION}/argtable2-${PKG_VERSION:2:4}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Argtable is an open source ANSI C library that parses GNU-style command-line options."
-PKG_TOOLCHAIN="configure"
+PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

packages/addons/addon-depends/argtable2/patches/argtable2-01_fix_gcc-14_build.patch

@@ -0,0 +1,22 @@
+From 812680199b0e474c83cdc8bd331178afcaaad862 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Sat, 4 May 2024 12:07:33 +0000
+Subject: [PATCH] fix build with gcc-14
+
+add missing header
+---
+ src/arg_int.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/arg_int.c b/src/arg_int.c
+index 29c20e5..bc5ab06 100644
+--- a/src/arg_int.c
++++ b/src/arg_int.c
+@@ -27,6 +27,7 @@ USA.
+ /* #ifdef HAVE_STDLIB_H */
+ #include <stdlib.h>
+ /* #endif */
++#include <ctype.h>
+ 
+ #include "argtable2.h"
+ #include <limits.h>

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

@@ -3,11 +3,11 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ccid"
-PKG_VERSION="1.5.5"
-PKG_SHA256="194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca"
+PKG_VERSION="1.6.0"
+PKG_SHA256="cdca7c22c45169cfc300d65d5362b7644ee195289f4fb8bf475a6cd321752c2c"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://ccid.apdu.fr"
-PKG_URL="https://ccid.apdu.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://ccid.apdu.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain pcsc-lite"
 PKG_LONGDESC="A generic USB Chip/Smart Card Interface Devices driver."
 PKG_TOOLCHAIN="autotools"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cups"
-PKG_VERSION="2.4.7"
-PKG_SHA256="9b9a126018462f7326baa828bdf861939e37e00bc63884e03129b3f3360c44fe"
+PKG_VERSION="2.4.10"
+PKG_SHA256="f51b9edd631db1830b967101b51f0045c8c239ae799dff89f0399f3e47a95c02"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cups.org"
 PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gtk3"
-PKG_VERSION="3.24.41"
-PKG_SHA256="47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa"
+PKG_VERSION="3.24.42"
+PKG_SHA256="50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/chrome-depends/unclutter/patches/unclutter-0001-fix-gcc-14-1-build.patch

@@ -0,0 +1,74 @@
+--- a/unclutter.c	2007-02-05 23:13:12.000000000 +0000
++++ b/unclutter.c	2024-05-23 07:41:37.115416042 +0000
+@@ -37,14 +37,15 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xproto.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "vroot.h"
+ 
+ char *progname;
+-pexit(str)char *str;{
++int pexit(str)char *str;{
+     fprintf(stderr,"%s: %s\n",progname,str);
+     exit(1);
+ }
+-usage(){
++void usage(){
+     pexit("usage:\n\
+ 	-display <display>\n\
+ 	-idle <seconds>		time between polls to detect idleness.\n\
+@@ -79,6 +80,7 @@
+ {
+     if(error->error_code!=BadWindow)
+ 	(*defaulthandler)(display,error);
++    return 0;
+ }
+ 
+ char **names;	/* -> argv list of names to avoid */
+@@ -87,7 +89,7 @@
+  * return true if window has a wm_name and the start of it matches
+  * one of the given names to avoid
+  */
+-nameinlist(display,window)
++int nameinlist(display,window)
+ Display *display;
+ Window window;
+ {
+@@ -109,7 +111,7 @@
+  * return true if window has a wm_name and one of the given names to avoid
+  * matches anywhere in that string
+  */
+-matchinlist(display,window)
++int matchinlist(display,window)
+ Display *display;
+ Window window;
+ {
+@@ -131,7 +133,7 @@
+ /*
+  * create a small 1x1 cursor with all pixels masked out on the given screen.
+  */
+-createnullcursor(display,root)
++Cursor createnullcursor(display,root)
+ Display *display;
+ Window root;
+ {
+@@ -155,7 +157,7 @@
+     return cursor;
+ }
+ 
+-main(argc,argv)char **argv;{
++int main(argc,argv)int argc;char **argv;{
+     Display *display;
+     int screen,oldx = -99,oldy = -99,numscreens;
+     int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0,
+--- a/vroot.h	2007-02-05 22:52:40.000000000 +0000
++++ b/vroot.h	2024-05-23 07:59:50.811488716 +0000
+@@ -40,6 +40,7 @@
+ static Window
+ VirtualRootWindow(dpy, screen)
+ Display *dpy;
++int screen;
+ {
+ 	static Display *save_dpy = (Display *)0;
+ 	static int save_screen = -1;

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

@@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain argtable2 ffmpegx"
 PKG_DEPENDS_CONFIG="argtable2 ffmpegx"
 PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 pre_configure_target() {
   # pass ffmpegx to build

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

@@ -13,8 +13,8 @@ PKG_DEPENDS_TARGET="toolchain cxxtools:host openssl"
 PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes."
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_HOST="--disable-demos --with-atomictype=pthread --disable-unittest"
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --with-atomictype=pthread --disable-unittest"
+PKG_CONFIGURE_OPTS_HOST="--disable-demos --disable-unittest"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --disable-unittest"
 
 post_makeinstall_host() {
   rm -rf ${TOOLCHAIN}/bin/cxxtools-config

packages/addons/addon-depends/cxxtools/patches/cxxtools-crosscompile.patch

@@ -1,20 +1,6 @@
-diff -Naur cxxtools-2.2/configure cxxtools-2.2.patch/configure
---- cxxtools-2.2/configure	2013-04-21 21:13:11.000000000 +0200
-+++ cxxtools-2.2.patch/configure	2014-01-03 20:34:53.404660480 +0100
-@@ -17316,8 +17316,8 @@
- 
- 
- 
--CXXTOOLS_CXXFLAGS='-I${includedir}'
--CXXTOOLS_LDFLAGS='-L${libdir} -lcxxtools'
-+CXXTOOLS_CXXFLAGS=''
-+CXXTOOLS_LDFLAGS='-lcxxtools'
- 
- 
- 
-diff -Naur cxxtools-2.2/configure.ac cxxtools-2.2.patch/configure.ac
---- cxxtools-2.2/configure.ac	2013-04-20 23:31:50.000000000 +0200
-+++ cxxtools-2.2.patch/configure.ac	2014-01-03 20:26:32.064005192 +0100
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2013-04-20 23:31:50.000000000 +0200
++++ b/configure.ac	2014-01-03 20:26:32.064005192 +0100
 @@ -106,8 +106,8 @@
  
  AC_PROG_LIBTOOL
@@ -26,3 +12,26 @@ diff -Naur cxxtools-2.2/configure.ac cxxtools-2.2.patch/configure.ac
  
  AC_SUBST(CXXTOOLS_CXXFLAGS)
  AC_SUBST(CXXTOOLS_LDFLAGS)
+diff -Naur a/configure b/configure
+--- a/configure	2013-04-21 21:13:11.000000000 +0200
++++ b/configure	2014-01-03 20:34:53.404660480 +0100
+@@ -3119,7 +3119,7 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-am__api_version='1.16'
++am__api_version='1.17'
+ 
+ 
+ 
+@@ -17316,8 +17316,8 @@
+ 
+ 
+ 
+-CXXTOOLS_CXXFLAGS='-I${includedir}'
+-CXXTOOLS_LDFLAGS='-L${libdir} -lcxxtools'
++CXXTOOLS_CXXFLAGS=''
++CXXTOOLS_LDFLAGS='-lcxxtools'
+ 
+ 
+ 

packages/addons/addon-depends/docker/cli/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="cli"
 PKG_VERSION="$(get_pkg_version moby)"
-PKG_SHA256="b047e180c94452b4375f7e43997286e5a5712e66b1280574974b2e117b4e43bd"
+PKG_SHA256="cfd8b7b52a01e393a4e4bb584b367d0e7b8ebb4b25bf0f4b1d35b193197e8817"
 PKG_LICENSE="ASL"
 PKG_SITE="https://github.com/docker/cli"
 PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz"
@@ -12,7 +12,7 @@ PKG_LONGDESC="The Docker CLI"
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching tag https://github.com/docker/cli/tags
-export PKG_GIT_COMMIT="3c863ff8d3f0b81f25ed3afb60f2822019c4b94f"
+export PKG_GIT_COMMIT="9e34c9bb39efd8bf96d4ec044de454ef1f24c668"
 
 configure_target() {
   go_configure
@@ -24,7 +24,7 @@ configure_target() {
   export VERSION=${PKG_VERSION}
   export BUILDTIME="$(date --utc)"
 
-  cat > "${PKG_BUILD}/go.mod" << EOF
+  cat >"${PKG_BUILD}/go.mod" <<EOF
 module github.com/docker/cli
 
 go 1.18

packages/addons/addon-depends/docker/cli/patches/cli-0001-path-for-cli-plugins.patch

@@ -1,11 +1,13 @@
 --- a/cli-plugins/manager/manager_unix.go	2023-02-03 11:54:16.746399916 +0000
 +++ b/cli-plugins/manager/manager_unix.go	2023-02-03 11:59:04.528175595 +0000
-@@ -4,6 +4,6 @@
- package manager
- 
+@@ -13,8 +13,6 @@
+ //
+ // [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs
  var defaultSystemPluginDirs = []string{
--	"/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins",
--	"/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins",
+-	"/usr/local/lib/docker/cli-plugins",
+-	"/usr/local/libexec/docker/cli-plugins",
+-	"/usr/lib/docker/cli-plugins",
+-	"/usr/libexec/docker/cli-plugins",
 +	"/storage/.kodi/addons/service.system.docker/cli-plugins",
 +	"/storage/.kodi/userdata/addon_data/service.system.docker/docker/cli-plugins",
  }

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="containerd"
-PKG_VERSION="1.7.15"
-PKG_SHA256="2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33"
+PKG_VERSION="1.7.22"
+PKG_SHA256="8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.io"
 PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"
@@ -13,7 +13,7 @@ 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
-export PKG_GIT_COMMIT="926c9586fe4a6236699318391cd44976a98e31f1"
+export PKG_GIT_COMMIT="7f7fdf5fed64eb6a7caf99b3e12efcf9d60e311c"
 
 pre_make_target() {
 
@@ -30,6 +30,8 @@ pre_make_target() {
     mv ${PKG_BUILD}/vendor ${GOPATH}/src
   fi
 
+  mv ${GOPATH}/src/github.com/containerd/containerd/api ${PKG_BUILD}/api-vendor-duplicate
+  rmdir ${GOPATH}/src/github.com/containerd/containerd
   ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/containerd/containerd
 }
 

packages/addons/addon-depends/docker/moby/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="moby"
-PKG_VERSION="26.0.2"
-PKG_SHA256="f1cf6a2e69607daa0e2ae9b5be752dc269ab30dee16f5f2180f7ff7f29270606"
+PKG_VERSION="27.2.1"
+PKG_SHA256="d8314990428a947143fedc846e5f7b5f08b0cdd06c504e1cd1fbc2f577523c13"
 PKG_LICENSE="ASL"
 PKG_SITE="https://mobyproject.org/"
 PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz"
@@ -12,7 +12,7 @@ PKG_LONGDESC="Moby is an open-source project created by Docker to enable and acc
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/moby/moby
-export PKG_GIT_COMMIT="7cef0d9cd1cf221d8c0b7b7aeda69552649e0642"
+export PKG_GIT_COMMIT="8b539b8df24032dabeaaa099cf1d0535ef0286a3"
 
 PKG_MOBY_BUILDTAGS="daemon \
                     autogen \
@@ -31,7 +31,7 @@ configure_target() {
   export VERSION=${PKG_VERSION}
   export BUILDTIME="$(date --utc)"
 
-  cat > "${PKG_BUILD}/go.mod" << EOF
+  cat >"${PKG_BUILD}/go.mod" <<EOF
 module github.com/docker/docker
 
 go 1.18
@@ -40,7 +40,7 @@ EOF
   GO111MODULE=auto ${GOLANG} mod tidy -modfile 'vendor.mod' -compat 1.18
   GO111MODULE=auto ${GOLANG} mod vendor -modfile vendor.mod
 
-  bash hack/make/.go-autogen
+  source hack/make/.go-autogen
 }
 
 make_target() {

packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch

@@ -4,8 +4,8 @@
 #
 #
 diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
---- a/cmd/dockerd/daemon_unix.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/cmd/dockerd/daemon_unix.go	2024-01-06 03:43:42.144311172 +0000
+--- a/cmd/dockerd/daemon_unix.go	2024-09-06 09:57:40.000000000 +0000
++++ b/cmd/dockerd/daemon_unix.go	2024-09-10 06:47:41.951753985 +0000
 @@ -23,7 +23,7 @@
  
  func getDefaultDaemonConfigDir() (string, error) {
@@ -16,8 +16,8 @@ diff -Naur a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go
  	// NOTE: CLI uses ~/.docker while the daemon uses ~/.config/docker, because
  	// ~/.docker was not designed to store daemon configurations.
 diff -Naur a/cmd/dockerd/options.go b/cmd/dockerd/options.go
---- a/cmd/dockerd/options.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/cmd/dockerd/options.go	2024-01-06 03:43:42.144311172 +0000
+--- a/cmd/dockerd/options.go	2024-09-06 09:57:40.000000000 +0000
++++ b/cmd/dockerd/options.go	2024-09-10 06:47:41.951753985 +0000
 @@ -39,7 +39,7 @@
  	//
  	//   - DOCKER_CONFIG only affects TLS certificates, but does not change the
@@ -37,8 +37,8 @@ diff -Naur a/cmd/dockerd/options.go b/cmd/dockerd/options.go
  	//     needed for rootless, but perhaps could be used for non-rootless(?)
  	//   - When changing  the location for TLS config, (ideally) they should
 diff -Naur a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/authz/authz_plugin_test.go
---- a/integration/plugin/authz/authz_plugin_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration/plugin/authz/authz_plugin_test.go	2024-01-06 03:43:42.100977532 +0000
+--- a/integration/plugin/authz/authz_plugin_test.go	2024-09-06 09:57:40.000000000 +0000
++++ b/integration/plugin/authz/authz_plugin_test.go	2024-09-10 06:47:41.908420295 +0000
 @@ -56,15 +56,15 @@
  
  	ctrl = &authorizationController{}
@@ -59,9 +59,9 @@ diff -Naur a/integration/plugin/authz/authz_plugin_test.go b/integration/plugin/
  		ctrl = nil
  	})
 diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugin/graphdriver/external_test.go
---- a/integration/plugin/graphdriver/external_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration/plugin/graphdriver/external_test.go	2024-01-06 03:43:42.100977532 +0000
-@@ -87,7 +87,7 @@
+--- a/integration/plugin/graphdriver/external_test.go	2024-09-06 09:57:40.000000000 +0000
++++ b/integration/plugin/graphdriver/external_test.go	2024-09-10 06:47:41.908420295 +0000
+@@ -88,7 +88,7 @@
  
  	sserver.Close()
  	jserver.Close()
@@ -70,7 +70,7 @@ diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugi
  	assert.NilError(t, err)
  }
  
-@@ -351,10 +351,10 @@
+@@ -352,10 +352,10 @@
  		respond(w, &graphDriverResponse{Size: size})
  	})
  
@@ -84,8 +84,8 @@ diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugi
  	assert.NilError(t, err)
  }
 diff -Naur a/integration-cli/docker_cli_external_volume_driver_test.go b/integration-cli/docker_cli_external_volume_driver_test.go
---- a/integration-cli/docker_cli_external_volume_driver_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration-cli/docker_cli_external_volume_driver_test.go	2024-01-06 03:43:42.487646940 +0000
+--- a/integration-cli/docker_cli_external_volume_driver_test.go	2024-09-06 09:57:40.000000000 +0000
++++ b/integration-cli/docker_cli_external_volume_driver_test.go	2024-09-10 06:47:42.278423345 +0000
 @@ -262,10 +262,10 @@
  		send(w, `{"Capabilities": { "Scope": "global" }}`)
  	})
@@ -118,27 +118,27 @@ diff -Naur a/integration-cli/docker_cli_external_volume_driver_test.go b/integra
  	assert.NilError(c, err)
  	defer os.RemoveAll(specPath)
 diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go
---- a/integration-cli/docker_cli_network_unix_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration-cli/docker_cli_network_unix_test.go	2024-01-06 03:43:42.487646940 +0000
-@@ -201,14 +201,14 @@
+--- a/integration-cli/docker_cli_network_unix_test.go	2024-09-06 09:57:40.000000000 +0000
++++ b/integration-cli/docker_cli_network_unix_test.go	2024-09-10 06:47:42.278423345 +0000
+@@ -225,14 +225,14 @@
  		}
  	})
  
 -	err := os.MkdirAll("/etc/docker/plugins", 0o755)
 +	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
- 	assert.NilError(c, err)
+ 	assert.NilError(t, err)
  
 -	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
 +	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
  	err = os.WriteFile(fileName, []byte(url), 0o644)
- 	assert.NilError(c, err)
+ 	assert.NilError(t, err)
  
 -	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
 +	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
  	err = os.WriteFile(ipamFileName, []byte(url), 0o644)
- 	assert.NilError(c, err)
+ 	assert.NilError(t, err)
  }
-@@ -220,7 +220,7 @@
+@@ -244,7 +244,7 @@
  
  	s.server.Close()
  
@@ -148,27 +148,27 @@ diff -Naur a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/d
  }
  
 diff -Naur a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go
---- a/integration-cli/docker_cli_swarm_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/integration-cli/docker_cli_swarm_test.go	2024-01-06 03:43:42.494313654 +0000
-@@ -793,14 +793,14 @@
+--- a/integration-cli/docker_cli_swarm_test.go	2024-09-06 09:57:40.000000000 +0000
++++ b/integration-cli/docker_cli_swarm_test.go	2024-09-10 06:47:42.281756705 +0000
+@@ -823,14 +823,14 @@
  		}
  	})
  
 -	err := os.MkdirAll("/etc/docker/plugins", 0o755)
 +	err := os.MkdirAll("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", 0o755)
- 	assert.NilError(c, err)
+ 	assert.NilError(t, err)
  
 -	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
 +	fileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", netDrv)
  	err = os.WriteFile(fileName, []byte(url), 0o644)
- 	assert.NilError(c, err)
+ 	assert.NilError(t, err)
  
 -	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
 +	ipamFileName := fmt.Sprintf("/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins/%s.spec", ipamDrv)
  	err = os.WriteFile(ipamFileName, []byte(url), 0o644)
- 	assert.NilError(c, err)
+ 	assert.NilError(t, err)
  }
-@@ -813,7 +813,7 @@
+@@ -843,7 +843,7 @@
  	setupRemoteGlobalNetworkPlugin(c, mux, s.server.URL, globalNetworkPlugin, globalIPAMPlugin)
  	defer func() {
  		s.server.Close()
@@ -178,9 +178,9 @@ diff -Naur a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_c
  	}()
  
 diff -Naur a/libnetwork/drivers/remote/driver_test.go b/libnetwork/drivers/remote/driver_test.go
---- a/libnetwork/drivers/remote/driver_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/libnetwork/drivers/remote/driver_test.go	2024-01-06 03:43:42.480980226 +0000
-@@ -41,7 +41,7 @@
+--- a/libnetwork/drivers/remote/driver_test.go	2024-09-06 09:57:40.000000000 +0000
++++ b/libnetwork/drivers/remote/driver_test.go	2024-09-10 06:47:42.268423262 +0000
+@@ -42,7 +42,7 @@
  }
  
  func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() {
@@ -190,9 +190,9 @@ diff -Naur a/libnetwork/drivers/remote/driver_test.go b/libnetwork/drivers/remot
  		specPath = filepath.Join(os.Getenv("programdata"), "docker", "plugins")
  	}
 diff -Naur a/libnetwork/ipams/remote/remote_test.go b/libnetwork/ipams/remote/remote_test.go
---- a/libnetwork/ipams/remote/remote_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/libnetwork/ipams/remote/remote_test.go	2024-01-06 03:43:42.470980156 +0000
-@@ -36,7 +36,7 @@
+--- a/libnetwork/ipams/remote/remote_test.go	2024-09-06 09:57:40.000000000 +0000
++++ b/libnetwork/ipams/remote/remote_test.go	2024-09-10 06:47:42.261756541 +0000
+@@ -38,7 +38,7 @@
  }
  
  func setupPlugin(t *testing.T, name string, mux *http.ServeMux) func() {
@@ -202,8 +202,8 @@ diff -Naur a/libnetwork/ipams/remote/remote_test.go b/libnetwork/ipams/remote/re
  		specPath = filepath.Join(os.Getenv("programdata"), "docker", "plugins")
  	}
 diff -Naur a/libnetwork/libnetwork_unix_test.go b/libnetwork/libnetwork_unix_test.go
---- a/libnetwork/libnetwork_unix_test.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/libnetwork/libnetwork_unix_test.go	2024-01-06 03:43:42.484313584 +0000
+--- a/libnetwork/libnetwork_unix_test.go	2024-09-06 09:57:40.000000000 +0000
++++ b/libnetwork/libnetwork_unix_test.go	2024-09-10 06:47:42.271756623 +0000
 @@ -2,4 +2,4 @@
  
  package libnetwork_test
@@ -211,9 +211,9 @@ diff -Naur a/libnetwork/libnetwork_unix_test.go b/libnetwork/libnetwork_unix_tes
 -var specPath = "/etc/docker/plugins"
 +var specPath = "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins"
 diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
---- a/pkg/plugins/discovery.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/pkg/plugins/discovery.go	2024-01-06 03:43:42.107644246 +0000
-@@ -120,12 +120,12 @@
+--- a/pkg/plugins/discovery.go	2024-09-06 09:57:40.000000000 +0000
++++ b/pkg/plugins/discovery.go	2024-09-10 06:47:41.915087017 +0000
+@@ -128,12 +128,12 @@
  //
  // On Unix in non-rootless mode:
  //
@@ -229,8 +229,8 @@ diff -Naur a/pkg/plugins/discovery.go b/pkg/plugins/discovery.go
  func SpecsPaths() []string {
  	return specsPaths()
 diff -Naur a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go
---- a/pkg/plugins/discovery_unix.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/pkg/plugins/discovery_unix.go	2024-01-06 03:43:42.107644246 +0000
+--- a/pkg/plugins/discovery_unix.go	2024-09-06 09:57:40.000000000 +0000
++++ b/pkg/plugins/discovery_unix.go	2024-09-10 06:47:41.915087017 +0000
 @@ -12,7 +12,7 @@
  	if configHome, err := homedir.GetConfigHome(); err != nil {
  		return filepath.Join(configHome, "docker/plugins")
@@ -248,8 +248,8 @@ diff -Naur a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go
 +	return []string{"/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", "/usr/lib/docker/plugins"}
  }
 diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
---- a/pkg/plugins/plugins.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/pkg/plugins/plugins.go	2024-01-06 03:43:42.107644246 +0000
+--- a/pkg/plugins/plugins.go	2024-09-06 09:57:40.000000000 +0000
++++ b/pkg/plugins/plugins.go	2024-09-10 06:47:41.915087017 +0000
 @@ -4,7 +4,7 @@
  // Docker discovers plugins by looking for them in the plugin directory whenever
  // a user or container tries to use one by name. UNIX domain socket files must
@@ -260,8 +260,8 @@ diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
  // its name if it exists.
  //
 diff -Naur a/registry/config_unix.go b/registry/config_unix.go
---- a/registry/config_unix.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/registry/config_unix.go	2024-01-06 03:43:42.487646940 +0000
+--- a/registry/config_unix.go	2024-09-06 09:57:40.000000000 +0000
++++ b/registry/config_unix.go	2024-09-10 06:47:42.275089984 +0000
 @@ -5,7 +5,7 @@
  // defaultCertsDir is the platform-specific default directory where certificates
  // are stored. On Linux, it may be overridden through certsDir, for example, when
@@ -272,8 +272,8 @@ diff -Naur a/registry/config_unix.go b/registry/config_unix.go
  // cleanPath is used to ensure that a directory name is valid on the target
  // platform. It will be passed in something *similar* to a URL such as
 diff -Naur a/registry/search_endpoint_v1.go b/registry/search_endpoint_v1.go
---- a/registry/search_endpoint_v1.go	2024-01-04 15:38:22.000000000 +0000
-+++ b/registry/search_endpoint_v1.go	2024-01-06 03:43:42.487646940 +0000
+--- a/registry/search_endpoint_v1.go	2024-09-06 09:57:40.000000000 +0000
++++ b/registry/search_endpoint_v1.go	2024-09-10 06:47:42.278423345 +0000
 @@ -54,7 +54,7 @@
  		if endpoint.IsSecure {
  			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`

packages/addons/addon-depends/docker/tini/package.mk

@@ -13,7 +13,7 @@ PKG_LONGDESC="Tini is a simplest init system."
 
 PKG_MAKE_OPTS_TARGET="tini-static"
 
-pre_configure_target(){
+pre_configure_target() {
   sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" ${PKG_BUILD}/src/tiniConfig.h.in
 }
 

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aspnet6-runtime"
-PKG_VERSION="6.0.29"
+PKG_VERSION="6.0.33"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"
 PKG_DEPENDS_TARGET="toolchain"
@@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual"
 
 case "${ARCH}" in
   "aarch64")
-    PKG_SHA256="11296bb5c22b7b38cfd0cba472fc79d40edc4e778238a1fab466028504cc84e9"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/094fe5d6-0520-4c0a-9edf-b53d269f8b20/8c5e69ed04787815037ae373ffb77466/aspnetcore-runtime-6.0.29-linux-arm64.tar.gz"
+    PKG_SHA256="4019316b34bbdf5756abda4037f87a4328f26abfb6c0c4fd79cf160c35ad337b"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/0c5a5f3a-881e-4ceb-a334-c5e3b210eef8/9834ffebacea659cd14d272fb01f81c4/aspnetcore-runtime-6.0.33-linux-arm64.tar.gz"
     ;;
   "arm")
-    PKG_SHA256="f6d6d7418a5bff97c653db1aa8ba4faf83379521e519918f31afcd4c41051833"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/57510d35-63b1-4535-bf83-e10deb8a3b78/b052a4381befd434cbe8da36ab937ff8/aspnetcore-runtime-6.0.29-linux-arm.tar.gz"
+    PKG_SHA256="f19cf33ad2c53f6285130809f976255c8f45d043e52c4d6a8759363ef4a47cfa"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4ac9397f-3f4a-4cd0-aba2-35e7f1b47396/9823f50c32028899f430bc3ae87251b1/aspnetcore-runtime-6.0.33-linux-arm.tar.gz"
     ;;
   "x86_64")
-    PKG_SHA256="2ed988b68f40582edca7280e07b1e0bc342bfcd25b28016f4ff48f75fd3f775b"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/70ddd1ed-776d-41d2-b192-f02436ef3ca6/337d6dd35177408acb9889289a7743a7/aspnetcore-runtime-6.0.29-linux-x64.tar.gz"
+    PKG_SHA256="4fb761ed8d344405a690b628de883223594e0f19794aa226fb21bd6ddd0c0d0b"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/91f66f75-bd3e-48f1-acb9-99c0da753f96/42c47999ee4c4d108774536afe5da160/aspnetcore-runtime-6.0.33-linux-x64.tar.gz"
     ;;
 esac
 PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="aspnet8-runtime"
-PKG_VERSION="8.0.4"
+PKG_VERSION="8.0.8"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.microsoft.com/"
 PKG_DEPENDS_TARGET="toolchain"
@@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual"
 
 case "${ARCH}" in
   "aarch64")
-    PKG_SHA256="e3b666aa7836a83b71575df0680d0e57bf46b356668521db174e5686fec28cf0"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/80ec12e5-b26f-466c-a20c-f96772ea709d/606e7203912400b44cb35d6fcecf60bf/aspnetcore-runtime-8.0.4-linux-arm64.tar.gz"
+    PKG_SHA256="ac79115682ee679756838ee623ca46617322c787826f3638438bc6443fcee345"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/f6fcf2c9-39ad-49c7-80b5-92306309e796/3cac9217f55528cb60c95702ba92d78b/aspnetcore-runtime-8.0.8-linux-arm64.tar.gz"
     ;;
   "arm")
-    PKG_SHA256="f0d65259cb6bdf3324fe0ef2a1b72418ed3db67dbe404debd44bffb352d02875"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/f12a9449-04ba-454c-bc35-4cdb426accf6/2729a371b61d59794845eb309a46fba2/aspnetcore-runtime-8.0.4-linux-arm.tar.gz"
+    PKG_SHA256="284c4c9ae3eae7548450ead59e445b3b64c72301ecf393926578231e480dd21e"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/26f16795-9928-4ddd-96f4-666e6e256715/bf797e4f997c965aeb0183b467fcf71a/aspnetcore-runtime-8.0.8-linux-arm.tar.gz"
     ;;
   "x86_64")
-    PKG_SHA256="ec817fa8f7a1c0f9c627425b1eda6ffe7a49bd180cb15d9c59ace2a051dd83e4"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/0b0bc7f4-c6e5-4cec-a7ed-45c2fac0da4b/ae2090564274152b5a4be9f1e66c5d30/aspnetcore-runtime-8.0.4-linux-x64.tar.gz"
+    PKG_SHA256="7bee47a53a0a4977e4182e8085355d146be6b2f958aa3f3ae2de0c39439e7348"
+    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/648de803-0b0c-46bc-9601-42a94dae0b41/241fd17cee8d473a78675e30681979bb/aspnetcore-runtime-8.0.8-linux-x64.tar.gz"
     ;;
 esac
 PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz"

packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk

@@ -10,4 +10,4 @@ PKG_URL="https://github.com/Duckbox-Developers/dvbsnoop/archive/${PKG_VERSION}.t
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"

packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk

@@ -10,4 +10,4 @@ PKG_URL="https://github.com/braice/MuMuDVB/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libdvbcsa"
 PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"

packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="szap-s2"
-PKG_VERSION="69ff3584caf9b46f7a551b39b9f9956f8461377c"
-PKG_SHA256="eea8d99d2d5d6403d624acdd9df908a2dd7767dd5469b44e9a281ff863096b32"
+PKG_VERSION="c4e6ff29c7371c42653edce152d50d18066a4ae7"
+PKG_SHA256="4c512c891fa4a1e4326632956b60a96eca3d1341f862ae10c1ef2c98676e4c4b"
 PKG_LICENSE="GPL"
-PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
-PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/${PKG_VERSION}.tar.gz"
+PKG_SITE="https://github.com/crazycat69/szap-s2"
+PKG_URL="https://github.com/crazycat69/szap-s2/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
 PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk

@@ -9,4 +9,4 @@ PKG_SITE="https://github.com/mighty-p/t2scan"
 PKG_URL="https://github.com/mighty-p/t2scan/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A small channel scan tool which generates DVB-T/T2 channels.conf files."
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"

packages/addons/addon-depends/dvb-tools-depends/t2scan/patches/t2scan-15-fix-building-with-gcc-14.1.0.patch

@@ -0,0 +1,104 @@
+From 40f5e11bf9977f5daf48c15a899d17814557fc5b Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Tue, 7 May 2024 17:34:47 +1000
+Subject: [PATCH 1/3] fix building with gcc-14.1
+
+../countries.c: In function 'choose_country':
+../countries.c:121:84: error: assignment to 'int *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
+  121 |                    plplist[0] = -1; plplist[1] = 1; plplist[2] = 0; plplist_length = 3;
+      |
+---
+ countries.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/countries.c b/countries.c
+index b61d86d..6295cd5 100644
+--- a/countries.c
++++ b/countries.c
+@@ -118,7 +118,8 @@ int choose_country (const char * country,
+ 
+                 case    AT:     //      AUSTRIA
+                 case    IT:     //      ITALY
+-                   plplist[0] = -1; plplist[1] = 1; plplist[2] = 0; plplist_length = 3;
++                   plplist[0] = -1; plplist[1] = 1; plplist[2] = 0;
++                   *plplist_length = 3;
+                 case    BE:     //      BELGIUM
+                 case    CH:     //      SWITZERLAND
+                 case    CO:     //      COLOMBIA, DVB-C + DVB-T2
+
+From b3e1a2b588134f3c546ba0e9a15511da38a8fdc6 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Tue, 7 May 2024 17:40:25 +1000
+Subject: [PATCH 2/3] fix calloc warnings
+
+warning: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args]
+---
+ parse-dvbscan.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/parse-dvbscan.c b/parse-dvbscan.c
+index 72f1cb8..11950b9 100644
+--- a/parse-dvbscan.c
++++ b/parse-dvbscan.c
+@@ -128,7 +128,7 @@ void parse_t2scan_flags(const char * input_buffer, struct t2scan_flags * flags)
+ 
+ int dvbscan_parse_tuningdata(const char * tuningdata, struct t2scan_flags * flags) {
+         FILE * initdata = NULL;
+-        char * buf = (char *) calloc(sizeof(char), MAX_LINE_LENGTH);
++        char * buf = (char *) calloc(MAX_LINE_LENGTH, sizeof(char));
+         enum __dvbscan_args arg;
+         struct transponder * tn;
+         int count = 0;
+@@ -147,7 +147,7 @@ int dvbscan_parse_tuningdata(const char * tuningdata, struct t2scan_flags * flag
+                 }
+ 
+         while (fgets(buf, MAX_LINE_LENGTH, initdata) != NULL) {
+-                char * copy = (char *) calloc(sizeof(char), strlen(buf) + 1);
++                char * copy = (char *) calloc(strlen(buf) + 1, sizeof(char));
+                 char * token;
+ 
+                 if (copy == NULL) {
+
+From d5071e9fdb3f14194f72ead51d1353b6c05caa80 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Wed, 8 May 2024 08:19:11 +1000
+Subject: [PATCH 3/3] fix building with gcc-14.1
+
+fixes:
+
+../scan.c: In function 'network_scan':
+../scan.c:2413:29: error: assignment to 'int *' from incompatible pointer type 'int (*)[256]' [-Wincompatible-pointer-types]
+ 2413 |                  my_plplist = &plplist;
+      |                             ^
+../scan.c:2417:29: error: assignment to 'int *' from incompatible pointer type 'int (*)[256]' [-Wincompatible-pointer-types]
+ 2417 |                  my_plplist = &user_plplist;
+      |                             ^
+../scan.c:2420:29: error: assignment to 'int *' from incompatible pointer type 'int (*)[256]' [-Wincompatible-pointer-types]
+ 2420 |                  my_plplist = &plplist;
+      |                             ^
+---
+ scan.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scan.c b/scan.c
+index 17fdb3c..5341a1a 100644
+--- a/scan.c
++++ b/scan.c
+@@ -2410,14 +2410,14 @@ static void network_scan(int frontend_fd, int tuning_data) {
+               // plp loop
+               if (delsys == SYS_DVBT2 && (!multistream)) {
+                  // multistream is not supported, so use plp id -1 ("autodetection") as only value to scan
+-                 my_plplist = &plplist;
++                 my_plplist = plplist;
+                  my_plplist[0] = -1;
+                  my_plplist_length = 1;
+               } else if (delsys == SYS_DVBT2 && use_user_plplist) {
+-                 my_plplist = &user_plplist;
++                 my_plplist = user_plplist;
+                  my_plplist_length = user_plplist_length;
+               } else if (delsys == SYS_DVBT2) {
+-                 my_plplist = &plplist;
++                 my_plplist = plplist;
+                  my_plplist_length = plplist_length;
+               } else {
+                  // for legacy DVB-T (or ATSC) there is nothing such as PLPs

packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk

@@ -10,4 +10,4 @@ PKG_URL="https://www.gen2vdr.de/wirbel/w_scan/w_scan-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T channels.conf files."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x264"
-PKG_VERSION="7ed753b10a61d0be95f683289dfb925b800b0676"
-PKG_SHA256="1bdf238ef065e711c4cf436046917de4a7a3e920a0b0ae1fa0f528ab23f17b12"
+PKG_VERSION="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
+PKG_SHA256="2a1b197fd1fbc85045794f18c9353648a9ae3cbe194b7b92d523d096f9445464"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"
 PKG_URL="https://code.videolan.org/videolan/x264/-/archive/${PKG_VERSION}/x264-${PKG_VERSION}.tar.bz2"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x265"
-PKG_VERSION="3.6"
-PKG_SHA256="eccd9ee41ba64c55bb906ea79d28b563fdfb4fd3b7626746a0e5f8c9581491b5"
+PKG_VERSION="4.0"
+PKG_SHA256="a5b6b1176a6cbf6905cdc3fcc464d6bc626cb72ea886751e8fe445f85aa5e386"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.videolan.org/developers/x265.html"
@@ -14,5 +14,5 @@ PKG_TOOLCHAIN="make"
 
 pre_configure_target() {
   LDFLAGS+=" -ldl"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -G "Unix Makefiles" ./source
+  ${CMAKE} -G "Unix Makefiles" ./source
 }

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

@@ -7,7 +7,7 @@ PKG_SHA256="9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623"
 PKG_LICENSE="GPL-3.0-only"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis opus x264 zlib"
+PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis libxml2 opus x264 zlib"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
 PKG_BUILD_FLAGS="-sysroot"
 
@@ -35,7 +35,7 @@ pre_configure_target() {
   cd ${PKG_BUILD}
   rm -rf .${TARGET_NAME}
 
-# HW encoders
+  # HW encoders
 
   # Generic
   if [[ "${TARGET_ARCH}" = "x86_64" ]]; then
@@ -69,7 +69,7 @@ pre_configure_target() {
     --enable-encoder=libx265"
   fi
 
-# Encoders
+  # Encoders
     PKG_FFMPEG_ENCODERS="\
     `#Video encoders` \
     --enable-libvpx \
@@ -91,7 +91,7 @@ pre_configure_target() {
     --enable-libvorbis \
     --enable-encoder=libvorbis"
 
-# X11 grab for screen recording
+  # X11 grab for screen recording
   if [ "${DISPLAYSERVER}" = "x11" ]; then
     PKG_FFMPEG_LIBS+=" -lX11"
     PKG_FFMPEG_X11_GRAB="\
@@ -162,8 +162,9 @@ configure_target() {
     --enable-pic \
     --disable-gnutls \
     --enable-openssl \
+    --enable-libxml2 \
     \
     `#Advanced options` \
-    --disable-hardcoded-tables \
+    --disable-hardcoded-tables
 
 }

packages/addons/addon-depends/ffmpegx/patches/ffmpeg-002-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch

@@ -0,0 +1,52 @@
+From 0b541aa54b9573d8eef7401a0cc58c422fe60a9a Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Thu, 8 Aug 2024 18:04:17 +0100
+Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
+ binutils 2.43
+
+binutils 2.43 has stricter validation for labels[1] and results in errors
+when building ffmpeg for armv5:
+
+src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
+
+Remove the leading zero in the "01" label to resolve this error.
+
+[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
+
+Upstream-Status: Submitted [https://ffmpeg.org//pipermail/ffmpeg-devel/2024-August/332149.html]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
+index 4f9aa48..d315686 100644
+--- a/libavcodec/arm/mlpdsp_armv5te.S
++++ b/libavcodec/arm/mlpdsp_armv5te.S
+@@ -229,7 +229,7 @@ A .endif
+   .endif
+ 
+         // Begin loop
+-01:
++1:
+   .if TOTAL_TAPS == 0
+         // Things simplify a lot in this case
+         // In fact this could be pipelined further if it's worth it...
+@@ -241,7 +241,7 @@ A .endif
+         str     ST0, [PST, #-4]!
+         str     ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
+         str     ST0, [PSAMP], #4 * MAX_CHANNELS
+-        bne     01b
++        bne     1b
+   .else
+     .if \fir_taps & 1
+       .set LOAD_REG, 1
+@@ -333,7 +333,7 @@ T       orr     AC0, AC0, AC1
+         str     ST3, [PST, #-4]!
+         str     ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
+         str     ST3, [PSAMP], #4 * MAX_CHANNELS
+-        bne     01b
++        bne     1b
+   .endif
+         b       99f
+ 

packages/addons/addon-depends/ffmpegx/patches/ffmpeg-03-lavc-libx265--unbreak-build-for-X265-BUILD---210.patch

@@ -0,0 +1,96 @@
+From 1f801dfdb5066aadf0ade9cb5e94d620f33eacdc Mon Sep 17 00:00:00 2001
+From: Gyan Doshi <ffmpeg@gyani.pro>
+Date: Sun, 11 Aug 2024 12:51:50 +0530
+Subject: [PATCH] lavc/libx265: unbreak build for X265_BUILD >= 210
+
+x265 added support for alpha starting with build 210.
+While doing so, x265_encoder_encode() changed its fifth arg to
+an array of pointers to x265_picture. This broke building lavc/libx265.c
+
+This patch simply unbreaks the build and maintains existing single-layer
+non-alpha encoding support.
+
+Fixes #11130
+---
+ libavcodec/libx265.c | 40 ++++++++++++++++++++++++++++++----------
+ 1 file changed, 30 insertions(+), 10 deletions(-)
+
+diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
+index 0dc7ab6eeb6a3..3bc3b5a03e9fc 100644
+--- a/libavcodec/libx265.c
++++ b/libavcodec/libx265.c
+@@ -661,7 +661,13 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+ {
+     libx265Context *ctx = avctx->priv_data;
+     x265_picture x265pic;
+-    x265_picture x265pic_out = { 0 };
++#if X265_BUILD >= 210
++    x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS];
++    x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
++#else
++    x265_picture x265pic_solo_out = { 0 };
++#endif
++    x265_picture* x265pic_out;
+     x265_nal *nal;
+     x265_sei *sei;
+     uint8_t *dst;
+@@ -798,8 +804,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+ #endif
+     }
+ 
++#if X265_BUILD >= 210
++    for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
++        x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
++
++    ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
++                                   pic ? &x265pic : NULL, x265pic_lyrptr_out);
++#else
+     ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
+-                                   pic ? &x265pic : NULL, &x265pic_out);
++                                   pic ? &x265pic : NULL, &x265pic_solo_out);
++#endif
+ 
+     for (i = 0; i < sei->numPayloads; i++)
+         av_free(sei->payloads[i].payload);
+@@ -829,10 +843,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+             pkt->flags |= AV_PKT_FLAG_KEY;
+     }
+ 
+-    pkt->pts = x265pic_out.pts;
+-    pkt->dts = x265pic_out.dts;
++#if X265_BUILD >= 210
++    x265pic_out = x265pic_lyrptr_out[0];
++#else
++    x265pic_out = &x265pic_solo_out;
++#endif
++
++    pkt->pts = x265pic_out->pts;
++    pkt->dts = x265pic_out->dts;
+ 
+-    switch (x265pic_out.sliceType) {
++    switch (x265pic_out->sliceType) {
+     case X265_TYPE_IDR:
+     case X265_TYPE_I:
+         pict_type = AV_PICTURE_TYPE_I;
+@@ -850,16 +870,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
+     }
+ 
+ #if X265_BUILD >= 130
+-    if (x265pic_out.sliceType == X265_TYPE_B)
++    if (x265pic_out->sliceType == X265_TYPE_B)
+ #else
+-    if (x265pic_out.frameData.sliceType == 'b')
++    if (x265pic_out->frameData.sliceType == 'b')
+ #endif
+         pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
+ 
+-    ff_side_data_set_encoder_stats(pkt, x265pic_out.frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
++    ff_side_data_set_encoder_stats(pkt, x265pic_out->frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
+ 
+-    if (x265pic_out.userData) {
+-        int idx = (int)(intptr_t)x265pic_out.userData - 1;
++    if (x265pic_out->userData) {
++        int idx = (int)(intptr_t)x265pic_out->userData - 1;
+         ReorderedData *rd = &ctx->rd[idx];
+ 
+         pkt->duration           = rd->duration;

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.22.2"
-PKG_SHA256="14b6790132eb63a02be3a33f556028dbe33c4d923df099976de8bd02be232be7"
+PKG_VERSION="1.23.1"
+PKG_SHA256="3bf56ef25470175efaa8a3616737d8b65fdaacf814297de77cba3cffdea39323"
 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/icu/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="icu"
-PKG_VERSION="74-2"
-PKG_SHA256="27b8650a94df6f945cb3b686be3be320c2a32edf3ece2981672bf98bb3baa9e1"
+PKG_VERSION="75-1"
+PKG_SHA256="925e6b4b8cf8856e0ac214f6f34e30dee63b7bb7a50460ab4603950eff48f89e"
 PKG_LICENSE="Custom"
 PKG_SITE="https://icu.unicode.org"
 PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION}.tar.gz"

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="apache-ant"
-PKG_VERSION="1.10.14"
-PKG_SHA256="a0456ecbf934b41dca74747413f2da7eafe40355fbdf5bfd38d8f3713dd828cd"
+PKG_VERSION="1.10.15"
+PKG_SHA256="4d5bb20cee34afbad17782de61f4f422c5a03e4d2dffc503bcbd0651c3d3c396"
 PKG_LICENSE="Apache License 2.0"
 PKG_SITE="https://ant.apache.org/"
 PKG_URL="https://archive.apache.org/dist/ant/binaries/${PKG_NAME}-${PKG_VERSION}-bin.tar.xz"

packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk

@@ -10,6 +10,7 @@ PKG_SITE="http://serdisplib.sourceforge.net/"
 PKG_URL="${SOURCEFORGE_SRC}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libusb-compat"
 PKG_LONGDESC="Library to drive serial/parallel/usb displays with built-in controllers."
+PKG_BUILD_FLAGS="-cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--prefix=${SYSROOT_PREFIX}/usr \
                            --bindir=${SYSROOT_PREFIX}/usr/bin \

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

@@ -3,17 +3,12 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libid3tag"
-PKG_VERSION="0.15.1b"
-PKG_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
+PKG_VERSION="0.16.3"
+PKG_SHA256="0561009778513a95d91dac33cee8418d6622f710450a7cb56a74636d53b588cb"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.underbit.com/products/mad/"
-PKG_URL="ftp://ftp.mars.org/pub/mpeg/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="https://codeberg.org/tenacityteam/libid3tag/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="A library for id3 tagging."
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static \
-                           --disable-shared"
-
-post_makeinstall_target(){
- cp ${PKG_BUILD}/id3tag.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig
-}
+PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF"

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

@@ -19,7 +19,7 @@ fi
 
 post_makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
-  cat > ${SYSROOT_PREFIX}/usr/lib/pkgconfig/mad.pc << "EOF"
+  cat >${SYSROOT_PREFIX}/usr/lib/pkgconfig/mad.pc  <<"EOF"
 prefix=/usr
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib

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

@@ -18,7 +18,9 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
 
 configure_package() {
   # if using a git hash as a package version - set RELEASE_VERSION
-  export RELEASE_VERSION="$(sed -n '1,/RE/s/Version \(.*\)/\1/p' ${PKG_BUILD}/NEWS)-git-${PKG_VERSION:0:7}"
+  if [ -f ${PKG_BUILD}/NEWS ]; then
+    export RELEASE_VERSION="$(sed -n '1,/RE/s/Version \(.*\)/\1/p' ${PKG_BUILD}/NEWS)-git-${PKG_VERSION:0:7}"
+  fi
 }
 
 post_configure_target() {

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libvpx"
-PKG_VERSION="1.14.0"
-PKG_SHA256="5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa"
+PKG_VERSION="1.14.1"
+PKG_SHA256="901747254d80a7937c933d03bd7c5d41e8e6c883e0665fadcb172542167c7977"
 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/libzip/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libzip"
-PKG_VERSION="1.10.1"
-PKG_SHA256="dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318"
+PKG_VERSION="1.11.1"
+PKG_SHA256="721e0e4e851073b508c243fd75eda04e4c5006158a900441de10ce274cc3b633"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libzip.org/"
 PKG_URL="https://libzip.org/download/${PKG_NAME}-${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="24.04"
-PKG_SHA256="76a6ff060887773f25977b588ae508484bb12d11cb7a2be3322daa9c6e53f1b2"
+PKG_VERSION="24.06"
+PKG_SHA256="0683f28a2475dc2417205ba528debccc407da4d9fa6516eb4b75b3ff7244e96e"
 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/libplacebo/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libplacebo"
-PKG_VERSION="6.338.2"
-PKG_SHA256="2f1e624e09d72a8c9db70f910f7560e764a1c126dae42acc5b3bcef836a7aec6"
+PKG_VERSION="7.349.0"
+PKG_SHA256="627e32439a0b3d2b90368ead7e919f470ee7446c87cc0f7841bbe319b23aa8b1"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://code.videolan.org/videolan/libplacebo"
 PKG_URL="https://github.com/haasn/libplacebo/archive/refs/tags/v${PKG_VERSION}.tar.gz"

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="24.04"
-PKG_SHA256="ebeb1cb701a23059c736cb33b91a3172c4f98e7341e44a0b30a11919191a274d"
+PKG_VERSION="24.06"
+PKG_SHA256="32f4a82a31e386e177fdf6e4c237053e475b501089269ab2c729452a09313520"
 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/mpv-drmprime/patches/mpv-drmprime-0001-meson-also-expose-present_sync-for-VT-only-after.patch

@@ -1,41 +0,0 @@
-From e575ec4fc3654387c7358bd3640877ef32628d2c Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Wed, 22 Nov 2023 19:44:13 +0100
-Subject: [PATCH] meson: also expose present_sync for VT-only after
- a96d04f19d73
-
-$ meson setup --auto-features=disabled -Ddrm=enabled -Degl=enabled -Dgbm=enabled -Degl-drm=enabled /tmp/mpv_build
-$ meson compile -C /tmp/mpv_build
-[...]
-ld: error: undefined symbol: mp_present_initialize
->>> referenced by drm_common.c
->>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(vo_drm_init)
-
-ld: error: undefined symbol: present_sync_update_values
->>> referenced by drm_common.c
->>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
-
-ld: error: undefined symbol: present_sync_swap
->>> referenced by drm_common.c
->>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
-
-ld: error: undefined symbol: present_sync_get_info
->>> referenced by vo_drm.c
->>>               libmpv.so.2.2.0.p/video_out_vo_drm.c.o:(get_vsync)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index a3c3430dd47b..6fd5afa5122a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1049,7 +1049,7 @@ if features['xv']
-     sources += files('video/out/vo_xv.c')
- endif
- 
--if features['wayland'] or features['x11']
-+if features['wayland'] or features['x11'] or features['drm']
-     sources += ('video/out/present_sync.c')
- endif
- 

packages/addons/addon-depends/multimedia-tools-depends/opencaster/patches/opencaster-04_fix-gcc-14-build.patch

@@ -0,0 +1,64 @@
+From 667f3fc30ab8e4cabedb03cf13ba5729858b2211 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Sat, 4 May 2024 11:10:47 +0000
+Subject: [PATCH] fix build with gcc-14
+
+---
+ tools/dsmcc-receive/carousel.c | 1 +
+ tools/mpe2sec/mpe.c            | 2 +-
+ tools/sec2ts/sec2ts.c          | 4 +++-
+ tools/tsdiscont/tsdiscont.c    | 1 +
+ 4 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tools/dsmcc-receive/carousel.c b/tools/dsmcc-receive/carousel.c
+index 40547ef..44da078 100644
+--- a/tools/dsmcc-receive/carousel.c
++++ b/tools/dsmcc-receive/carousel.c
+@@ -32,6 +32,7 @@
+ #include "dsmcc.h"
+ #include "biop.h"
+ #include "utils.h"
++#include "filter.h"
+ 
+ 
+ int
+diff --git a/tools/mpe2sec/mpe.c b/tools/mpe2sec/mpe.c
+index 18417af..3d30fd7 100644
+--- a/tools/mpe2sec/mpe.c
++++ b/tools/mpe2sec/mpe.c
+@@ -29,7 +29,7 @@ static char padding[184];
+ static char ip_device[IFNAMSIZ];
+ static char s[180];
+ static const char *Id = "$Id: mpe.c 25 2011-10-13 15:35:18Z jfbcable $";
+-const MPE_HEADER_LEN=12;
++const int MPE_HEADER_LEN=12;
+ int tun_fd = -1;
+ 
+ #ifdef IFF_TUN
+diff --git a/tools/sec2ts/sec2ts.c b/tools/sec2ts/sec2ts.c
+index b97fff4..7b8c884 100644
+--- a/tools/sec2ts/sec2ts.c
++++ b/tools/sec2ts/sec2ts.c
+@@ -154,7 +154,9 @@ int main(int argc, char *argv[])
+ 	/* Start to process sections */
+ 	not_finished = 1;
+ 	if(stuff){
+-		section_next = 1;
++		// this is bad code as it is used as a flag in the below while loop
++		// cast the 1 to pointer to allow compile with gcc-14
++		section_next = (unsigned char *) 1;
+ 	} else {
+ 		section_next = get_section(&section_size_next, fd_in);
+ 	}
+diff --git a/tools/tsdiscont/tsdiscont.c b/tools/tsdiscont/tsdiscont.c
+index e6f6cd1..19e3398 100644
+--- a/tools/tsdiscont/tsdiscont.c
++++ b/tools/tsdiscont/tsdiscont.c
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <inttypes.h>
++#include <arpa/inet.h>
+ 
+ #define TS_HEADER_SIZE 4
+ #define TS_PACKET_SIZE 188

packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/patches/tsdecrypt-01_fix_gcc-14_build.patch

@@ -0,0 +1,47 @@
+From 70e4aa204cf7809c91b782fa59646dfa11bad53f Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Sat, 4 May 2024 11:33:54 +0000
+Subject: [PATCH] fix build with gcc-14
+
+---
+ camd-newcamd.c | 1 +
+ filter.c       | 1 +
+ process.c      | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/camd-newcamd.c b/camd-newcamd.c
+index 48ad567..0d87735 100644
+--- a/camd-newcamd.c
++++ b/camd-newcamd.c
+@@ -18,6 +18,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <crypt.h>
+ 
+ #include "libfuncs/libfuncs.h"
+ 
+diff --git a/filter.c b/filter.c
+index 2cac2dc..ea440e9 100644
+--- a/filter.c
++++ b/filter.c
+@@ -14,6 +14,7 @@
+  */
+ #include <ctype.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "data.h"
+ #include "filter.h"
+diff --git a/process.c b/process.c
+index ab3be80..d3e7fb3 100644
+--- a/process.c
++++ b/process.c
+@@ -14,6 +14,7 @@
+  */
+ #include <unistd.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <sys/uio.h>
+ 
+ #include "bitstream.h"

packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk

@@ -10,7 +10,7 @@ PKG_URL="https://github.com/vgropp/bwm-ng/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses libstatgrab"
 PKG_LONGDESC="A small and simple console-based live network and disk io bandwidth monitor."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-libstatgrab \
                            --with-time \

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libpcap"
-PKG_VERSION="1.10.4"
-PKG_SHA256="ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f"
+PKG_VERSION="1.10.5"
+PKG_SHA256="37ced90a19a302a7f32e458224a00c365c117905c2cd35ac544b6880a81488f0"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.tcpdump.org/"
 PKG_URL="https://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"
@@ -11,20 +11,19 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A portable framework for low-level network monitoring."
 # use configure, not cmake. review cmake in future release.
 PKG_TOOLCHAIN="configure"
+PKG_BUILD_FLAGS="-cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="LIBS=-lpthread \
                            ac_cv_header_libusb_1_0_libusb_h=no \
                            --disable-shared \
                            --with-pcap=linux \
                            --disable-bluetooth \
-                           --disable-can \
                            --without-libnl \
-                           --disable-dbus \
-                           --disable-canusb"
+                           --disable-dbus"
 
 pre_configure_target() {
-# When cross-compiling, configure can't set linux version
-# forcing it
+  # When cross-compiling, configure can't set linux version
+  # forcing it
   sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' ../configure
 }
 

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

@@ -10,7 +10,7 @@ PKG_URL="https://code.blinkace.com/pdw/iftop/-/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses libpcap libnl"
 PKG_LONGDESC="A tool to display bandwidth usage on an interface."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 pre_build_target() {
   mkdir -p ${PKG_BUILD}/.${TARGET_NAME}

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="iperf"
-PKG_VERSION="3.16"
-PKG_SHA256="be859e7168d0c867029e7013a8de273a169b4842ec7c24cd6570af75d5080aa3"
+PKG_VERSION="3.17.1"
+PKG_SHA256="105b4fe7fbce31c9b94a3fec10c46e3b4b298adc076e1e3af52b990e1faf2db9"
 PKG_LICENSE="BSD"
 PKG_SITE="http://software.es.net/iperf/"
 PKG_URL="https://github.com/esnet/iperf/archive/${PKG_VERSION}.tar.gz"

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

@@ -18,7 +18,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_librtmp_rtmp_h=yes \
             --without-curses"
 
 pre_configure_target() {
-  export CFLAGS="${CFLAGS} -I../"
+  export CFLAGS="${CFLAGS} -I../ -DHAVE_STDLIB_H=1"
+
+  #workaround gcc-14 erroring with incompatible pointer type
+  CFLAGS+=" -Wno-incompatible-pointer-types"
 }
 
 pre_build_target() {

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

@@ -10,7 +10,7 @@ PKG_URL="https://github.com/jpr5/ngrep/archive/${PKG_VERSION}.tar.gz"
 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_BUILD_FLAGS="-sysroot -parallel -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=${SYSROOT_PREFIX}/usr/include \
                            --enable-ipv6 \

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nmap"
-PKG_VERSION="7.94"
-PKG_SHA256="d71be189eec43d7e099bac8571509d316c4577ca79491832ac3e1217bc8f92cc"
+PKG_VERSION="7.95"
+PKG_SHA256="e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778"
 PKG_LICENSE="GPL"
 PKG_SITE="https://nmap.org/"
 PKG_URL="https://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
@@ -23,7 +23,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-zenmap=no"
 
 pre_configure_target() {
-# nmap fails to build in subdirs
+  # nmap fails to build in subdirs
   cd ${PKG_BUILD}
     rm -rf .${TARGET_NAME}
 

packages/addons/addon-depends/network-tools-depends/nmap/patches/nmap-0001-allow-build-with-automake-1-17.patch

@@ -0,0 +1,74 @@
+diff -Nur a/libpcre/aclocal.m4 b/libpcre/aclocal.m4
+--- a/libpcre/aclocal.m4	2023-06-24 01:53:07.000000000 +0000
++++ b/libpcre/aclocal.m4	2024-07-29 11:29:45.699525807 +0000
+@@ -32,10 +32,10 @@
+ # generated from the m4 files accompanying Automake X.Y.
+ # (This private macro should not be called outside this file.)
+ AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.16'
++[am__api_version='1.17'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.16.5], [],
++m4_if([$1], [1.17], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.5])dnl
++[AM_AUTOMAKE_VERSION([1.17])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+diff -Nur a/libpcre/configure b/libpcre/configure
+--- a/libpcre/configure	2024-02-28 16:06:30.000000000 +0000
++++ b/libpcre/configure	2024-07-29 11:25:14.134081052 +0000
+@@ -2758,7 +2758,7 @@
+ 
+ 
+ 
+-am__api_version='1.16'
++am__api_version='1.17'
+ 
+ 
+ 
+diff -Nur a/libssh2/aclocal.m4 b/libssh2/aclocal.m4
+--- a/libssh2/aclocal.m4	2024-02-28 17:39:06.000000000 +0000
++++ b/libssh2/aclocal.m4	2024-07-29 11:30:13.873078377 +0000
+@@ -32,10 +32,10 @@
+ # generated from the m4 files accompanying Automake X.Y.
+ # (This private macro should not be called outside this file.)
+ AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.16'
++[am__api_version='1.17'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.16.5], [],
++m4_if([$1], [1.17], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -51,7 +51,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.5])dnl
++[AM_AUTOMAKE_VERSION([1.17])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+diff -Nur a/libssh2/configure b/libssh2/configure
+--- a/libssh2/configure	2024-02-28 17:39:06.000000000 +0000
++++ b/libssh2/configure	2024-07-29 11:25:39.590945455 +0000
+@@ -3236,7 +3236,7 @@
+ fi
+ 
+ LIBSSH2VER=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h`
+-am__api_version='1.16'
++am__api_version='1.17'
+ 
+ 
+   # Find a good install program.  We prefer a C program (faster),

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

@@ -2,14 +2,15 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rar2fs"
-PKG_VERSION="1.29.6"
-PKG_SHA256="ba3a0b649f2322498d54168f03d2e8bca9b1c96d70d0d97d83ea336a7525d4cb"
+PKG_VERSION="1.29.7"
+PKG_SHA256="a875d138b7ed7e3353b5de2f0c5ec02ef6a32c310fe3b07886bc95314d7875ba"
 PKG_LICENSE="GPL3"
 PKG_SITE="https://github.com/hasse69/rar2fs"
-PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/hasse69/rar2fs/archive/refs/tags/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse unrar"
 PKG_LONGDESC="FUSE file system for reading RAR archives"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
+PKG_TOOLCHAIN="autotools"
 
 pre_configure_target() {
   PKG_CONFIGURE_OPTS_TARGET="--with-unrar=${PKG_BUILD}/unrar \

packages/addons/addon-depends/network-tools-depends/rar2fs/patches/001-remove-man-pages-1.29.3.patch

@@ -7,15 +7,3 @@ diff -Nur rar2fs-1.29.3.orig/Makefile.am rar2fs-1.29.3/Makefile.am
 +SUBDIRS = src
  
  EXTRA_DIST = get-version.sh rarconfig.example
-diff -Nur rar2fs-1.29.3.orig/Makefile.in rar2fs-1.29.3/Makefile.in
---- rar2fs-1.29.3.orig/Makefile.in	2020-12-15 13:06:30.000000000 +0000
-+++ rar2fs-1.29.3/Makefile.in	2021-01-01 11:34:20.496533359 +0000
-@@ -233,7 +233,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = src man
-+SUBDIRS = src
- EXTRA_DIST = get-version.sh rarconfig.example
- all: all-recursive
- 

packages/addons/addon-depends/network-tools-depends/rar2fs/patches/002-fix-configure.patch

@@ -0,0 +1,27 @@
+From 80ebe4efb52ca2d51c62f3cdef8855e1356b35b7 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Thu, 4 Jul 2024 19:35:58 +1000
+Subject: [PATCH] Update configure.ac to support newer autotools
+
+Fixes:
+- configure.ac:506: error: required file 'config/config.rpath' not found
+
+explicitly require GETTEXT version
+This is required by `autopoint` executed by `autoreconf`
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index bee9255..80f77cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -504,6 +504,8 @@ fi
+ ########################################################
+ 
+ AM_ICONV
++AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.14.4])
+ 
+ AC_MSG_CHECKING(for commit hash in git repo)
+ GITHEAD=$BUILDDIR/.git/$(cat $BUILDDIR/.git/HEAD 2>/dev/null | cut -d" " -f2)

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

@@ -2,13 +2,13 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tcpdump"
-PKG_VERSION="4.99.4"
-PKG_SHA256="0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea"
+PKG_VERSION="4.99.5"
+PKG_SHA256="8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb"
 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"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 # use configure, not cmake. review cmake in future release.
 PKG_TOOLCHAIN="configure"
 

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

@@ -2,24 +2,20 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pcsc-lite"
-PKG_VERSION="2.1.0"
-PKG_SHA256="85cab61cc744c81e2bc432656863293b8428d0136f079e3b12a84b335b5b35aa"
+PKG_VERSION="2.2.3"
+PKG_SHA256="cab1e62755713f62ce1b567954dbb0e9a7e668ffbc3bbad3ce85c53f8f4e00a4"
 PKG_LICENSE="GPL"
 PKG_SITE="https://pcsclite.apdu.fr"
-PKG_URL="https://pcsclite.apdu.fr/files/pcsc-lite-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://pcsclite.apdu.fr/files/pcsc-lite-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libusb polkit"
 PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)."
 
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
-            --enable-static \
-            --disable-libudev \
-            --enable-libusb \
-            --enable-usbdropdir=/storage/.kodi/addons/service.pcscd/drivers"
+PKG_MESON_OPTS_TARGET="-Ddefault_library=static \
+                       -Dlibudev=false \
+                       -Dlibusb=true \
+                       -Dpolkit=true \
+                       -Dusbdropdir=/storage/.kodi/addons/service.pcscd/drivers"
 
 pre_configure_target() {
   export PKG_CONFIG_PATH="$(get_install_dir polkit)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
 }
-
-post_configure_target() {
-  libtool_remove_rpath libtool
-}

packages/addons/addon-depends/podman/conmon/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="conmon"
-PKG_VERSION="2.1.10"
-PKG_SHA256="455fabcbd4a5a5dc5e05374a71b62dc0b08ee865c2ba398e9dc9acac1ea1836a"
+PKG_VERSION="2.1.12"
+PKG_SHA256="842f0b5614281f7e35eec2a4e35f9f7b9834819aa58ecdad8d0ff6a84f6796a6"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/containers/conmon"
 PKG_URL="https://github.com/containers/conmon/archive/v${PKG_VERSION}.tar.gz"
@@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain glib libseccomp systemd"
 PKG_LONGDESC="An OCI container runtime monitor"
 
 # Git commit of the matching release https://github.com/containers/conmon
-export PKG_GIT_COMMIT="2dcd736e46ded79a53339462bc251694b150f870"
+export PKG_GIT_COMMIT="e8896631295ccb0bfdda4284f1751be19b483264"
 
 pre_configure_target() {
   export PKG_CONFIG_PATH="$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"

packages/addons/addon-depends/podman/gpgme/package.mk

@@ -25,6 +25,6 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-languages=cl \
                            --with-libassuan-prefix=$(get_install_dir libassuan)/usr"
 
 pre_configure_target() {
-  CFLAGS="${CFLAGS} -I$(get_install_dir libassuan)/usr/include"
-  LDFLAGS="${LDFLAGS} -L$(get_install_dir libassuan)/usr/lib"
+  CFLAGS+=" -I$(get_install_dir libassuan)/usr/include"
+  LDFLAGS+=" -L$(get_install_dir libassuan)/usr/lib"
 }

packages/addons/addon-depends/podman/libassuan/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libassuan"
-PKG_VERSION="2.5.7"
-PKG_SHA256="0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"
+PKG_VERSION="3.0.1"
+PKG_SHA256="c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://gnupg.org/software/libassuan/index.html"
 PKG_URL="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKG_VERSION}.tar.bz2"

packages/addons/addon-depends/podman/netavark/package.mk

@@ -2,10 +2,24 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="netavark"
-PKG_VERSION="1.10.3"
-PKG_SHA256="fdc3010cb221f0fcef0302f57ef6f4d9168a61f9606238a3e1ed4d2e348257b7"
+PKG_VERSION="1.12.2"
+PKG_SHA256="d1e5a7e65b825724fd084b0162084d9b61db8cda1dad26de8a07be1bd6891dbc"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/containers/netavark"
 PKG_URL="https://github.com/containers/netavark/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain cargo:host protobuf:host"
 PKG_LONGDESC="Container network stack"
+PKG_TOOLCHAIN="manual"
+
+make_target() {
+  cargo build \
+    --target ${TARGET_NAME} \
+    --release \
+    --locked \
+    --all-features
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}
+  cp ${PKG_BUILD}/.${TARGET_NAME}/target/${TARGET_NAME}/release/netavark ${INSTALL}
+}

packages/addons/addon-depends/podman/netavark/patches/netavark-0001-no-docs.patch

@@ -1,9 +1,9 @@
---- a/Makefile	2023-02-05 14:03:46.260848926 +0000
-+++ b/Makefile	2023-02-05 14:03:51.737539552 +0000
-@@ -73,7 +73,6 @@
+--- a/Makefile	2024-05-30 14:20:33.000000000 +0000
++++ b/Makefile	2024-06-01 01:36:21.083916685 +0000
+@@ -96,7 +96,6 @@
  .PHONY: install
  install: $(NV_UNIT_FILES)
- 	install ${SELINUXOPT} -D -m0755 bin/netavark $(DESTDIR)/$(LIBEXECPODMAN)/netavark
+ 	install ${SELINUXOPT} -D -m0755 bin/netavark $(DESTDIR)$(LIBEXECPODMAN)/netavark
 -	$(MAKE) -C docs install
  	install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}
  	install ${SELINUXOPT} -m 644 contrib/systemd/system/netavark-dhcp-proxy.socket ${DESTDIR}${SYSTEMDDIR}/netavark-dhcp-proxy.socket

packages/addons/addon-depends/podman/podman-bin/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="podman-bin"
-PKG_VERSION="5.0.2"
-PKG_SHA256="85c3f70a1c293ccf48907d8e9fe13c6c9aac67242525a539296beeef31ba11a8"
+PKG_VERSION="5.2.2"
+PKG_SHA256="571658f175d61724269c1a20626c1e39424af59b7bcf7ff94135d03b790bbecb"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://podman.io/"
 PKG_URL="https://github.com/containers/podman/archive/v${PKG_VERSION}.tar.gz"
@@ -12,7 +12,7 @@ PKG_LONGDESC="Podman: A tool for managing OCI containers and pods."
 PKG_TOOLCHAIN="manual"
 
 # Git commit of the matching release https://github.com/containers/podman
-export PKG_GIT_COMMIT="3304dd95b8978a8346b96b7d43134990609b3b29"
+export PKG_GIT_COMMIT="fcee48106a12dd531702d729d17f40f6e152027f"
 
 PKG_PODMAN_BUILDTAGS="exclude_graphdriver_devicemapper \
                       exclude_graphdriver_btrfs \

packages/addons/addon-depends/podman/podman-bin/patches/podman-0002-path-changes.patch

@@ -1,7 +1,7 @@
 diff -Nur a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/swagger_spec.go
---- a/pkg/api/handlers/libpod/swagger_spec.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/pkg/api/handlers/libpod/swagger_spec.go	2024-03-20 11:56:21.227611985 +0000
-@@ -10,7 +10,7 @@
+--- a/pkg/api/handlers/libpod/swagger_spec.go	2024-08-21 17:43:11.000000000 +0000
++++ b/pkg/api/handlers/libpod/swagger_spec.go	2024-09-14 06:41:57.836922873 +0000
+@@ -13,7 +13,7 @@
  )
  
  // DefaultPodmanSwaggerSpec provides the default path to the podman swagger spec file
@@ -11,8 +11,8 @@ diff -Nur a/pkg/api/handlers/libpod/swagger_spec.go b/pkg/api/handlers/libpod/sw
  func ServeSwagger(w http.ResponseWriter, r *http.Request) {
  	path := DefaultPodmanSwaggerSpec
 diff -Nur a/pkg/machine/define/config.go b/pkg/machine/define/config.go
---- a/pkg/machine/define/config.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/pkg/machine/define/config.go	2024-03-20 11:56:21.260945621 +0000
+--- a/pkg/machine/define/config.go	2024-08-21 17:43:11.000000000 +0000
++++ b/pkg/machine/define/config.go	2024-09-14 06:41:57.863589758 +0000
 @@ -2,7 +2,7 @@
  
  import "os"
@@ -21,11 +21,11 @@ diff -Nur a/pkg/machine/define/config.go b/pkg/machine/define/config.go
 +const UserCertsTargetPath = "/storage/.kodi/addons/service.system.podman/etc/containers/certs.d"
  const DefaultIdentityName = "machine"
  
- var (
+ // MountTag is an identifier to mount a VirtioFS file system tag on a mount point in the VM.
 diff -Nur a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go
---- a/pkg/machine/ignition/ignition.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/pkg/machine/ignition/ignition.go	2024-03-20 11:56:21.270945712 +0000
-@@ -365,7 +365,7 @@
+--- a/pkg/machine/ignition/ignition.go	2024-08-21 17:43:11.000000000 +0000
++++ b/pkg/machine/ignition/ignition.go	2024-09-14 06:41:57.870256479 +0000
+@@ -381,7 +381,7 @@
  	files = append(files, File{
  		Node: Node{
  			Group: GetNodeGrp("root"),
@@ -35,9 +35,9 @@ diff -Nur a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go
  		},
  		FileEmbedded1: FileEmbedded1{
 diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
---- a/pkg/machine/wsl/machine.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/pkg/machine/wsl/machine.go	2024-03-20 11:56:21.267612349 +0000
-@@ -179,7 +179,7 @@
+--- a/pkg/machine/wsl/machine.go	2024-08-21 17:43:11.000000000 +0000
++++ b/pkg/machine/wsl/machine.go	2024-09-14 06:41:57.870256479 +0000
+@@ -180,7 +180,7 @@
  		return fmt.Errorf("could not configure systemd settings for guest OS: %w", err)
  	}
  
@@ -46,7 +46,7 @@ diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
  		return fmt.Errorf("could not create containers.conf for guest OS: %w", err)
  	}
  
-@@ -191,7 +191,7 @@
+@@ -192,7 +192,7 @@
  		return err
  	}
  
@@ -55,7 +55,7 @@ diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
  		return fmt.Errorf("could not create podman-machine file for guest OS: %w", err)
  	}
  
-@@ -264,7 +264,7 @@
+@@ -265,7 +265,7 @@
  }
  
  func configureRegistries(dist string) error {
@@ -65,8 +65,8 @@ diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
  		return fmt.Errorf("could not configure registries on guest OS: %w", err)
  	}
 diff -Nur a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go
---- a/pkg/systemd/generate/containers_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/pkg/systemd/generate/containers_test.go	2024-03-20 11:56:21.234278713 +0000
+--- a/pkg/systemd/generate/containers_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/pkg/systemd/generate/containers_test.go	2024-09-14 06:41:57.843589594 +0000
 @@ -1045,7 +1045,7 @@
  				StopTimeout:       22,
  				PodmanVersion:     "CI",
@@ -383,8 +383,8 @@ diff -Nur a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/conta
  				RestartSec:        15,
  			},
 diff -Nur a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go
---- a/pkg/systemd/generate/pods_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/pkg/systemd/generate/pods_test.go	2024-03-20 11:56:21.234278713 +0000
+--- a/pkg/systemd/generate/pods_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/pkg/systemd/generate/pods_test.go	2024-09-14 06:41:57.843589594 +0000
 @@ -485,7 +485,7 @@
  				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
  				StopTimeout:      42,
@@ -521,9 +521,9 @@ diff -Nur a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.g
  				RequiredServices: []string{"container-1", "container-2"},
  				CreateCommand:    []string{"podman", "pod", "create", "--name", "foo", "bar=arg with space"},
 diff -Nur a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
---- a/pkg/systemd/quadlet/quadlet.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/pkg/systemd/quadlet/quadlet.go	2024-03-20 11:56:21.237612076 +0000
-@@ -20,9 +20,9 @@
+--- a/pkg/systemd/quadlet/quadlet.go	2024-08-21 17:43:11.000000000 +0000
++++ b/pkg/systemd/quadlet/quadlet.go	2024-09-14 06:41:57.843589594 +0000
+@@ -21,9 +21,9 @@
  	// but it is causing bloat
  	autoUpdateLabel = "io.containers.autoupdate"
  	// Directory for global Quadlet files (sysadmin owned)
@@ -536,9 +536,9 @@ diff -Nur a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
  	// Names of commonly used systemd/quadlet group names
  	ContainerGroup  = "Container"
 diff -Nur a/pkg/trust/registries.go b/pkg/trust/registries.go
---- a/pkg/trust/registries.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/pkg/trust/registries.go	2024-03-20 11:56:21.260945621 +0000
-@@ -28,7 +28,7 @@
+--- a/pkg/trust/registries.go	2024-08-21 17:43:11.000000000 +0000
++++ b/pkg/trust/registries.go	2024-09-14 06:41:57.860256397 +0000
+@@ -29,7 +29,7 @@
  }
  
  // systemRegistriesDirPath is the path to registries.d.
@@ -548,9 +548,9 @@ diff -Nur a/pkg/trust/registries.go b/pkg/trust/registries.go
  // userRegistriesDir is the path to the per user registries.d.
  var userRegistriesDir = filepath.FromSlash(".config/containers/registries.d")
 diff -Nur a/test/e2e/common_test.go b/test/e2e/common_test.go
---- a/test/e2e/common_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/test/e2e/common_test.go	2024-03-20 11:56:21.417613710 +0000
-@@ -293,7 +293,7 @@
+--- a/test/e2e/common_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/test/e2e/common_test.go	2024-09-14 06:41:58.060258033 +0000
+@@ -284,7 +284,7 @@
  	}
  
  	networkBackend := Netavark
@@ -560,33 +560,33 @@ diff -Nur a/test/e2e/common_test.go b/test/e2e/common_test.go
  		networkConfigDir = filepath.Join(root, "etc", "networks")
  	}
 diff -Nur a/test/e2e/create_test.go b/test/e2e/create_test.go
---- a/test/e2e/create_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/test/e2e/create_test.go	2024-03-20 11:56:21.420947074 +0000
-@@ -351,7 +351,7 @@
- 		session.WaitWithDefaultTimeout()
- 		Expect(session).To(ExitWithError())
+--- a/test/e2e/create_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/test/e2e/create_test.go	2024-09-14 06:41:58.063591394 +0000
+@@ -355,7 +355,7 @@
+ 			Expect(session).To(ExitWithError(125, "open /no/such/file: no such file or directory"))
+ 		}
  
 -		session = podmanTest.Podman([]string{"create", "-q", "--pull=always", "--signature-policy", "/etc/containers/policy.json", ALPINE})
 +		session = podmanTest.Podman([]string{"create", "-q", "--pull=always", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", ALPINE})
  		session.WaitWithDefaultTimeout()
- 		if IsRemote() {
- 			Expect(session).To(ExitWithError())
+ 		Expect(session).Should(ExitCleanly())
+ 	})
 diff -Nur a/test/e2e/import_test.go b/test/e2e/import_test.go
---- a/test/e2e/import_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/test/e2e/import_test.go	2024-03-20 11:56:21.407613619 +0000
-@@ -173,7 +173,7 @@
+--- a/test/e2e/import_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/test/e2e/import_test.go	2024-09-14 06:41:58.053591313 +0000
+@@ -175,7 +175,7 @@
  		importImage.WaitWithDefaultTimeout()
- 		Expect(importImage).To(ExitWithError())
+ 		Expect(importImage).To(ExitWithError(125, "open /no/such/file: no such file or directory"))
  
 -		result := podmanTest.Podman([]string{"import", "-q", "--signature-policy", "/etc/containers/policy.json", outfile})
 +		result := podmanTest.Podman([]string{"import", "-q", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", outfile})
  		result.WaitWithDefaultTimeout()
- 		if IsRemote() {
- 			Expect(result).To(ExitWithError())
+ 		Expect(result).Should(ExitCleanly())
+ 	})
 diff -Nur a/test/e2e/load_test.go b/test/e2e/load_test.go
---- a/test/e2e/load_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/test/e2e/load_test.go	2024-03-20 11:56:21.407613619 +0000
-@@ -83,7 +83,7 @@
+--- a/test/e2e/load_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/test/e2e/load_test.go	2024-09-14 06:41:58.053591313 +0000
+@@ -85,7 +85,7 @@
  		rmi.WaitWithDefaultTimeout()
  		Expect(rmi).Should(ExitCleanly())
  
@@ -594,11 +594,11 @@ diff -Nur a/test/e2e/load_test.go b/test/e2e/load_test.go
 +		result := podmanTest.Podman([]string{"load", "-q", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", "-i", outfile})
  		result.WaitWithDefaultTimeout()
  		if IsRemote() {
- 			Expect(result).To(ExitWithError())
+ 			Expect(result).To(ExitWithError(125, "unknown flag: --signature-policy"))
 diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go
---- a/test/e2e/push_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/test/e2e/push_test.go	2024-03-20 11:56:21.410946983 +0000
-@@ -196,11 +196,11 @@
+--- a/test/e2e/push_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/test/e2e/push_test.go	2024-09-14 06:41:58.056924672 +0000
+@@ -197,11 +197,11 @@
  			// Ideally, this should set SystemContext.RegistriesDirPath, but Podman currently doesn’t
  			// expose that as an option. So, for now, modify /etc/directly, and skip testing sigstore if
  			// we don’t have permission to do so.
@@ -612,7 +612,7 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go
  			} else {
  				defer func() {
  					err := os.Remove(systemRegistriesDAddition)
-@@ -268,16 +268,16 @@
+@@ -267,16 +267,16 @@
  	})
  
  	It("podman push to local registry with authorization", func() {
@@ -632,7 +632,7 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go
  
  		cwd, _ := os.Getwd()
  		certPath := filepath.Join(cwd, "../", "certs")
-@@ -317,7 +317,7 @@
+@@ -315,7 +315,7 @@
  		Expect(push).Should(Exit(0))
  		Expect(push.ErrorToString()).To(ContainSubstring("Writing manifest to image destination"))
  
@@ -642,21 +642,21 @@ diff -Nur a/test/e2e/push_test.go b/test/e2e/push_test.go
  
  		push = podmanTest.Podman([]string{"push", "--creds=podmantest:wrongpasswd", ALPINE, "localhost:5004/credstest"})
 diff -Nur a/test/e2e/run_test.go b/test/e2e/run_test.go
---- a/test/e2e/run_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/test/e2e/run_test.go	2024-03-20 11:56:21.404280256 +0000
-@@ -117,7 +117,7 @@
- 		session.WaitWithDefaultTimeout()
- 		Expect(session).To(ExitWithError())
+--- a/test/e2e/run_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/test/e2e/run_test.go	2024-09-14 06:41:58.053591313 +0000
+@@ -124,7 +124,7 @@
+ 		}
+ 		Expect(session).To(ExitWithError(125, "open /no/such/file: no such file or directory"))
  
 -		session = podmanTest.Podman([]string{"run", "--pull=always", "--signature-policy", "/etc/containers/policy.json", ALPINE})
 +		session = podmanTest.Podman([]string{"run", "--pull=always", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", ALPINE})
  		session.WaitWithDefaultTimeout()
- 		if IsRemote() {
- 			Expect(session).To(ExitWithError())
+ 		Expect(session).Should(Exit(0))
+ 		Expect(session.ErrorToString()).To(ContainSubstring("Getting image source signatures"))
 diff -Nur a/test/e2e/save_test.go b/test/e2e/save_test.go
---- a/test/e2e/save_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/test/e2e/save_test.go	2024-03-20 11:56:21.400946892 +0000
-@@ -27,7 +27,7 @@
+--- a/test/e2e/save_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/test/e2e/save_test.go	2024-09-14 06:41:58.050257951 +0000
+@@ -29,7 +29,7 @@
  		SkipIfRemote("--signature-policy N/A for remote")
  		outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
  
@@ -695,9 +695,9 @@ diff -Nur a/test/e2e/save_test.go b/test/e2e/save_test.go
  		pushedImage := fmt.Sprintf("localhost:%d/alpine", port)
  		session = podmanTest.Podman([]string{"tag", ALPINE, pushedImage})
 diff -Nur a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go
---- a/test/e2e/system_reset_test.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/test/e2e/system_reset_test.go	2024-03-20 11:56:21.400946892 +0000
-@@ -43,7 +43,7 @@
+--- a/test/e2e/system_reset_test.go	2024-08-21 17:43:11.000000000 +0000
++++ b/test/e2e/system_reset_test.go	2024-09-14 06:41:58.050257951 +0000
+@@ -45,7 +45,7 @@
  		Expect(session).Should(ExitCleanly())
  
  		Expect(session.ErrorToString()).To(Not(ContainSubstring("Failed to add pause process")))
@@ -707,8 +707,8 @@ diff -Nur a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go
  		session = podmanTest.Podman([]string{"images", "-n"})
  		session.WaitWithDefaultTimeout()
 diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go
---- a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go	2024-03-20 11:56:22.294288333 +0000
+--- a/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go	2024-09-14 06:41:58.693596546 +0000
 @@ -4,7 +4,7 @@
  	// cniConfigDir is the directory where cni configuration is found
  	cniConfigDir = "/usr/local/etc/cni/net.d/"
@@ -719,8 +719,8 @@ diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_fre
  	netavarkRunDir = "/var/run/containers/networks"
  )
 diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go
---- a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go	2024-03-20 11:56:22.294288333 +0000
+--- a/vendor/github.com/containers/common/libnetwork/network/interface_linux.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go	2024-09-14 06:41:58.693596546 +0000
 @@ -4,7 +4,7 @@
  	// cniConfigDir is the directory where cni configuration is found
  	cniConfigDir = "/etc/cni/net.d/"
@@ -730,9 +730,21 @@ diff -Nur a/vendor/github.com/containers/common/libnetwork/network/interface_lin
  	// netavarkRunDir is the run directory for the rootful temporary network files such as the ipam db
  	netavarkRunDir = "/run/containers/networks"
  )
+diff -Nur a/vendor/github.com/containers/common/pkg/config/config_bsd.go b/vendor/github.com/containers/common/pkg/config/config_bsd.go
+--- a/vendor/github.com/containers/common/pkg/config/config_bsd.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/config_bsd.go	2024-09-14 06:41:58.690263186 +0000
+@@ -11,7 +11,7 @@
+ 
+ 	// DefaultSignaturePolicyPath is the default value for the
+ 	// policy.json file.
+-	DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json"
++	DefaultSignaturePolicyPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
+ )
+ 
+ var defaultHelperBinariesDir = []string{
 diff -Nur a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/vendor/github.com/containers/common/pkg/config/config_darwin.go
---- a/vendor/github.com/containers/common/pkg/config/config_darwin.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go	2024-03-20 11:56:22.290954970 +0000
+--- a/vendor/github.com/containers/common/pkg/config/config_darwin.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go	2024-09-14 06:41:58.690263186 +0000
 @@ -9,7 +9,7 @@
  
  	// DefaultSignaturePolicyPath is the default value for the
@@ -741,22 +753,10 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_darwin.go b/ve
 +	DefaultSignaturePolicyPath = "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
  )
  
- var defaultHelperBinariesDir = []string{
-diff -Nur a/vendor/github.com/containers/common/pkg/config/config_freebsd.go b/vendor/github.com/containers/common/pkg/config/config_freebsd.go
---- a/vendor/github.com/containers/common/pkg/config/config_freebsd.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/pkg/config/config_freebsd.go	2024-03-20 11:56:22.290954970 +0000
-@@ -9,7 +9,7 @@
- 
- 	// DefaultSignaturePolicyPath is the default value for the
- 	// policy.json file.
--	DefaultSignaturePolicyPath = "/usr/local/etc/containers/policy.json"
-+	DefaultSignaturePolicyPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
- )
- 
  var defaultHelperBinariesDir = []string{
 diff -Nur a/vendor/github.com/containers/common/pkg/config/config_linux.go b/vendor/github.com/containers/common/pkg/config/config_linux.go
---- a/vendor/github.com/containers/common/pkg/config/config_linux.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/pkg/config/config_linux.go	2024-03-20 11:56:22.290954970 +0000
+--- a/vendor/github.com/containers/common/pkg/config/config_linux.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/config_linux.go	2024-09-14 06:41:58.693596546 +0000
 @@ -13,7 +13,7 @@
  
  	// DefaultSignaturePolicyPath is the default value for the
@@ -767,9 +767,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_linux.go b/ven
  
  func selinuxEnabled() bool {
 diff -Nur a/vendor/github.com/containers/common/pkg/config/config_windows.go b/vendor/github.com/containers/common/pkg/config/config_windows.go
---- a/vendor/github.com/containers/common/pkg/config/config_windows.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/pkg/config/config_windows.go	2024-03-20 11:56:22.290954970 +0000
-@@ -11,7 +11,7 @@
+--- a/vendor/github.com/containers/common/pkg/config/config_windows.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/config_windows.go	2024-09-14 06:41:58.690263186 +0000
+@@ -12,7 +12,7 @@
  
  	// DefaultSignaturePolicyPath is the default value for the
  	// policy.json file.
@@ -779,9 +779,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/config_windows.go b/v
  	// Mount type for mounting host dir
  	_typeBind = "bind"
 diff -Nur a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
---- a/vendor/github.com/containers/common/pkg/config/default.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/pkg/config/default.go	2024-03-20 11:56:22.290954970 +0000
-@@ -22,7 +22,7 @@
+--- a/vendor/github.com/containers/common/pkg/config/default.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/default.go	2024-09-14 06:41:58.690263186 +0000
+@@ -23,7 +23,7 @@
  
  const (
  	// _defaultGraphRoot points to the default path of the graph root.
@@ -790,18 +790,18 @@ diff -Nur a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/g
  
  	// _defaultTransport is a prefix that we apply to an image name to check
  	// docker hub first for the image.
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@
  	// ErrInvalidArg indicates that an invalid argument was passed.
  	ErrInvalidArg = errors.New("invalid argument")
  	// DefaultHooksDirs defines the default hooks directory.
 -	DefaultHooksDirs = []string{"/usr/share/containers/oci/hooks.d"}
 +	DefaultHooksDirs = []string{"/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/oci/hooks.d"}
+ 	// DefaultCdiSpecDirs defines the default cdi spec directories.
+ 	DefaultCdiSpecDirs = []string{"/etc/cdi"}
  	// DefaultCapabilities is the default for the default_capabilities option in the containers.conf file.
- 	DefaultCapabilities = []string{
- 		"CAP_CHOWN",
 diff -Nur a/vendor/github.com/containers/common/pkg/hooks/hooks.go b/vendor/github.com/containers/common/pkg/hooks/hooks.go
---- a/vendor/github.com/containers/common/pkg/hooks/hooks.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/pkg/hooks/hooks.go	2024-03-20 11:56:22.284288242 +0000
+--- a/vendor/github.com/containers/common/pkg/hooks/hooks.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/hooks/hooks.go	2024-09-14 06:41:58.686929825 +0000
 @@ -20,10 +20,10 @@
  
  const (
@@ -816,8 +816,8 @@ diff -Nur a/vendor/github.com/containers/common/pkg/hooks/hooks.go b/vendor/gith
  
  // Manager provides an opaque interface for managing CRI-O hooks.
 diff -Nur a/vendor/github.com/containers/common/pkg/machine/machine.go b/vendor/github.com/containers/common/pkg/machine/machine.go
---- a/vendor/github.com/containers/common/pkg/machine/machine.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/pkg/machine/machine.go	2024-03-20 11:56:22.294288333 +0000
+--- a/vendor/github.com/containers/common/pkg/machine/machine.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/machine/machine.go	2024-09-14 06:41:58.693596546 +0000
 @@ -12,7 +12,7 @@
  }
  
@@ -828,9 +828,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/machine/machine.go b/vendor/
  	Qemu       = "qemu"
  	AppleHV    = "applehv"
 diff -Nur a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go
---- a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go	2024-03-20 11:56:22.287621606 +0000
-@@ -18,10 +18,10 @@
+--- a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go	2024-09-14 06:41:58.690263186 +0000
+@@ -19,10 +19,10 @@
  var (
  	// DefaultMountsFile holds the default mount paths in the form
  	// "host_path:container_path"
@@ -844,9 +844,9 @@ diff -Nur a/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.
  	// "host_path:container_path" overridden by the rootless user
  	UserOverrideMountsFile = filepath.Join(os.Getenv("HOME"), ".config/containers/mounts.conf")
 diff -Nur a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendor/github.com/containers/image/v5/docker/registries_d.go
---- a/vendor/github.com/containers/image/v5/docker/registries_d.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/image/v5/docker/registries_d.go	2024-03-20 11:56:22.267621424 +0000
-@@ -34,7 +34,7 @@
+--- a/vendor/github.com/containers/image/v5/docker/registries_d.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/docker/registries_d.go	2024-09-14 06:41:58.673596383 +0000
+@@ -35,7 +35,7 @@
  var defaultUserDockerDir = filepath.FromSlash(".local/share/containers/sigstore")
  
  // defaultDockerDir is the default lookaside directory for root
@@ -856,8 +856,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/docker/registries_d.go b/vendo
  // registryConfiguration is one of the files in registriesDirPath configuring lookaside locations, or the result of merging them all.
  // NOTE: Keep this in sync with docs/registries.d.md!
 diff -Nur a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go
---- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go	2024-03-20 11:56:22.257621333 +0000
+--- a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go	2024-09-14 06:41:58.666929661 +0000
 @@ -17,7 +17,7 @@
  	// If the format changes in an incompatible way, increase the version number.
  	blobInfoCacheFilename = "blob-info-cache-v1.sqlite"
@@ -868,8 +868,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go b
  
  // blobInfoCacheDir returns a path to a blob info cache appropriate for sys and euid.
 diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go
---- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go	2024-03-20 11:56:22.254287971 +0000
+--- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go	2024-09-14 06:41:58.663596301 +0000
 @@ -5,8 +5,8 @@
  
  // builtinRegistriesConfPath is the path to the registry configuration file.
@@ -882,8 +882,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_comm
 -const builtinRegistriesConfDirPath = "/etc/containers/registries.conf.d"
 +const builtinRegistriesConfDirPath = "/storage/.kodi/addons/service.system.podman/etc/containers/registries.conf.d"
 diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go
---- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go	2024-03-20 11:56:22.254287971 +0000
+--- a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go	2024-09-14 06:41:58.663596301 +0000
 @@ -5,8 +5,8 @@
  
  // builtinRegistriesConfPath is the path to the registry configuration file.
@@ -896,8 +896,8 @@ diff -Nur a/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_free
 -const builtinRegistriesConfDirPath = "/usr/local/etc/containers/registries.conf.d"
 +const builtinRegistriesConfDirPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/registries.conf.d"
 diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go
---- a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go	2024-03-20 11:56:22.257621333 +0000
+--- a/vendor/github.com/containers/image/v5/signature/policy_paths_common.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go	2024-09-14 06:41:58.666929661 +0000
 @@ -5,4 +5,4 @@
  
  // builtinDefaultPolicyPath is the policy path used for DefaultPolicy().
@@ -905,17 +905,29 @@ diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_common.
 -const builtinDefaultPolicyPath = "/etc/containers/policy.json"
 +const builtinDefaultPolicyPath = "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
 diff -Nur a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go
---- a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go	2024-03-20 11:56:22.257621333 +0000
+--- a/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go	2024-09-14 06:41:58.666929661 +0000
 @@ -5,4 +5,4 @@
  
  // builtinDefaultPolicyPath is the policy path used for DefaultPolicy().
  // DO NOT change this, instead see systemDefaultPolicyPath above.
 -const builtinDefaultPolicyPath = "/usr/local/etc/containers/policy.json"
 +const builtinDefaultPolicyPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
+diff -Nur a/vendor/github.com/containers/storage/types/options_bsd.go b/vendor/github.com/containers/storage/types/options_bsd.go
+--- a/vendor/github.com/containers/storage/types/options_bsd.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/storage/types/options_bsd.go	2024-09-14 06:41:58.643596138 +0000
+@@ -12,7 +12,7 @@
+ 
+ // defaultConfigFile path to the system wide storage.conf file
+ var (
+-	defaultOverrideConfigFile = "/usr/local/etc/containers/storage.conf"
++	defaultOverrideConfigFile = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/storage.conf"
+ )
+ 
+ // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
 diff -Nur a/vendor/github.com/containers/storage/types/options_darwin.go b/vendor/github.com/containers/storage/types/options_darwin.go
---- a/vendor/github.com/containers/storage/types/options_darwin.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/storage/types/options_darwin.go	2024-03-20 11:56:22.227621061 +0000
+--- a/vendor/github.com/containers/storage/types/options_darwin.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/storage/types/options_darwin.go	2024-09-14 06:41:58.643596138 +0000
 @@ -4,11 +4,11 @@
  	// these are default path for run and graph root for rootful users
  	// for rootless path is constructed via getRootlessStorageOpts
@@ -930,22 +942,10 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_darwin.go b/vendo
 +var defaultOverrideConfigFile = "/storage/.kodi/addons/service.system.podman/etc/containers/storage.conf"
  
  // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
- func canUseRootlessOverlay(home, runhome string) bool {
-diff -Nur a/vendor/github.com/containers/storage/types/options_freebsd.go b/vendor/github.com/containers/storage/types/options_freebsd.go
---- a/vendor/github.com/containers/storage/types/options_freebsd.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/storage/types/options_freebsd.go	2024-03-20 11:56:22.227621061 +0000
-@@ -10,7 +10,7 @@
- 
- // defaultConfigFile path to the system wide storage.conf file
- var (
--	defaultOverrideConfigFile = "/usr/local/etc/containers/storage.conf"
-+	defaultOverrideConfigFile = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/storage.conf"
- )
- 
- // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
+ func canUseRootlessOverlay() bool {
 diff -Nur a/vendor/github.com/containers/storage/types/options_linux.go b/vendor/github.com/containers/storage/types/options_linux.go
---- a/vendor/github.com/containers/storage/types/options_linux.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/storage/types/options_linux.go	2024-03-20 11:56:22.227621061 +0000
+--- a/vendor/github.com/containers/storage/types/options_linux.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/storage/types/options_linux.go	2024-09-14 06:41:58.643596138 +0000
 @@ -12,13 +12,13 @@
  	// these are default path for run and graph root for rootful users
  	// for rootless path is constructed via getRootlessStorageOpts
@@ -964,8 +964,8 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_linux.go b/vendor
  
  // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
 diff -Nur a/vendor/github.com/containers/storage/types/options_windows.go b/vendor/github.com/containers/storage/types/options_windows.go
---- a/vendor/github.com/containers/storage/types/options_windows.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/containers/storage/types/options_windows.go	2024-03-20 11:56:22.227621061 +0000
+--- a/vendor/github.com/containers/storage/types/options_windows.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/containers/storage/types/options_windows.go	2024-09-14 06:41:58.643596138 +0000
 @@ -4,13 +4,13 @@
  	// these are default path for run and graph root for rootful users
  	// for rootless path is constructed via getRootlessStorageOpts
@@ -984,8 +984,8 @@ diff -Nur a/vendor/github.com/containers/storage/types/options_windows.go b/vend
  
  // canUseRootlessOverlay returns true if the overlay driver can be used for rootless containers
 diff -Nur a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
---- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go	2024-03-19 09:47:46.000000000 +0000
-+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go	2024-03-20 11:56:22.077619701 +0000
+--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go	2024-08-21 17:43:11.000000000 +0000
++++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go	2024-09-14 06:41:58.540261960 +0000
 @@ -23,7 +23,7 @@
  
  const (

packages/addons/addon-depends/rpi-tools-depends/lg-gpio/package.mk

@@ -7,15 +7,13 @@ PKG_SHA256="b08d8569d6dc8fa91a42ba1e37f620fdcb19d6bf2330e4b7d7301431ddbe124c"
 PKG_LICENSE="Unlicense"
 PKG_SITE="http://abyz.me.uk/lg/"
 PKG_URL="https://github.com/joan2937/lg/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain Python3 swig:host distutilscross:host"
+PKG_DEPENDS_TARGET="toolchain Python3 swig:host setuptools:host"
 PKG_LONGDESC="A library for Linux Single Board Computers (SBC) which allows control of the General Purpose Input Outputs (GPIO)"
 PKG_TOOLCHAIN="manual"
 
 pre_configure_target() {
-  export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr"
   export CFLAGS="${CFLAGS} -I${PKG_BUILD}"
   export LDFLAGS="${CFLAGS} -L${PKG_BUILD}"
-  export LDSHARED="${CC} -shared"
 }
 
 make_target() {
@@ -23,7 +21,6 @@ make_target() {
   (
     cd PY_LGPIO
     swig -python lgpio.i
-    python setup.py build
+    python_target_env python3 -m build -n -w -x
   )
 }
-

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rpi_ws281x"
-PKG_VERSION="6c5ade93d1af78cd19e60ee5ecc34adfd111b186"
-PKG_SHA256="e8fb94429edc21cfd894548755a417eb5b2e121329f4b54270cfb3f727696e21"
+PKG_VERSION="49086d3913367d2fb014a615f9d958a47867bc39"
+PKG_SHA256="2a6142bcb9317b65168674f7164b9508652708fd4160d33f8e7e194e9dab57db"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="https://github.com/hyperion-project/rpi_ws281x"
 PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/${PKG_VERSION}.tar.gz"

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.1.12"
-PKG_SHA256="be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208"
+PKG_VERSION="1.1.13"
+PKG_SHA256="789d5749a08ef1fbe5d1999b67883206a68a4e58e6ca0151c411d678f3480b25"
 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
-export PKG_GIT_COMMIT="51d5e94601ceffbbd85688df1c928ecccbfa4685"
+export PKG_GIT_COMMIT="58aa9203c123022138b22cf96540c284876a7910"
 
 pre_make_target() {
   go_configure

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

@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="alsa-plugins"
-PKG_VERSION="1.2.7.1"
-PKG_SHA256="8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511"
+PKG_VERSION="1.2.12"
+PKG_SHA256="7bd8a83d304e8e2d86a25895d8dcb0ef0245a8df32e271959cdbdc6af39b66f2"
 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"
+PKG_SITE="https://www.alsa-project.org/wiki/Main_Page"
+PKG_URL="http://www.alsa-project.org/files/pub/plugins/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain alsa-lib"
 PKG_LONGDESC="Alsa plugins."
 

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

@@ -11,7 +11,7 @@ PKG_SOURCE_DIR="asio-asio-${PKG_VERSION//./-}"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Asio C++ Library."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--without-boost --without-openssl"
 

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

@@ -10,6 +10,6 @@ PKG_URL="https://github.com/mikebrady/nqptp/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Not Quite PTP"
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-systemd-startup"

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

@@ -10,7 +10,7 @@ PKG_URL="https://github.com/mikebrady/shairport-sync/archive/${PKG_VERSION}.tar.
 PKG_DEPENDS_TARGET="toolchain alsa-lib avahi ffmpeg libconfig libdaemon libgcrypt libplist libsndfile libsodium nqptp openssl popt pulseaudio soxr util-linux xxd:host"
 PKG_LONGDESC="AirPlay audio player."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-alsa \
                            --with-avahi \

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="snapcast"
 PKG_VERSION="0.28.0"
-PKG_SHA256="86339627c7dbf3fec2d5b4ff0e07a45fe0a7aaa68bb7e19501ce307664eeb5cf"
+PKG_SHA256="7911037dd4b06fe98166db1d49a7cd83ccf131210d5aaad47507bfa0cfc31407"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/badaix/snapcast"
 PKG_URL="https://github.com/badaix/snapcast/archive/v${PKG_VERSION}.tar.gz"

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

@@ -10,7 +10,7 @@ PKG_URL="http://www.harding.motd.ca/autossh/autossh-${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Automatically restart SSH sessions and tunnels."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes"

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.9.6"
-PKG_SHA256="202130e0d7c362d0d0cf211f6a13e31be3a02f13f998f88571e59a7735d60667"
+PKG_VERSION="0.10.2"
+PKG_SHA256="1db45fe9bc1fabb62d67bf8a1ea50c96e78ff4d2a5e25bf8ae8880e3ad5af80a"
 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/libmtp/patches/libmtp-0001-dont-execute-compiled-tools.patch

@@ -1,6 +1,12 @@
 diff -Naur a/Makefile.am b/Makefile.am
 --- a/Makefile.am	2015-10-07 00:43:15.000000000 -0700
 +++ b/Makefile.am	2016-04-22 14:16:07.656866841 -0700
+@@ -1,4 +1,4 @@
+-SUBDIRS=src examples util doc
++SUBDIRS=src util
+ ACLOCAL_AMFLAGS=-I m4
+ 
+ pkgconfigdir=$(libdir)/pkgconfig
 @@ -11,21 +11,6 @@
  if USE_LINUX
  udevrulesdir=@UDEV@/rules.d
@@ -35,6 +41,15 @@ diff -Naur a/Makefile.in b/Makefile.in
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
    distclean-recursive maintainer-clean-recursive
  am__recursive_targets = \
+@@ -371,7 +371,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src examples util doc
++SUBDIRS = src util
+ ACLOCAL_AMFLAGS = -I m4
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libmtp.pc
 @@ -452,21 +452,8 @@
  
  distclean-libtool:

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

@@ -10,7 +10,7 @@ PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A package of several programs related to finding differences between files."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
         --without-libsigsegv-prefix \

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dool"
-PKG_VERSION="1.3.1"
-PKG_SHA256="5d12bafaaa21bbba7cfe4908046dbd9b473d146d9e783b94b7dac89005cf7bc6"
+PKG_VERSION="1.3.2"
+PKG_SHA256="171afc1a43c82a592a3a07d48b62475aca22239dbe5c295d5903caadbe82ba51"
 PKG_LICENSE="GPL-3.0-or-later"
 PKG_SITE="https://github.com/scottchiefbaker/dool"
 PKG_URL="https://github.com/scottchiefbaker/dool/archive/v${PKG_VERSION}.tar.gz"
@@ -20,6 +20,6 @@ makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin
   cp -p dool ${INSTALL}/usr/bin
   cp -pr plugins ${INSTALL}/usr/bin
-  printf "#!/bin/sh\n\necho \"\${0} has been replaced by dool\"" > ${INSTALL}/usr/bin/dstat
+  printf "#!/bin/sh\n\necho \"\${0} has been replaced by dool\"" >${INSTALL}/usr/bin/dstat
   chmod 755 ${INSTALL}/usr/bin/dstat
 }

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

@@ -9,7 +9,7 @@ PKG_SITE="http://dtach.sourceforge.net"
 PKG_URL="https://github.com/crigler/dtach/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A program that emulates the detach feature of screen."
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin

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

@@ -10,4 +10,4 @@ PKG_URL="https://repo.or.cz/evtest.git/snapshot/evtest-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libxml2"
 PKG_LONGDESC="A simple tool for input event debugging."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"

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

@@ -2,14 +2,14 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="fdupes"
-PKG_VERSION="2.3.0"
-PKG_SHA256="6170d64a7e565ee314cca4dd25a123e60aa1e3febb11e57078bebb9c1da7e019"
+PKG_VERSION="2.3.2"
+PKG_SHA256="808d8decbe7fa41cab407ae4b7c14bfc27b8cb62227540c3dcb6caf980592ac7"
 PKG_LICENSE="GPL"
 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_DEPENDS_TARGET="toolchain ncurses sqlite"
 PKG_LONGDESC="A program for identifying or deleting duplicate files residing within specified directories."
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--without-ncurses"
 PKG_MAKE_OPTS_TARGET="PREFIX=/usr"

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

@@ -9,7 +9,7 @@ PKG_SITE="https://savannah.nongnu.org/projects/hddtemp"
 PKG_URL="https://github.com/vitlav/hddtemp/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A utility that gives you the temperature of your hard drive by reading S.M.A.R.T.."
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-db-path=/storage/.kodi/addons/virtual.system-tools/data/hddtemp.db"

packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-02_include-sys-time.patch

@@ -2,11 +2,12 @@ diff --git a/hid.c b/hid.c
 index 2830b58..a652222 100644
 --- a/hid.c
 +++ b/hid.c
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,8 @@
  #include <unistd.h>
  #include <dirent.h>
  #include <stdio.h>
 +#include <sys/time.h>
++#include <string.h>
  
  #define SYSFS_HIDRAW_CLASS_PATH "/sys/class/hidraw"
  

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

@@ -10,9 +10,10 @@ PKG_URL="https://github.com/htop-dev/htop/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="An interactive process viewer for Unix."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-unicode \
+                           --disable-static \
                            HTOP_NCURSES_CONFIG_SCRIPT=ncurses-config"
 
 pre_configure_target() {

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

@@ -7,37 +7,30 @@ 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"
-PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_DEPENDS_TARGET="toolchain Python3 setuptools:host"
 PKG_LONGDESC="A heterogeneous set of I2C tools for Linux."
 PKG_BUILD_FLAGS="-sysroot"
 
-pre_make_target() {
-  export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr"
-  export LDSHARED="${CC} -shared"
-}
-
 make_target() {
   make  CC="${CC}" \
         AR="${AR}" \
         CFLAGS="${TARGET_CFLAGS}" \
-        CPPFLAGS="${TARGET_CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}" \
-        PYTHON=${TOOLCHAIN}/bin/python3 \
+        CPPFLAGS="${TARGET_CPPFLAGS}" \
         all
 
-  make  EXTRA="py-smbus" \
-        CC="${CC}" \
-        AR="${AR}" \
-        CFLAGS="${TARGET_CFLAGS}" \
-        CPPFLAGS="${TARGET_CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}" \
-        PYTHON=${TOOLCHAIN}/bin/python3 \
-        all-python
+  (
+    cd py-smbus
+    python_target_env python3 -m build -n -w -x
+  )
 }
 
 makeinstall_target() {
-  make  EXTRA="py-smbus" \
-        DESTDIR=${INSTALL} \
+  make  DESTDIR=${INSTALL} \
         PREFIX="/usr" \
         prefix="/usr" \
-        PYTHON=${TOOLCHAIN}/bin/python3 \
         install
+  (
+    cd py-smbus
+    python3 -m installer --overwrite-existing dist/*.whl -d ${INSTALL} -p /usr
+  )
 }

packages/addons/addon-depends/system-tools-depends/i2c-tools/patches/0001-py-smbus-Use-setuptools-instead-of-distutils.patch

@@ -0,0 +1,38 @@
+From cf3541b8a7ed50782edd05836020d31230fb86c6 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Wed, 19 Jan 2022 12:08:53 +0100
+Subject: py-smbus: Use setuptools instead of distutils
+
+As per [1], distutils is deprecated in Python 3.10 and will be removed
+entirely in Python 3.12.
+
+As setuptools is essentially an enhanced version of distutils, it's
+trivial to port to that.
+
+[1] https://docs.python.org/3/whatsnew/3.10.html#distutils-deprecated
+
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+
+Upstream: https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/commit/?id=cf3541b8a7ed50782edd05836020d31230fb86c6
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ py-smbus/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/py-smbus/setup.py b/py-smbus/setup.py
+index 28a4500..26db33a 100644
+--- a/py-smbus/setup.py
++++ b/py-smbus/setup.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+ 
+-from distutils.core import setup, Extension
++from setuptools import setup, Extension
+ 
+ setup(	name="smbus",
+ 	version="1.1",
+-- 
+cgit 
+

packages/addons/addon-depends/system-tools-depends/i2c-tools/patches/pyinstalldir.patch

@@ -1,12 +0,0 @@
-diff -ur a/py-smbus/Module.mk b/py-smbus/Module.mk
---- a/py-smbus/Module.mk	2014-02-20 09:37:15.711233000 +0100
-+++ b/py-smbus/Module.mk	2019-12-14 08:20:51.730946457 +0100
-@@ -22,7 +22,7 @@
- 	rm -rf py-smbus/build
- 
- install-python:
--	$(DISTUTILS) install
-+	$(DISTUTILS) install --prefix=$(DESTDIR)$(PREFIX)
- 
- all: all-python
- 

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libgpiod"
-PKG_VERSION="2.1.1"
-PKG_SHA256="0af43a6089d69f9d075cf67ca2ae5972b9081e38e6b3d46cea37d67e2df6fb9b"
+PKG_VERSION="2.1.3"
+PKG_SHA256="8d80ea022ae78122aa525308e7423b83064bff278fcd9cd045b94b4f81f8057d"
 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"

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.31"
-PKG_SHA256="24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a"
+PKG_VERSION="4.8.32"
+PKG_SHA256="4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe"
 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/mmc-utils/package.mk

@@ -2,11 +2,13 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mmc-utils"
-PKG_VERSION="613495ecaca97a19fa7f8f3ea23306472b36453c"
-PKG_SHA256="1c76924aa3f636af70bd841bc1dcd85d5728ef1d4326921da30cbab7d643e2a7"
+PKG_VERSION="123fd8b2ac3933be1319486fb1f32236a4a86a7c"
+PKG_SHA256="d718338740cc75c8b0b54647a0522baff1824a31d4f9ee7d0d022405d07284f6"
 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"
+
+PKG_MAKE_OPTS_TARGET+=" C="

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

@@ -2,15 +2,15 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mtpfs"
-PKG_VERSION="d228a21b07062170e05fb71a7a7bf4a74ad559e1"
-PKG_SHA256="4b89e014201a01634022a6348874361f5ca729e455b8c1f9990fa10647590b52"
+PKG_VERSION="2bd9b5a33ad70a2238e086ffb07907f20a1e0101"
+PKG_SHA256="732d5d450cfefd9df0e53ed6b188e1428298d8f81aaa8b5bf24ad31b9fddbe8f"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.adebenham.com/mtpfs/"
 PKG_URL="https://github.com/cjd/mtpfs/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse glib libmtp"
 PKG_LONGDESC="MTPfs is a FUSE filesystem that supports reading and writing from any MTP device."
 PKG_TOOLCHAIN="autotools"
-PKG_BUILD_FLAGS="-sysroot"
+PKG_BUILD_FLAGS="-sysroot -cfg-libs"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-mad"
 

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nmon"
-PKG_VERSION="16p"
-PKG_SHA256="5dc6045f6725e3249a969918fae69663a1d669162087720babcdb90fce9e6b2a"
+PKG_VERSION="16q"
+PKG_SHA256="1b78a81672c19291b3d11a6e319dd9b23a022a262dba1efcea008d6df51aca51"
 PKG_LICENSE="GPL"
 PKG_SITE="https://nmon.sourceforge.net/pmwiki.php?n=Site.CompilingNmon"
 PKG_URL="https://sourceforge.net/projects/nmon/files/lmon${PKG_VERSION}.c"