Merge pull request #10515 from heitbaum/binaries-12.0

[le12.0] pvr.teleboy: update 21.0.0-Omega to 21.0.1-Omega

distributions/LibreELEC/version

@@ -5,4 +5,4 @@
   OS_VERSION="12.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="11.80.6"
+  ADDON_VERSION="12.0.0"

licenses/EPL-1.0.txt

@@ -0,0 +1,88 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+

licenses/gpgme.txt

@@ -0,0 +1,38 @@
+Additional license notices for GPGME.                    -*- org -*-
+
+This file contains the copying permission notices for various files in
+the GPGME distribution which are not covered by the GNU Lesser
+General Public License (LGPL) or the GNU General Public License (GPL).
+
+These notices all require that a copy of the notice be included
+in the accompanying documentation and be distributed with binary
+distributions of the code, so be sure to include this file along
+with any binary distributions derived from the GNU C Library.
+
+* MIT License
+
+  For files:
+  - cJSON.c, cJSON.h
+
+#+begin_quote
+  Copyright (c) 2009 Dave Gamble
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a opy of this software and associated documentation files (the
+  "Software"), to eal in the Software without restriction, including
+  without limitation the ights 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:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  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 AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING ROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#+end_quote

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/at-spi2-core/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="at-spi2-core"
-PKG_VERSION="2.51.0"
-PKG_SHA256="8dd07c6160e3115f4f77e2205963449def6822a3dc85d495c5db389f56663037"
+PKG_VERSION="2.52.0"
+PKG_SHA256="0ac3fc8320c8d01fa147c272ba7fa03806389c6b03d3c406d0823e30e35ff5ab"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.gnome.org/"
 PKG_URL="https://download.gnome.org/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"

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/harfbuzz-icu/patches/harfbuzz-icu-4734-fix-build-with-icu-75.patch

@@ -0,0 +1,26 @@
+From 93d58f8315fc3cbb2b15a4ff79329a1022ca8d54 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Tue, 28 May 2024 11:39:27 +0200
+Subject: [PATCH] meson: set -std=c++17 when building with icu >= 75
+
+Fixes:
+https://github.com/harfbuzz/harfbuzz/issues/4671
+---
+ meson.build | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index d8d8424e7b9..9e6f8de9c50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -174,6 +174,10 @@ else
+   endif
+ endif
+ 
++if icu_dep.found() and icu_dep.version().version_compare('>=75.1') and (get_option('cpp_std') == 'c++11' or get_option('cpp_std') == 'c++14')
++  add_project_arguments('-std=c++17', language: 'cpp')
++endif
++
+ if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
+   icu_defs = icu_dep.get_variable(pkgconfig: 'DEFS', default_value: '').split()
+   if icu_defs.length() > 0

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="cli"
 PKG_VERSION="$(get_pkg_version moby)"
-PKG_SHA256="e29bcd588142981f0a8f7955628863441099cead1c860dc5040f5af0156de71a"
+PKG_SHA256="abd16e3911bc7bbd00596ebe4f58baf3d577160d99eefd749a908507ddfc587b"
 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="1a576c50a9a33dd7ab2bcd78db1982cb965812b0"
+export PKG_GIT_COMMIT="9f9e4058019a37304dc6572ffcbb409d529b59d8"
 
 configure_target() {
   go_configure

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.13"
-PKG_SHA256="ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf"
+PKG_VERSION="1.7.23"
+PKG_SHA256="393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c"
 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="7c3aca7a610df76212171d200ca3811ff6096eb8"
+export PKG_GIT_COMMIT="57f17b0a6295a39009d861b89e3b3b87b005ca27"
 
 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="25.0.4"
-PKG_SHA256="3e39ff7e371c1d52cb86d64adb735e5f2edfe307fdf13e29a537d485a0b678b6"
+PKG_VERSION="27.5.1"
+PKG_SHA256="0d071c1773c855778d85590e01b924c1857000fd786485f4b674a3be2d3b893c"
 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="061aa95809be396a6b5542618d8a34b02a21ff77"
+export PKG_GIT_COMMIT="4c9b3b011ae4c30145a7b344c870bdda01b454e2"
 
 PKG_MOBY_BUILDTAGS="daemon \
                     autogen \
@@ -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/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.27"
+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="8acc813922d3bd6d3cdc10448a62ea6af5dba18ac3137d47dde453d324f53766"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/6be3e44e-1306-422b-845c-9313589bbeb0/d76f133799f6b2c8e3ea7dc9d92b7a03/aspnetcore-runtime-6.0.27-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="14f9db2f396b041c27655dbd8435159a0f570112bafe70abfc6275d99800d32c"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d339df74-9573-4ca1-9835-61a829e3fcf4/6937d0f4650f3622dbcdbe8a1717f212/aspnetcore-runtime-6.0.27-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="18e11c64d046295a4f5b4164b4142f676b2989977a0ed32c9481783476a63b28"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d3e6b8a2-f7de-441e-a3af-c18b7584034b/9f15be4d095b7bbb751222b4d68a17e3/aspnetcore-runtime-6.0.27-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.2"
+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="107074b613c48ffcd311670bc34df93f63fce33938ac35770c3db1969da770ef"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/bdfd0216-539e-4dfd-81ea-1b7a77dda929/59a62884bdb8684ef0e4f434eaea0ca3/aspnetcore-runtime-8.0.2-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="940a9e0f89330924a5aed8dedaadb6220f4504f42b5c676e1f6a77060595bb49"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/272dbea2-057e-4032-9857-7e00b476ceec/3c472df94b1c3f5e0d009cbccc9256a6/aspnetcore-runtime-8.0.2-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="9748a8c44b20219b7529b8dde8c17aa07dfadb0206609ea6ce7329269379a121"
-    PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d6d79cc3-df2f-4680-96ff-a7198f461139/df025000eaf5beb85d9137274a8c53ea/aspnetcore-runtime-8.0.2-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/dtv-scan-tables/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dtv-scan-tables"
-PKG_VERSION="2022-04-30-57ed29822750"
-PKG_SHA256="6a6268aa392459378fa3a13922fc015a3fa63ff822f4b0d64d33d71350a6ec9e"
+PKG_VERSION="2024-03-24-7098bdd27548"
+PKG_SHA256="3f4c8981b3a4829066b396abc0da270e5c7e674b5d190e92532a06951a07e98e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://git.linuxtv.org/dtv-scan-tables.git"
 PKG_URL="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PKG_VERSION}.tar.bz2"

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/ffmpegx-depends/x264/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="x264"
-PKG_VERSION="12426f5f4906e34d483a07da0debb6d56c6f8434"
-PKG_SHA256="5acfb70a2711fb8aa1454ace394cc85f3520000a04a591f4bbf7147905595227"
+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.5"
-PKG_SHA256="7ebc5d2de6ce5dfefb434e422e59a0c4715fe939c784ac2f3d41af5775adc706"
+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} -DCMAKE_INSTALL_PREFIX=/usr -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"
 
@@ -162,6 +162,7 @@ configure_target() {
     --enable-pic \
     --disable-gnutls \
     --enable-openssl \
+    --enable-libxml2 \
     \
     `#Advanced options` \
     --disable-hardcoded-tables \

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.1"
-PKG_SHA256="e6dbc2e591b577ef7d3cb0f6572568521c2dcfe8c7521f1253fe23fd624cdc56"
+PKG_VERSION="1.23.6"
+PKG_SHA256="06ca9da2305302a7ca1593afadf012494debf658a11e4e41119ee1ee160f77c7"
 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/hyperhdr-depends/hyperhdr-linalg/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="hyperhdr-linalg"
+PKG_VERSION="4460f1f5b85ccc81ffcf49aa450d454db58ca90e"
+PKG_SHA256="fbeacd845a4121da101222112af45b2e7f4fb024ad627b4adc97aaaab2272ccb"
+PKG_LICENSE="Unlicense"
+PKG_SITE="https://github.com/sgorsten/linalg"
+PKG_URL="https://github.com/sgorsten/linalg/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="single header, public domain, short vector math library for C++"
+PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/hyperhdr-depends/hyperhdr-lunasvg/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="hyperhdr-lunasvg"
+PKG_VERSION="610b8bf5148a27489b4e3344b4f5617b81be38c7"
+PKG_SHA256="b71a1abf80cebf909da1b0e9bc86b8e10d0281851202785ecf04761229da8275"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/sammycage/lunasvg"
+PKG_URL="https://github.com/sammycage/lunasvg/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Lightweight SVG rendering library in C++"
+PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/hyperhdr-depends/hyperhdr-mdns/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="hyperhdr-mdns"
+PKG_VERSION="1727be0602941a714cb6048a737f0584b1cebf3c"
+PKG_SHA256="e8559095ac179ca89fee6c2de6c24cf252538485c7521a50d4f36785e22c571e"
+PKG_LICENSE="Unlicense"
+PKG_SITE="https://github.com/mjansson/mdns"
+PKG_URL="https://github.com/mjansson/mdns/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Public domain mDNS/DNS-SD library in C"
+PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/hyperhdr-depends/hyperhdr-nanopb/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="hyperhdr-nanopb"
+PKG_VERSION="6cfe48d6f1593f8fa5c0f90437f5e6522587745e"
+PKG_SHA256="556899aeba86a151a0c27b85234cc1918b8278d90d482aaeb58207da5720dd4a"
+PKG_LICENSE="Zlib"
+PKG_SITE="https://github.com/nanopb/nanopb"
+PKG_URL="https://github.com/nanopb/nanopb/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Protocol Buffers for Embedded Systems"
+PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/hyperhdr-depends/hyperhdr-qmqtt/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="hyperhdr-qmqtt"
+PKG_VERSION="6476bf68edc4840fbe4395838a27d1b06f9f84ec"
+PKG_SHA256="8a8dfdb77391a565cb086708557a4f96db4b8186cd316bca6e8fd1a41611bb7f"
+PKG_LICENSE="EPL-1.0"
+PKG_SITE="https://github.com/emqx/qmqtt"
+PKG_URL="https://github.com/emqx/qmqtt/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="MQTT client for Qt 5 in maintenance status"
+PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/hyperhdr-depends/hyperhdr-sdbus-cpp/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="hyperhdr-sdbus-cpp"
+PKG_VERSION="b7d85f936d622299ee57966c2b2aefde5e4f3684"
+PKG_SHA256="1ab2c8b6ee551fe6cd5afe75660cf88ebf9094b1132a5823bb84a65a14fd821c"
+PKG_LICENSE="LGPL-2.1"
+PKG_SITE="https://github.com/Kistler-Group/sdbus-cpp"
+PKG_URL="https://github.com/Kistler-Group/sdbus-cpp/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="single-file public domain (or MIT licensed) libraries for C/C++"
+PKG_TOOLCHAIN="manual"

packages/addons/addon-depends/hyperhdr-depends/hyperhdr-stb/package.mk

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2025-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="hyperhdr-stb"
+PKG_VERSION="f7f20f39fe4f206c6f19e26ebfef7b261ee59ee4"
+PKG_SHA256="76bbeda8d27488b8520e2c05b722c6f2500530ac41de3240d364a2ad800eb273"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/nothings/stb"
+PKG_URL="https://github.com/nothings/stb/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="single-file public domain (or MIT licensed) libraries for C/C++"
+PKG_TOOLCHAIN="manual"

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/jre-depends/jdk-aarch64-zulu/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
 
 PKG_NAME="jdk-aarch64-zulu"
-PKG_VERSION="8.38.0.162-1.8.0_212"
-PKG_SHA256="2afa6b9a86fea6f9275856506b5cc1efd8420f674c5e2dc3e1b04e140d6ad852"
+PKG_VERSION="8.84.0.15-8.0.442"
+PKG_SHA256="3ae6b27727a308c0c262a99e20af29c87aad7910de423db2607c44551b598e57"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://www.azul.com/products/zulu-embedded/"
-PKG_URL="http://cdn.azul.com/zulu-embedded/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_aarch64.tar.gz"
+PKG_URL="http://cdn.azul.com/zulu/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_aarch64.tar.gz"
 PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
 PKG_TOOLCHAIN="manual"
 

packages/addons/addon-depends/jre-depends/jdk-arm-zulu/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
 
 PKG_NAME="jdk-arm-zulu"
-PKG_VERSION="8.38.0.163-1.8.0_212"
-PKG_SHA256="bc45f41eab6e55c4e740e980001831c5e35db85745ec61a2b110e816e1074715"
+PKG_VERSION="8.84.0.15-8.0.442"
+PKG_SHA256="3a164013eae14af23256b7fbaedc6ac3abc295f3bfafd794e5f5a44266ddecab"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://www.azul.com/products/zulu-embedded/"
 PKG_URL="https://cdn.azul.com/zulu-embedded/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_aarch32hf.tar.gz"

packages/addons/addon-depends/jre-depends/jdk-x86_64-zulu/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
 
 PKG_NAME="jdk-x86_64-zulu"
-PKG_VERSION="8.38.0.13-8.0.212"
-PKG_SHA256="568e7578f1b20b1e62a8ed2c374bad4eb0e75d221323ccfa6ba8d7bc56cf33cf"
+PKG_VERSION="8.84.0.15-8.0.442"
+PKG_SHA256="6e3bd4d911e6eb2d14e0b48e622b6909c76add0b51c51d11f5c2c3d2a045bcf3"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://www.azul.com/products/zulu-enterprise/"
 PKG_URL="https://cdn.azul.com/zulu/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_x64.tar.gz"

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

@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libgpiod"
+PKG_VERSION="2.2"
+PKG_SHA256="ae35329db7027c740e90c883baf27c26311f0614e6a7b115771b28188b992aec"
+PKG_LICENSE="GPLv2+"
+PKG_SITE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"
+PKG_URL="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
+PKG_LONGDESC="Tools for interacting with the linux GPIO character device."
+PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="+pic -sysroot"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-tools --disable-shared"
+
+post_make_target() {
+  (
+    export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr"
+    export LDFLAGS+=" -L${PKG_BUILD}/.${TARGET_NAME}/lib/.libs"
+    export LDSHARED="${CC} -shared"
+    export CFLAGS+=" -fcommon -I${PKG_BUILD}/include"
+    export CPPFLAGS="${TARGET_CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}"
+    cd ../bindings/python
+    python3 setup.py build
+  )
+}

packages/addons/addon-depends/libgpiod/patches/libgpiod_setuptools-errors.patch

@@ -0,0 +1,11 @@
+--- a/bindings/python/setup.py	2024-11-12 14:29:25.000000000 +0100
++++ b/bindings/python/setup.py	2025-01-05 17:00:00.000000000 +0100
+@@ -8,7 +8,7 @@
+ from setuptools.command.build_ext import build_ext as orig_build_ext
+ from setuptools.command.sdist import log
+ from setuptools.command.sdist import sdist as orig_sdist
+-from setuptools.errors import BaseError
++from distutils.errors import DistutilsError as BaseError
+ 
+ LINK_SYSTEM_LIBGPIOD = getenv("LINK_SYSTEM_LIBGPIOD") == "1"
+ LIBGPIOD_MINIMUM_VERSION = "2.1"

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/libimobiledevice-glue/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libimobiledevice-glue"
-PKG_VERSION="1.1.0"
-PKG_SHA256="e7f93c1e6ceacf617ed78bdca92749d15a9dac72443ccb62eb59e4d606d87737"
+PKG_VERSION="1.2.0"
+PKG_SHA256="ff9cbc240c9780edfa43914a057b86362054053721b65fb04f54a25023b92b62"
 PKG_LICENSE="LGPL-2.1"
 PKG_SITE="http://www.libimobiledevice.org"
 PKG_URL="https://github.com/libimobiledevice/libimobiledevice-glue/releases/download/${PKG_VERSION}/libimobiledevice-glue-${PKG_VERSION}.tar.bz2"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="librepfunc"
-PKG_VERSION="1.9.1"
-PKG_SHA256="197399d8173ddee819f66d9deb433b496cf9f28fe0e1608a70f81b629ea4eafd"
+PKG_VERSION="1.10.0"
+PKG_SHA256="cf44d9c2e70b06318eda5a6f9e0449f70d1ac71de577c3cc92f513893952a896"
 PKG_LICENSE="GPL-2.0"
 PKG_SITE="https://github.com/wirbel-at-vdr-portal/librepfunc"
 PKG_URL="https://github.com/wirbel-at-vdr-portal/librepfunc/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libseccomp"
-PKG_VERSION="2.5.5"
-PKG_SHA256="248a2c8a4d9b9858aa6baf52712c34afefcf9c9e94b76dce02c1c9aa25fb3375"
+PKG_VERSION="2.6.0"
+PKG_SHA256="83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://github.com/seccomp/libseccomp"
 PKG_URL="https://github.com/seccomp/libseccomp/releases/download/v${PKG_VERSION}/libseccomp-${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libusbmuxd"
-PKG_VERSION="07cd6f774fd444f981ade6e75e10962ba0439350"
-PKG_SHA256="fc17f3fb8236afe159c2fbb1dc373a26cf3491150ec43d6ecb4f160a0557ee4f"
+PKG_VERSION="2.1.0"
+PKG_SHA256="3bda6abb2167e7818bd449aa03c5cfe175c6f965bab3979fda6d58e698df19af"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libimobiledevice.org"
 PKG_URL="https://github.com/libimobiledevice/libusbmuxd/archive/${PKG_VERSION}.tar.gz"

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/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.01"
-PKG_SHA256="a02dfc6689f485cec06fa12a3414c3c3aa2853b4dde18aeab4b54a56c8316259"
+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"
@@ -20,7 +20,7 @@ configure_target() {
         --host=${TARGET_NAME} \
         --build=${HOST_NAME} \
         --enable-static \
-        --disable-shared \
+        --enable-shared \
         --prefix=/usr \
         --enable-visibility
 }
@@ -36,6 +36,8 @@ makeinstall_target() {
     mkdir -p ${INSTALL}/usr/include/MediaInfo/${i}/
     cp -aP ../../../Source/MediaInfo/${i}/*.h ${INSTALL}/usr/include/MediaInfo/${i}/
   done
-  cp -P .libs/* ${INSTALL}/usr/lib
+
+  # only install static library, so mediainfo does not build with shared library
+  cp -P .libs/libmediainfo.a ${INSTALL}/usr/lib
   cp -P libmediainfo.pc ${INSTALL}/usr/lib/pkgconfig
 }

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.01.1"
-PKG_SHA256="32ea646d5c86c63d54418d10b2736260ab43e4b727f81e8dd5ecf5e9b5e3fd34"
+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/mpg123/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpg123"
-PKG_VERSION="1.32.5"
-PKG_SHA256="af908cdf6cdb6544b97bc706a799f79894e69468af5881bf454a0ebb9171ed63"
+PKG_VERSION="1.32.6"
+PKG_SHA256="ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6"
 PKG_LICENSE="LGPLv2"
 PKG_SITE="https://www.mpg123.org/"
 PKG_URL="https://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpv-drmprime"
-PKG_VERSION="0.37.0"
-PKG_SHA256="1d2d4adbaf048a2fa6ee134575032c4b2dad9a7efafd5b3e69b88db935afaddf"
+PKG_VERSION="0.38.0"
+PKG_SHA256="86d9ef40b6058732f67b46d0bbda24a074fae860b3eaae05bab3145041303066"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mpv.io/"
 PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz"

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/squeezelite/package.mk

@@ -2,14 +2,14 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="squeezelite"
-PKG_VERSION="fd89d67b1b9a17a6dd212be0c91d0417b440f60a"
-PKG_SHA256="40a97202d3018b5f36c3893e3e1c291d805eefdd9f26751b10f65c1592f5a2eb"
+PKG_VERSION="c751ef146265c243cdbd7c0353dd0b70ab51730c"
+PKG_SHA256="19fd23ca52039b4e216ff74e7d93b7fd8079ab8bfd63d5fb2286bfb743e334ed"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ralph-irving/squeezelite"
 PKG_URL="https://github.com/ralph-irving/squeezelite/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain faad2 ffmpeg flac libmad libvorbis mpg123 soxr libogg"
 PKG_DEPENDS_CONFIG="mpg123"
-PKG_LONGDESC="A client for the Logitech Media Server."
+PKG_LONGDESC="A client for the Lyrion Music Server."
 PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {

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"

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/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"

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_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,8 +2,8 @@
 # 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"

packages/addons/addon-depends/ntfs-3g_ntfsprogs/package.mk

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="ntfs-3g_ntfsprogs"
+PKG_VERSION="2022.10.3"
+PKG_SHA256="f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/tuxera/ntfs-3g"
+PKG_URL="https://tuxera.com/opensource/${PKG_NAME}-${PKG_VERSION}.tgz"
+PKG_DEPENDS_TARGET="toolchain fuse libgcrypt"
+PKG_LONGDESC="A NTFS driver with read and write support."
+PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="+lto +speed -sysroot"
+
+PKG_CONFIGURE_OPTS_TARGET="--exec-prefix=/usr/ \
+                           --disable-dependency-tracking \
+                           --disable-library \
+                           --enable-posix-acls \
+                           --enable-mtab \
+                           --enable-ntfsprogs \
+                           --disable-crypto \
+                           --with-fuse=external \
+                           --with-uuid \
+                           --disable-mount-helper"
+

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.0.3"
-PKG_SHA256="f42ee9efa489e9ff5d328baefa26f9c515be65021856e78d99ad1f0ead9ec85d"
+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

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="conmon"
+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"
+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="e8896631295ccb0bfdda4284f1751be19b483264"
+
+pre_configure_target() {
+  export PKG_CONFIG_PATH="$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
+  export GIT_COMMIT=${PKG_GIT_COMMIT}
+}

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

@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="gpgme"
+PKG_VERSION="1.24.2"
+PKG_SHA256="e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581"
+PKG_LICENSE="gpgme"
+PKG_SITE="https://gnupg.org/software/gpgme/index.html"
+PKG_URL="https://gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libassuan libgpg-error"
+PKG_LONGDESC="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications"
+PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-languages=cl \
+                           --disable-static \
+                           --enable-shared \
+                           --disable-glibtest \
+                           --disable-gpgconf-test \
+                           --disable-gpg-test \
+                           --disable-gpgsm-test \
+                           --disable-g13-test \
+                           --with-pic \
+                           --with-libgpg-error-prefix=${SYSROOT_PREFIX}/usr \
+                           --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"
+}

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

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libassuan"
+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"
+PKG_DEPENDS_TARGET="toolchain libgpg-error"
+PKG_LONGDESC="Libassuan is a small library implementing the so-called Assuan protocol"
+PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --with-gnu-ld \
+                           --with-pic \
+                           --with-libgpg-error-prefix=${SYSROOT_PREFIX}/usr"

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

@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="netavark"
+PKG_VERSION="1.14.0"
+PKG_SHA256="d2ded5412e5037e84f79a28c774378c864aa6f6e43023dd88891c70cfaf963ef"
+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

@@ -0,0 +1,10 @@
+--- 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
+-	$(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
+ 	install ${SELINUXOPT} -m 644 contrib/systemd/system/netavark-dhcp-proxy.service ${DESTDIR}${SYSTEMDDIR}/netavark-dhcp-proxy.service

packages/addons/addon-depends/podman/podman-bin/makepatch.sh

@@ -0,0 +1,14 @@
+tar xvf ../sources/podman-bin/podman-bin-5.0.0.tar.gz
+mv podman-5.0.0 a
+tar xvf ../sources/podman-bin/podman-bin-5.0.0.tar.gz
+mv podman-5.0.0 b
+
+cd b
+find . -name "*.go" -print | \
+  xargs sed -i \
+    -e '/^\W*\/\// ! s#/etc/containers#/storage/.kodi/addons/service.system.podman/etc/containers#g' \
+    -e '/^\W*\/\// ! s#/usr/share/containers#/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers#g' \
+    -e '/^\W*\/\// ! s#/var/lib/containers#/storage/.kodi/userdata/addon_data/service.system.podman/podman#g'
+
+cd ..
+diff -Nur a b > podman-0002-path-changes.patch

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

@@ -0,0 +1,43 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="podman-bin"
+PKG_VERSION="5.4.0"
+PKG_SHA256="e5efb825558624d0539dac94847c39aafec68e6d4dd712435ff4ec1b17044b69"
+PKG_LICENSE="Apache-2.0"
+PKG_SITE="https://podman.io/"
+PKG_URL="https://github.com/containers/podman/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host gpgme libassuan libseccomp systemd"
+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="f9f7d48b24b1ca4403f189caaeab1cb8ff4a9aa2"
+
+PKG_PODMAN_BUILDTAGS="exclude_graphdriver_devicemapper \
+                      exclude_graphdriver_btrfs \
+                      seccomp \
+                      systemd"
+
+configure_target() {
+  export PKG_CONFIG_PATH="$(get_install_dir libassuan)/usr/lib/pkgconfig:$(get_install_dir gpgme)/usr/lib/pkgconfig:$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
+
+  go_configure
+
+  # used for podman commit
+  export GIT_COMMIT=${PKG_GIT_COMMIT}
+}
+
+make_target() {
+  make BUILDTAGS="${PKG_PODMAN_BUILDTAGS}" \
+       CGO_CPPFLAGS="-I$(get_install_dir gpgme)/usr/include" \
+       GO="${GOLANG}" \
+       PREFIX=/storage/.kodi/addons/service.system.podman \
+       HELPER_BINARIES_DIR=/storage/.kodi/addons/service.system.podman/bin \
+       EXTRA_LDFLAGS="-X github.com/containers/image/v5/sysregistries.systemRegistriesConfPath=/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/registries.conf -X github.com/containers/image/v5/sysregistries.systemRegistriesConfDirectoryPath=/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/registries.conf.d -X github.com/containers/image/v5/signature.systemDefaultPolicyPath=/storage/.kodi/addons/service.system.podman/etc/containers/policy.json -extldflags=-L$(get_install_dir gpgme)/usr/lib" \
+       binaries
+}
+
+makeinstall_target() {
+  :
+}

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

@@ -0,0 +1,42 @@
+diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
+index 7e8b3f78a..1a27842fd 100644
+--- a/pkg/rootless/rootless_linux.c
++++ b/pkg/rootless/rootless_linux.c
+@@ -20,8 +20,8 @@
+ #include <sys/select.h>
+ #include <stdio.h>
+ 
+-#define ETC_PREEXEC_HOOKS "/etc/containers/pre-exec-hooks"
+-#define LIBEXECPODMAN "/usr/libexec/podman"
++#define ETC_PREEXEC_HOOKS "/storage/.kodi/addons/service.system.podman/etc/containers/pre-exec-hooks"
++#define LIBEXECPODMAN "/storage/.kodi/addons/service.system.podman/libexec"
+ 
+ #ifndef TEMP_FAILURE_RETRY
+ #define TEMP_FAILURE_RETRY(expression) \
+diff --git a/vendor/github.com/containers/common/pkg/config/config_linux.go b/vendor/github.com/containers/common/pkg/config/config_linux.go
+index 4ce5d0320..531de9ceb 100644
+--- a/vendor/github.com/containers/common/pkg/config/config_linux.go
++++ b/vendor/github.com/containers/common/pkg/config/config_linux.go
+@@ -6,10 +6,10 @@ import (
+ 
+ const (
+ 	// OverrideContainersConfig holds the default config path overridden by the root user
+-	OverrideContainersConfig = "/etc/" + _configPath
++	OverrideContainersConfig = "/storage/.kodi/addons/service.system.podman/etc/" + _configPath
+ 
+ 	// DefaultContainersConfig holds the default containers config path
+-	DefaultContainersConfig = "/usr/share/" + _configPath
++	DefaultContainersConfig = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/" + _configPath
+ 
+ 	// DefaultSignaturePolicyPath is the default value for the
+ 	// policy.json file.
+@@ -21,8 +21,5 @@ func ifRootlessConfigPath() (string, error) {
+ }
+ 
+ var defaultHelperBinariesDir = []string{
+-	"/usr/local/libexec/podman",
+-	"/usr/local/lib/podman",
+-	"/usr/libexec/podman",
+-	"/usr/lib/podman",
++	"/storage/.kodi/addons/service.system.podman/bin",
+ }

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

@@ -0,0 +1,997 @@
+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-11-21 13:40:20.000000000 +0000
++++ b/pkg/api/handlers/libpod/swagger_spec.go	2024-11-22 09:32:20.604644984 +0000
+@@ -13,7 +13,7 @@
+ )
+ 
+ // DefaultPodmanSwaggerSpec provides the default path to the podman swagger spec file
+-const DefaultPodmanSwaggerSpec = "/usr/share/containers/podman/swagger.yaml"
++const DefaultPodmanSwaggerSpec = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/podman/swagger.yaml"
+ 
+ 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-11-21 13:40:20.000000000 +0000
++++ b/pkg/machine/define/config.go	2024-11-22 09:32:20.631311705 +0000
+@@ -3,7 +3,7 @@
+ import "os"
+ 
+ const (
+-	UserCertsTargetPath = "/etc/containers/certs.d"
++	UserCertsTargetPath = "/storage/.kodi/addons/service.system.podman/etc/containers/certs.d"
+ 	DefaultIdentityName = "machine"
+ 	DefaultMachineName  = "podman-machine-default"
+ )
+diff -Nur a/pkg/machine/ignition/ignition.go b/pkg/machine/ignition/ignition.go
+--- a/pkg/machine/ignition/ignition.go	2024-11-21 13:40:20.000000000 +0000
++++ b/pkg/machine/ignition/ignition.go	2024-11-22 09:32:20.637978385 +0000
+@@ -381,7 +381,7 @@
+ 	files = append(files, File{
+ 		Node: Node{
+ 			Group: GetNodeGrp("root"),
+-			Path:  "/etc/containers/podman-machine",
++			Path:  "/storage/.kodi/addons/service.system.podman/etc/containers/podman-machine",
+ 			User:  GetNodeUsr("root"),
+ 		},
+ 		FileEmbedded1: FileEmbedded1{
+diff -Nur a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
+--- a/pkg/machine/wsl/machine.go	2024-11-21 13:40:20.000000000 +0000
++++ b/pkg/machine/wsl/machine.go	2024-11-22 09:32:20.637978385 +0000
+@@ -180,7 +180,7 @@
+ 		return fmt.Errorf("could not configure systemd settings for guest OS: %w", err)
+ 	}
+ 
+-	if err := wslPipe(containersConf, dist, "sh", "-c", "cat > /etc/containers/containers.conf"); err != nil {
++	if err := wslPipe(containersConf, dist, "sh", "-c", "cat > /storage/.kodi/addons/service.system.podman/etc/containers/containers.conf"); err != nil {
+ 		return fmt.Errorf("could not create containers.conf for guest OS: %w", err)
+ 	}
+ 
+@@ -192,7 +192,7 @@
+ 		return err
+ 	}
+ 
+-	if err := wslInvoke(dist, "sh", "-c", "echo wsl > /etc/containers/podman-machine"); err != nil {
++	if err := wslInvoke(dist, "sh", "-c", "echo wsl > /storage/.kodi/addons/service.system.podman/etc/containers/podman-machine"); err != nil {
+ 		return fmt.Errorf("could not create podman-machine file for guest OS: %w", err)
+ 	}
+ 
+@@ -265,7 +265,7 @@
+ }
+ 
+ func configureRegistries(dist string) error {
+-	cmd := "cat > /etc/containers/registries.conf.d/999-podman-machine.conf"
++	cmd := "cat > /storage/.kodi/addons/service.system.podman/etc/containers/registries.conf.d/999-podman-machine.conf"
+ 	if err := wslPipe(registriesConf, dist, "sh", "-c", cmd); err != nil {
+ 		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-11-21 13:40:20.000000000 +0000
++++ b/pkg/systemd/generate/containers_test.go	2024-11-22 09:32:20.611311664 +0000
+@@ -1045,7 +1045,7 @@
+ 				StopTimeout:       22,
+ 				PodmanVersion:     "CI",
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodID,
+@@ -1063,7 +1063,7 @@
+ 				StopTimeout:       22,
+ 				PodmanVersion:     "CI",
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodIDNoHeaderInfo,
+@@ -1081,7 +1081,7 @@
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodName,
+@@ -1100,7 +1100,7 @@
+ 				PodmanVersion:     "CI",
+ 				Wants:             []string{"a.service", "b.service", "c.target"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameCustomWants,
+@@ -1119,7 +1119,7 @@
+ 				PodmanVersion:     "CI",
+ 				After:             []string{"a.service", "b.service", "c.target"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameCustomAfter,
+@@ -1138,7 +1138,7 @@
+ 				PodmanVersion:     "CI",
+ 				Requires:          []string{"a.service", "b.service", "c.target"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameCustomRequires,
+@@ -1159,7 +1159,7 @@
+ 				After:             []string{"a.service", "b.service", "c.target"},
+ 				Requires:          []string{"a.service", "b.service", "c.target"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameCustomDependencies,
+@@ -1178,7 +1178,7 @@
+ 				PodmanVersion:     "CI",
+ 				BoundToServices:   []string{"pod", "a", "b", "c"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameBoundTo,
+@@ -1197,7 +1197,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "container", "run", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN", "foo=arg \"with \" space"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodWithNameAndGeneric,
+@@ -1216,7 +1216,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "container", "run", "--sdnotify=container", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN", "foo=arg \"with \" space"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodWithNameAndSdnotify,
+@@ -1235,7 +1235,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "container", "run", "--sdnotify", "container", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN", "foo=arg \"with \" space"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			strings.ReplaceAll(goodWithNameAndSdnotify, "--sdnotify=container", "--sdnotify container"),
+@@ -1254,7 +1254,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "container", "run", "--sdnotify=ignore", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN", "foo=arg \"with \" space"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodWithNameAndSdnotifyIgnore,
+@@ -1273,7 +1273,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "container", "run", "--sdnotify", "ignore", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN", "foo=arg \"with \" space"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodWithNameAndSdnotifyIgnore,
+@@ -1292,7 +1292,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "-d", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodWithExplicitShortDetachParam,
+@@ -1311,7 +1311,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "-d", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 				Pod: &podInfo{
+ 					PodIDFile: "%t/pod-foobar.pod-id-file",
+@@ -1333,7 +1333,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "--detach", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameNewDetach,
+@@ -1352,7 +1352,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodIDNew,
+@@ -1371,7 +1371,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "--detach=true", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			genGoodNewDetach("--detach=true"),
+@@ -1390,7 +1390,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "--detach=false", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			genGoodNewDetach("-d"),
+@@ -1409,7 +1409,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "--name", "test", "-p", "80:80", "--detach=false", "awesome-image:latest", "somecmd", "--detach=false"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameNewDetachFalseWithCmd,
+@@ -1428,7 +1428,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "--name", "test", "-p", "80:80", "--detach=false", "--detach=false", "awesome-image:latest", "somecmd", "--detach=false"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameNewDetachFalseWithCmd,
+@@ -1447,7 +1447,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "run", "-dti", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			genGoodNewDetach("-dti"),
+@@ -1466,7 +1466,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "--events-backend", "none", "--runroot", "/root", "run", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNewRootFlags,
+@@ -1485,7 +1485,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "container", "create", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodContainerCreate,
+@@ -1504,7 +1504,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "create", "--name", "test", "--log-driver=journald", "--log-opt=tag={{.Name}}", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNewWithJournaldTag,
+@@ -1523,7 +1523,7 @@
+ 				PodmanVersion:     "CI",
+ 				CreateCommand:     []string{"I'll get stripped", "create", "--name", "test", "awesome-image:latest", "sh", "-c", "kill $$ && echo %\\"},
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNewWithSpecialChars,
+@@ -1540,7 +1540,7 @@
+ 				PIDFile:           "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 				CreateCommand:     []string{"I'll get stripped", "create", "--cgroups=foo", "--conmon-pidfile=foo", "--cidfile=foo", "awesome-image:latest", "podman", "run", "--cgroups=foo", "--conmon-pidfile=foo", "--cidfile=foo", "alpine"},
+ 				EnvVariable:       define.EnvVariable,
+@@ -1559,7 +1559,7 @@
+ 				PIDFile:           "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 				CreateCommand:     []string{"I'll get stripped", "create", "--cgroups=foo", "--conmon-pidfile=foo", "--cidfile=foo", "--pod", "test", "awesome-image:latest", "podman", "run", "--cgroups=foo", "--conmon-pidfile=foo", "--cidfile=foo", "--pod-id-file", "/tmp/pod-foobar.pod-id-file", "alpine"},
+ 				EnvVariable:       define.EnvVariable,
+@@ -1581,7 +1581,7 @@
+ 				PIDFile:           "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 				CreateCommand:     []string{"I'll get stripped", "create", "--env", "FOO", "--env=BAR", "--env=MYENV=2", "-e", "USER", "awesome-image:latest"},
+ 				containerEnv:      []string{"FOO=abc", "BAR=my test", "USER=%a", "MYENV=2"},
+@@ -1601,7 +1601,7 @@
+ 				PIDFile:                "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:            10,
+ 				PodmanVersion:          "CI",
+-				GraphRoot:              "/var/lib/containers/storage",
++				GraphRoot:              "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:                "/var/run/containers/storage",
+ 				EnvVariable:            define.EnvVariable,
+ 				AdditionalEnvVariables: []string{"FOO=abc", "BAR=my test", "USER=%a"},
+@@ -1620,7 +1620,7 @@
+ 				PIDFile:           "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 				CreateCommand:     []string{"I'll get stripped", "create", "--restart", "on-failure:42", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+@@ -1639,7 +1639,7 @@
+ 				PIDFile:           "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 				CreateCommand:     []string{"I'll get stripped", "create", "-h", "hostname", "awesome-image:latest"},
+ 				EnvVariable:       define.EnvVariable,
+@@ -1658,7 +1658,7 @@
+ 				PIDFile:           "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 				CreateCommand:     []string{"I'll get stripped", "create", "--restart", "on-failure:42", "awesome-image:latest"},
+ 			},
+@@ -1677,7 +1677,7 @@
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 			},
+ 			goodNameEmptyContainerPrefix,
+@@ -1695,7 +1695,7 @@
+ 				StopTimeout:       10,
+ 				PodmanVersion:     "CI",
+ 				EnvVariable:       define.EnvVariable,
+-				GraphRoot:         "/var/lib/containers/storage",
++				GraphRoot:         "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:           "/var/run/containers/storage",
+ 				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-11-21 13:40:20.000000000 +0000
++++ b/pkg/systemd/generate/pods_test.go	2024-11-22 09:32:20.611311664 +0000
+@@ -485,7 +485,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "pod", "create", "--name", "foo", "bar=arg with space"},
+@@ -503,7 +503,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				Wants:            []string{"a.service", "b.service", "c.target"},
+@@ -524,7 +524,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				After:            []string{"a.service", "b.service", "c.target"},
+@@ -545,7 +545,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				Requires:         []string{"a.service", "b.service", "c.target"},
+@@ -566,7 +566,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				Wants:            []string{"a.service", "b.service", "c.target"},
+@@ -591,7 +591,7 @@
+ 				PIDFile:       "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:   10,
+ 				PodmanVersion: "CI",
+-				GraphRoot:     "/var/lib/containers/storage",
++				GraphRoot:     "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:       "/var/run/containers/storage",
+ 				CreateCommand: []string{"podman", "pod", "create", "foo"},
+ 			},
+@@ -608,7 +608,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "pod", "create", "--name", "foo", "bar=arg with space"},
+@@ -627,7 +627,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "pod", "create", "--name", "foo", "bar=arg with space"},
+@@ -645,7 +645,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "--events-backend", "none", "--runroot", "/root", "pod", "create", "--name", "foo", "bar=arg with space"},
+@@ -663,7 +663,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      10,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "pod", "create", "--name", "foo", "bar=arg with space"},
+@@ -681,7 +681,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      10,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "--events-backend", "none", "--runroot", "/root", "pod", "create", "--name", "foo", "bar=arg with space"},
+@@ -699,7 +699,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      10,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "pod", "create", "--name", "foo", "--replace=false"},
+@@ -717,7 +717,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      10,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "pod", "create", "--name", "foo", "--label", "key={{someval}}", "--exit-policy=continue"},
+@@ -735,7 +735,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      10,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				RequiredServices: []string{"container-1", "container-2"},
+ 				CreateCommand:    []string{"podman", "pod", "create", "--infra-conmon-pidfile", "/tmp/pod-123abc.pid", "--pod-id-file", "/tmp/pod-123abc.pod-id", "--name", "foo", "bar=arg with space"},
+@@ -753,7 +753,7 @@
+ 				PIDFile:          "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid",
+ 				StopTimeout:      42,
+ 				PodmanVersion:    "CI",
+-				GraphRoot:        "/var/lib/containers/storage",
++				GraphRoot:        "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage",
+ 				RunRoot:          "/var/run/containers/storage",
+ 				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-11-21 13:40:20.000000000 +0000
++++ b/pkg/systemd/quadlet/quadlet.go	2024-11-22 09:32:20.611311664 +0000
+@@ -23,9 +23,9 @@
+ 	// Directory for temporary Quadlet files (sysadmin owned)
+ 	UnitDirTemp = "/run/containers/systemd"
+ 	// Directory for global Quadlet files (sysadmin owned)
+-	UnitDirAdmin = "/etc/containers/systemd"
++	UnitDirAdmin = "/storage/.kodi/addons/service.system.podman/etc/containers/systemd"
+ 	// Directory for global Quadlet files (distro owned)
+-	UnitDirDistro = "/usr/share/containers/systemd"
++	UnitDirDistro = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/systemd"
+ 
+ 	// 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-11-21 13:40:20.000000000 +0000
++++ b/pkg/trust/registries.go	2024-11-22 09:32:20.627978364 +0000
+@@ -29,7 +29,7 @@
+ }
+ 
+ // systemRegistriesDirPath is the path to registries.d.
+-const systemRegistriesDirPath = "/etc/containers/registries.d"
++const systemRegistriesDirPath = "/storage/.kodi/addons/service.system.podman/etc/containers/registries.d"
+ 
+ // 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-11-21 13:40:20.000000000 +0000
++++ b/test/e2e/common_test.go	2024-11-22 09:32:20.821312090 +0000
+@@ -314,7 +314,7 @@
+ 	}
+ 
+ 	networkBackend := Netavark
+-	networkConfigDir := "/etc/containers/networks"
++	networkConfigDir := "/storage/.kodi/addons/service.system.podman/etc/containers/networks"
+ 	if isRootless() {
+ 		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-11-21 13:40:20.000000000 +0000
++++ b/test/e2e/create_test.go	2024-11-22 09:32:20.824645430 +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()
+ 		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-11-21 13:40:20.000000000 +0000
++++ b/test/e2e/import_test.go	2024-11-22 09:32:20.814645410 +0000
+@@ -175,7 +175,7 @@
+ 		importImage.WaitWithDefaultTimeout()
+ 		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()
+ 		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-11-21 13:40:20.000000000 +0000
++++ b/test/e2e/load_test.go	2024-11-22 09:32:20.814645410 +0000
+@@ -85,7 +85,7 @@
+ 		rmi.WaitWithDefaultTimeout()
+ 		Expect(rmi).Should(ExitCleanly())
+ 
+-		result := podmanTest.Podman([]string{"load", "-q", "--signature-policy", "/etc/containers/policy.json", "-i", outfile})
++		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(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-11-21 13:40:20.000000000 +0000
++++ b/test/e2e/push_test.go	2024-11-22 09:32:20.814645410 +0000
+@@ -198,11 +198,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.
+-			systemRegistriesDAddition := "/etc/containers/registries.d/podman-test-only-temporary-addition.yaml"
++			systemRegistriesDAddition := "/storage/.kodi/addons/service.system.podman/etc/containers/registries.d/podman-test-only-temporary-addition.yaml"
+ 			cmd := exec.Command("cp", "testdata/sigstore-registries.d-fragment.yaml", systemRegistriesDAddition)
+ 			output, err := cmd.CombinedOutput()
+ 			if err != nil {
+-				GinkgoWriter.Printf("Skipping sigstore tests because /etc/containers/registries.d isn’t writable: %s\n", string(output))
++				GinkgoWriter.Printf("Skipping sigstore tests because /storage/.kodi/addons/service.system.podman/etc/containers/registries.d isn’t writable: %s\n", string(output))
+ 			} else {
+ 				defer func() {
+ 					err := os.Remove(systemRegistriesDAddition)
+@@ -268,16 +268,16 @@
+ 	})
+ 
+ 	It("podman push to local registry with authorization", func() {
+-		SkipIfRootless("/etc/containers/certs.d not writable")
++		SkipIfRootless("/storage/.kodi/addons/service.system.podman/etc/containers/certs.d not writable")
+ 		if podmanTest.Host.Arch == "ppc64le" {
+ 			Skip("No registry image for ppc64le")
+ 		}
+ 		authPath := filepath.Join(podmanTest.TempDir, "auth")
+ 		err = os.Mkdir(authPath, os.ModePerm)
+ 		Expect(err).ToNot(HaveOccurred())
+-		err = os.MkdirAll("/etc/containers/certs.d/localhost:5004", os.ModePerm)
++		err = os.MkdirAll("/storage/.kodi/addons/service.system.podman/etc/containers/certs.d/localhost:5004", os.ModePerm)
+ 		Expect(err).ToNot(HaveOccurred())
+-		defer os.RemoveAll("/etc/containers/certs.d/localhost:5004")
++		defer os.RemoveAll("/storage/.kodi/addons/service.system.podman/etc/containers/certs.d/localhost:5004")
+ 
+ 		cwd, _ := os.Getwd()
+ 		certPath := filepath.Join(cwd, "../", "certs")
+@@ -316,7 +316,7 @@
+ 		Expect(push).Should(Exit(0))
+ 		Expect(push.ErrorToString()).To(ContainSubstring("Writing manifest to image destination"))
+ 
+-		setup := SystemExec("cp", []string{filepath.Join(certPath, "domain.crt"), "/etc/containers/certs.d/localhost:5004/ca.crt"})
++		setup := SystemExec("cp", []string{filepath.Join(certPath, "domain.crt"), "/storage/.kodi/addons/service.system.podman/etc/containers/certs.d/localhost:5004/ca.crt"})
+ 		Expect(setup).Should(ExitCleanly())
+ 
+ 		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-11-21 13:40:20.000000000 +0000
++++ b/test/e2e/run_test.go	2024-11-22 09:32:20.811312070 +0000
+@@ -125,7 +125,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()
+ 		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-11-21 13:40:20.000000000 +0000
++++ b/test/e2e/save_test.go	2024-11-22 09:32:20.807978730 +0000
+@@ -29,7 +29,7 @@
+ 		SkipIfRemote("--signature-policy N/A for remote")
+ 		outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
+ 
+-		save := podmanTest.Podman([]string{"save", "-q", "--signature-policy", "/etc/containers/policy.json", "-o", outfile, ALPINE})
++		save := podmanTest.Podman([]string{"save", "-q", "--signature-policy", "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json", "-o", outfile, ALPINE})
+ 		save.WaitWithDefaultTimeout()
+ 		Expect(save).Should(ExitCleanly())
+ 	})
+@@ -152,12 +152,12 @@
+ 		Expect(err).ToNot(HaveOccurred())
+ 
+ 		defaultYaml := filepath.Join(podmanTest.TempDir, "default.yaml")
+-		cmd = exec.Command("cp", "/etc/containers/registries.d/default.yaml", defaultYaml)
++		cmd = exec.Command("cp", "/storage/.kodi/addons/service.system.podman/etc/containers/registries.d/default.yaml", defaultYaml)
+ 		if err = cmd.Run(); err != nil {
+ 			Skip("no signature store to verify")
+ 		}
+ 		defer func() {
+-			cmd = exec.Command("cp", defaultYaml, "/etc/containers/registries.d/default.yaml")
++			cmd = exec.Command("cp", defaultYaml, "/storage/.kodi/addons/service.system.podman/etc/containers/registries.d/default.yaml")
+ 			err := cmd.Run()
+ 			Expect(err).ToNot(HaveOccurred())
+ 		}()
+@@ -169,10 +169,10 @@
+ 
+ 		sigstore := `
+ default-docker:
+-  sigstore: file:///var/lib/containers/sigstore
+-  sigstore-staging: file:///var/lib/containers/sigstore
++  sigstore: file:///storage/.kodi/userdata/addon_data/service.system.podman/podman/sigstore
++  sigstore-staging: file:///storage/.kodi/userdata/addon_data/service.system.podman/podman/sigstore
+ `
+-		Expect(os.WriteFile("/etc/containers/registries.d/default.yaml", []byte(sigstore), 0755)).To(Succeed())
++		Expect(os.WriteFile("/storage/.kodi/addons/service.system.podman/etc/containers/registries.d/default.yaml", []byte(sigstore), 0755)).To(Succeed())
+ 
+ 		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-11-21 13:40:20.000000000 +0000
++++ b/test/e2e/system_reset_test.go	2024-11-22 09:32:20.807978730 +0000
+@@ -45,7 +45,7 @@
+ 		Expect(session).Should(ExitCleanly())
+ 
+ 		Expect(session.ErrorToString()).To(Not(ContainSubstring("Failed to add pause process")))
+-		Expect(session.ErrorToString()).To(Not(ContainSubstring("/usr/share/containers/storage.conf")))
++		Expect(session.ErrorToString()).To(Not(ContainSubstring("/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/storage.conf")))
+ 
+ 		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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/libnetwork/network/interface_freebsd.go	2024-11-22 09:32:21.437980016 +0000
+@@ -4,7 +4,7 @@
+ 	// cniConfigDir is the directory where cni configuration is found
+ 	cniConfigDir = "/usr/local/etc/cni/net.d/"
+ 	// netavarkConfigDir is the config directory for the rootful network files
+-	netavarkConfigDir = "/usr/local/etc/containers/networks"
++	netavarkConfigDir = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/networks"
+ 	// netavarkRunDir is the run directory for the rootful temporary network files such as the ipam db
+ 	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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/libnetwork/network/interface_linux.go	2024-11-22 09:32:21.437980016 +0000
+@@ -4,7 +4,7 @@
+ 	// cniConfigDir is the directory where cni configuration is found
+ 	cniConfigDir = "/etc/cni/net.d/"
+ 	// netavarkConfigDir is the config directory for the rootful network files
+-	netavarkConfigDir = "/etc/containers/networks"
++	netavarkConfigDir = "/storage/.kodi/addons/service.system.podman/etc/containers/networks"
+ 	// 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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/config_bsd.go	2024-11-22 09:32:21.434646676 +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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/config_darwin.go	2024-11-22 09:32:21.434646676 +0000
+@@ -9,7 +9,7 @@
+ 
+ 	// DefaultSignaturePolicyPath is the default value for the
+ 	// policy.json file.
+-	DefaultSignaturePolicyPath = "/etc/containers/policy.json"
++	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_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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/config_linux.go	2024-11-22 09:32:21.434646676 +0000
+@@ -13,7 +13,7 @@
+ 
+ 	// DefaultSignaturePolicyPath is the default value for the
+ 	// policy.json file.
+-	DefaultSignaturePolicyPath = "/etc/containers/policy.json"
++	DefaultSignaturePolicyPath = "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
+ )
+ 
+ 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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/config_windows.go	2024-11-22 09:32:21.434646676 +0000
+@@ -12,7 +12,7 @@
+ 
+ 	// DefaultSignaturePolicyPath is the default value for the
+ 	// policy.json file.
+-	DefaultSignaturePolicyPath = "/etc/containers/policy.json"
++	DefaultSignaturePolicyPath = "/storage/.kodi/addons/service.system.podman/etc/containers/policy.json"
+ 
+ 	// 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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/config/default.go	2024-11-22 09:32:21.434646676 +0000
+@@ -23,7 +23,7 @@
+ 
+ const (
+ 	// _defaultGraphRoot points to the default path of the graph root.
+-	_defaultGraphRoot = "/var/lib/containers/storage"
++	_defaultGraphRoot = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage"
+ 
+ 	// _defaultTransport is a prefix that we apply to an image name to check
+ 	// docker hub first for the image.
+@@ -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.
+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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/hooks/hooks.go	2024-11-22 09:32:21.431313336 +0000
+@@ -20,10 +20,10 @@
+ 
+ const (
+ 	// DefaultDir is the default directory containing system hook configuration files.
+-	DefaultDir = "/usr/share/containers/oci/hooks.d"
++	DefaultDir = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/oci/hooks.d"
+ 
+ 	// OverrideDir is the directory for hook configuration files overriding the default entries.
+-	OverrideDir = "/etc/containers/oci/hooks.d"
++	OverrideDir = "/storage/.kodi/addons/service.system.podman/etc/containers/oci/hooks.d"
+ )
+ 
+ // 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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/machine/machine.go	2024-11-22 09:32:21.437980016 +0000
+@@ -12,7 +12,7 @@
+ }
+ 
+ const (
+-	markerFile = "/etc/containers/podman-machine"
++	markerFile = "/storage/.kodi/addons/service.system.podman/etc/containers/podman-machine"
+ 	Wsl        = "wsl"
+ 	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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/common/pkg/subscriptions/subscriptions.go	2024-11-22 09:32:21.431313336 +0000
+@@ -20,10 +20,10 @@
+ var (
+ 	// DefaultMountsFile holds the default mount paths in the form
+ 	// "host_path:container_path"
+-	DefaultMountsFile = "/usr/share/containers/mounts.conf"
++	DefaultMountsFile = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/mounts.conf"
+ 	// OverrideMountsFile holds the default mount paths in the form
+ 	// "host_path:container_path" overridden by the user
+-	OverrideMountsFile = "/etc/containers/mounts.conf"
++	OverrideMountsFile = "/storage/.kodi/addons/service.system.podman/etc/containers/mounts.conf"
+ 	// UserOverrideMountsFile holds the default mount paths in the form
+ 	// "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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/docker/registries_d.go	2024-11-22 09:32:21.417979975 +0000
+@@ -35,7 +35,7 @@
+ var defaultUserDockerDir = filepath.FromSlash(".local/share/containers/sigstore")
+ 
+ // defaultDockerDir is the default lookaside directory for root
+-var defaultDockerDir = "/var/lib/containers/sigstore"
++var defaultDockerDir = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/sigstore"
+ 
+ // 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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/pkg/blobinfocache/default.go	2024-11-22 09:32:21.411313295 +0000
+@@ -17,7 +17,7 @@
+ 	// If the format changes in an incompatible way, increase the version number.
+ 	blobInfoCacheFilename = "blob-info-cache-v1.sqlite"
+ 	// systemBlobInfoCacheDir is the directory containing the blob info cache (in blobInfocacheFilename) for root-running processes.
+-	systemBlobInfoCacheDir = "/var/lib/containers/cache"
++	systemBlobInfoCacheDir = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/cache"
+ )
+ 
+ // 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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_common.go	2024-11-22 09:32:21.407979955 +0000
+@@ -5,8 +5,8 @@
+ 
+ // builtinRegistriesConfPath is the path to the registry configuration file.
+ // DO NOT change this, instead see systemRegistriesConfPath above.
+-const builtinRegistriesConfPath = "/etc/containers/registries.conf"
++const builtinRegistriesConfPath = "/storage/.kodi/addons/service.system.podman/etc/containers/registries.conf"
+ 
+ // builtinRegistriesConfDirPath is the path to the registry configuration directory.
+ // DO NOT change this, instead see systemRegistriesConfDirectoryPath above.
+-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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/paths_freebsd.go	2024-11-22 09:32:21.407979955 +0000
+@@ -5,8 +5,8 @@
+ 
+ // builtinRegistriesConfPath is the path to the registry configuration file.
+ // DO NOT change this, instead see systemRegistriesConfPath above.
+-const builtinRegistriesConfPath = "/usr/local/etc/containers/registries.conf"
++const builtinRegistriesConfPath = "/usr/local/storage/.kodi/addons/service.system.podman/etc/containers/registries.conf"
+ 
+ // builtinRegistriesConfDirPath is the path to the registry configuration directory.
+ // DO NOT change this, instead see systemRegistriesConfDirectoryPath above.
+-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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/signature/policy_paths_common.go	2024-11-22 09:32:21.411313295 +0000
+@@ -5,4 +5,4 @@
+ 
+ // builtinDefaultPolicyPath is the policy path used for DefaultPolicy().
+ // DO NOT change this, instead see systemDefaultPolicyPath above.
+-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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/image/v5/signature/policy_paths_freebsd.go	2024-11-22 09:32:21.411313295 +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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/storage/types/options_bsd.go	2024-11-22 09:32:21.387979914 +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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/storage/types/options_darwin.go	2024-11-22 09:32:21.387979914 +0000
+@@ -4,11 +4,11 @@
+ 	// these are default path for run and graph root for rootful users
+ 	// for rootless path is constructed via getRootlessStorageOpts
+ 	defaultRunRoot   string = "/run/containers/storage"
+-	defaultGraphRoot string = "/var/lib/containers/storage"
+-	SystemConfigFile        = "/usr/share/containers/storage.conf"
++	defaultGraphRoot string = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage"
++	SystemConfigFile        = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/storage.conf"
+ )
+ 
+-var defaultOverrideConfigFile = "/etc/containers/storage.conf"
++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() 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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/storage/types/options_linux.go	2024-11-22 09:32:21.387979914 +0000
+@@ -12,13 +12,13 @@
+ 	// these are default path for run and graph root for rootful users
+ 	// for rootless path is constructed via getRootlessStorageOpts
+ 	defaultRunRoot   string = "/run/containers/storage"
+-	defaultGraphRoot string = "/var/lib/containers/storage"
+-	SystemConfigFile        = "/usr/share/containers/storage.conf"
++	defaultGraphRoot string = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage"
++	SystemConfigFile        = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/storage.conf"
+ )
+ 
+ // defaultConfigFile path to the system wide storage.conf file
+ var (
+-	defaultOverrideConfigFile = "/etc/containers/storage.conf"
++	defaultOverrideConfigFile = "/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_windows.go b/vendor/github.com/containers/storage/types/options_windows.go
+--- a/vendor/github.com/containers/storage/types/options_windows.go	2024-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/containers/storage/types/options_windows.go	2024-11-22 09:32:21.387979914 +0000
+@@ -4,13 +4,13 @@
+ 	// these are default path for run and graph root for rootful users
+ 	// for rootless path is constructed via getRootlessStorageOpts
+ 	defaultRunRoot   string = "/run/containers/storage"
+-	defaultGraphRoot string = "/var/lib/containers/storage"
+-	SystemConfigFile        = "/usr/share/containers/storage.conf"
++	defaultGraphRoot string = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/storage"
++	SystemConfigFile        = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/storage.conf"
+ )
+ 
+ // defaultConfigFile path to the system wide storage.conf file
+ var (
+-	defaultOverrideConfigFile = "/etc/containers/storage.conf"
++	defaultOverrideConfigFile = "/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/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-11-21 13:40:20.000000000 +0000
++++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go	2024-11-22 09:32:21.287979709 +0000
+@@ -23,7 +23,7 @@
+ 
+ const (
+ 	minSensLen       = 2
+-	contextFile      = "/usr/share/containers/selinux/contexts"
++	contextFile      = "/storage/.kodi/userdata/addon_data/service.system.podman/podman/etc/containers/selinux/contexts"
+ 	selinuxDir       = "/etc/selinux/"
+ 	selinuxUsersDir  = "contexts/users"
+ 	defaultContexts  = "contexts/default_contexts"

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

@@ -2,12 +2,12 @@
 # Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
-PKG_NAME="qtbase"
-PKG_VERSION="5.14.0"
-PKG_SHA256="4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463"
+PKG_NAME="qt5"
+PKG_VERSION="5.15.16"
+PKG_SHA256="efa99827027782974356aceff8a52bd3d2a8a93a54dd0db4cca41b5e35f1041c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://qt-project.org"
-PKG_URL="https://download.qt.io/archive/qt/${PKG_VERSION%.*}/${PKG_VERSION}/submodules/${PKG_NAME}-everywhere-src-${PKG_VERSION}.tar.xz"
+PKG_URL="https://download.qt.io/archive/qt/${PKG_VERSION%.*}/${PKG_VERSION}/single/qt-everywhere-opensource-src-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="freetype libjpeg-turbo libpng openssl sqlite zlib"
 PKG_LONGDESC="A cross-platform application and UI framework."
 PKG_BUILD_FLAGS="-sysroot"
@@ -62,10 +62,52 @@ PKG_CONFIGURE_OPTS_TARGET="-prefix /usr
                            -system-libpng
                            -system-libjpeg
                            -no-sql-mysql
-                           -system-sqlite"
+                           -system-sqlite
+                           -no-gtk
+                           -no-xcb-xlib
+                           -skip qt3d
+                           -skip qtactiveqt
+                           -skip qtandroidextras
+                           -skip qtcharts
+                           -skip qtconnectivity
+                           -skip qtdatavis3d
+                           -skip qtdeclarative
+                           -skip qtdoc
+                           -skip qtgamepad
+                           -skip qtgraphicaleffects
+                           -skip qtimageformats
+                           -skip qtlocation
+                           -skip qtlottie
+                           -skip qtmacextras
+                           -skip qtmultimedia
+                           -skip qtnetworkauth
+                           -skip qtpurchasing
+                           -skip qtquick3d
+                           -skip qtquickcontrols
+                           -skip qtquickcontrols2
+                           -skip qtquicktimeline
+                           -skip qtremoteobjects
+                           -skip qtscript
+                           -skip qtscxml
+                           -skip qtsensors
+                           -skip qtserialbus
+                           -skip qtspeech
+                           -skip qtsvg
+                           -skip qttools
+                           -skip qttranslations
+                           -skip qtvirtualkeyboard
+                           -skip qtwayland
+                           -skip qtwebchannel
+                           -skip qtwebengine
+                           -skip qtwebglplugin
+                           -skip qtwebsockets
+                           -skip qtwebview
+                           -skip qtwinextras
+                           -skip qtx11extras
+                           -skip qtxmlpatterns"
 
 configure_target() {
-  QMAKE_CONF_DIR="mkspecs/devices/linux-libreelec-g++"
+  QMAKE_CONF_DIR="qtbase/mkspecs/devices/linux-libreelec-g++"
 
   cd ..
   mkdir -p ${QMAKE_CONF_DIR}

packages/addons/addon-depends/qt5/patches/0001-use-sysroot-path-for-pkgconfig-and-libtool.patch

@@ -1,16 +1,5 @@
-From 0650bbb7d79c6db34bc54dfb73320303d83a8f56 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Tue, 14 Jan 2020 21:35:57 +0000
-Subject: [PATCH] use sysroot path for pkgconfig and libtool
-
----
- mkspecs/features/qt_module.prf | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 828a9621b9..0f3472fffc 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
+--- a/qtbase/mkspecs/features/qt_module.prf
++++ b/qtbase/mkspecs/features/qt_module.prf
 @@ -275,12 +275,12 @@ load(qt_targets)
      host_build: \
          QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
@@ -36,6 +25,3 @@ index 828a9621b9..0f3472fffc 100644
      !isEmpty(lib_replace0.match) {
          ltlib_replace0.match = $$lib_replace0.match
          ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
--- 
-2.17.1
-

packages/addons/addon-depends/qtbase/patches/qtbase-0002-fix-build-with-gcc-11.patch

@@ -1,43 +0,0 @@
-From 0afad46bb71b106780dd641de768a81d9f6c6a51 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Mon, 18 Jan 2021 07:40:54 -0800
-Subject: Fix build with GCC 11: include <limits>
-
-Fixes: QTBUG-90395
-Change-Id: Iecc74d2000eb40dfbe7bfffd165b5dd3708b7a40
-Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-(cherry picked from commit 9c56d4da2ff631a8c1c30475bd792f6c86bda53c)
-Reviewed-by: Andy Shaw <andy.shaw@qt.io>
----
- src/corelib/global/qendian.h  | 4 +++-
- src/corelib/global/qfloat16.h | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
-index 2fe29e4338..3abd6a000c 100644
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
- 
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
-index 5b369bf3c5..6c52c94466 100644
---- a/src/corelib/global/qfloat16.h
-+++ b/src/corelib/global/qfloat16.h
-@@ -43,6 +43,7 @@
- 
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
--- 
-cgit v1.2.1
-

packages/addons/addon-depends/qtbase/patches/qtbase-0003-More-build-fixes-for-GCC-11.patch

@@ -1,59 +0,0 @@
-From 8bcf1828f4d75606fb8d6913dfe09e2363a06cac Mon Sep 17 00:00:00 2001
-From: Ville Voutilainen <ville.voutilainen@qt.io>
-Date: Mon, 18 Jan 2021 09:58:17 +0200
-Subject: [PATCH 002/132] Build fixes for GCC 11
-
-Task-number: QTBUG-89977
-Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
-Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit 813a928c7c3cf98670b6043149880ed5c955efb9)
----
- src/corelib/text/qbytearraymatcher.h     | 2 ++
- src/corelib/tools/qsharedpointer_impl.h  | 3 ---
- src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
-index 0eedfc1d20..f5f9bef7b8 100644
---- a/src/corelib/text/qbytearraymatcher.h
-+++ b/src/corelib/text/qbytearraymatcher.h
-@@ -42,6 +42,8 @@
- 
- #include <QtCore/qbytearray.h>
- 
-+#include <limits>
-+
- QT_BEGIN_NAMESPACE
- 
- 
-diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
-index 790c187cb9..4aee98af53 100644
---- a/src/corelib/tools/qsharedpointer_impl.h
-+++ b/src/corelib/tools/qsharedpointer_impl.h
-@@ -155,9 +155,6 @@ namespace QtSharedPointer {
- #endif
-         inline void checkQObjectShared(...) { }
-         inline void setQObjectShared(...) { }
--
--        inline void operator delete(void *ptr) { ::operator delete(ptr); }
--        inline void operator delete(void *, void *) { }
-     };
-     // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
- 
-diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
-index 9e7e1a5572..f0866a90ac 100644
---- a/src/plugins/platforms/xcb/qxcbwindow.cpp
-+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
-@@ -698,7 +698,7 @@ void QXcbWindow::show()
-         if (isTransient(window())) {
-             const QWindow *tp = window()->transientParent();
-             if (tp && tp->handle())
--                transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
-+                transientXcbParent = tp->handle()->winId();
-             // Default to client leader if there is no transient parent, else modal dialogs can
-             // be hidden by their parents.
-             if (!transientXcbParent)
--- 
-2.35.1
-

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

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rpi_ws281x"
-PKG_VERSION="6c5ade93d1af78cd19e60ee5ecc34adfd111b186"
-PKG_SHA256="e8fb94429edc21cfd894548755a417eb5b2e121329f4b54270cfb3f727696e21"
+PKG_VERSION="7fc0bf8b31d715bbecf28e852ede5aaa388180da"
+PKG_SHA256="fb427b9fab52807f1fffe2fb71c81c7f7c30161055d58b3c184abee3d7fe1d1a"
 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"
+PKG_SITE="https://github.com/jgarff/rpi_ws281x"
+PKG_URL="https://github.com/jgarff/rpi_ws281x/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Userspace Raspberry Pi PWM library for WS281X LEDs."
 PKG_TOOLCHAIN="manual"

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.2.0"
+PKG_SHA256="25072beb84f4adae316a968241dc74ac30982d38e4459635074aa9e9d87d3de7"
 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="0b9fa21be2bcba45f6d9d748b4bcf70cfbffbc19"
 
 pre_make_target() {
   go_configure

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

@@ -6,8 +6,8 @@ PKG_NAME="alsa-plugins"
 PKG_VERSION="1.2.7.1"
 PKG_SHA256="8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511"
 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/snapcast/package.mk

@@ -2,19 +2,16 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="snapcast"
-PKG_VERSION="0.27.0"
-PKG_SHA256="c662c6eafbaa42a4797a4ed6ba4a7602332abf99f6ba6ea88ff8ae59978a86ba"
+PKG_VERSION="0.28.0"
+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"
 PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl pulseaudio boost opus"
 PKG_LONGDESC="Synchronous multi-room audio player."
-PKG_TOOLCHAIN="make"
 PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
-  cd ..
-  rm -rf .${TARGET_NAME}
   CXXFLAGS="${CXXFLAGS} -pthread \
                       -I$(get_install_dir aixlog)/usr/include \
                       -I$(get_install_dir asio)/usr/include \
@@ -23,5 +20,5 @@ pre_configure_target() {
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin
-  cp -p server/snapserver client/snapclient ${INSTALL}/usr/bin
+  cp -p ../bin/{snapclient,snapserver} ${INSTALL}/usr/bin
 }

packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-01_makefiles.patch

@@ -1,23 +0,0 @@
---- snapcast-0.14.0/client/Makefile	2018-04-27 19:43:25.000000000 +0200
-+++ snapcast-0.14.0.makefiles/client/Makefile	2018-05-21 13:14:12.388757526 +0200
-@@ -83,7 +83,6 @@
- 
- else
- 
--CXX       = g++
- CXXFLAGS += -pthread -DHAS_VORBIS -DHAS_ALSA -DHAS_PULSE -DHAS_AVAHI -DHAS_DAEMON
--LDFLAGS  += -lrt -lasound -lpulse -lvorbis -lavahi-client -lavahi-common -latomic
-+LDFLAGS  += -lrt -lasound -lpulse -lvorbis -lavahi-client -lavahi-common -logg
- OBJ      += ../common/daemon.o player/alsa_player.o player/pulse_player.o browseZeroConf/browse_avahi.o
-diff -Naur snapcast-0.14.0/server/Makefile snapcast-0.14.0.makefiles/server/Makefile
---- snapcast-0.14.0/server/Makefile	2018-04-27 19:43:25.000000000 +0200
-+++ snapcast-0.14.0.makefiles/server/Makefile	2018-05-21 13:14:56.881206277 +0200
-@@ -88,7 +88,6 @@
- 
- else
- 
--CXX       = g++
- CXXFLAGS += -DHAS_AVAHI -DHAS_DAEMON -DHAS_ALSA -pthread
--LDFLAGS  += -lrt -lasound -lavahi-client -lavahi-common -latomic
-+LDFLAGS  += -lrt -lasound -lavahi-client -lavahi-common
- OBJ      += ../common/daemon.o publishZeroConf/publish_avahi.o streamreader/alsa_stream.o

packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-02_avahi.patch

@@ -1,11 +1,11 @@
---- a/server/streamreader/airplay_stream.cpp	2021-12-22 17:40:36.000000000 +0000
-+++ b/server/streamreader/airplay_stream.cpp	2022-10-03 12:05:31.690039620 +0000
-@@ -58,7 +58,7 @@
+--- a/server/streamreader/airplay_stream.cpp	2024-04-14 10:33:22.000000000 +0000
++++ b/server/streamreader/airplay_stream.cpp	2024-04-14 14:42:42.429301110 +0000
+@@ -56,7 +56,7 @@
      string devicename = uri_.getQuery("devicename", "Snapcast");
      string password = uri_.getQuery("password", "");
  
--    params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --use-stderr --get-coverart";
-+    params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --use-stderr --get-coverart --mdns=avahi";
+-    params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --get-coverart";
++    params_wo_port_ = "\"--name=" + devicename + "\" --output=stdout --get-coverart --mdns=avahi";
      if (!password.empty())
          params_wo_port_ += " --password \"" + password + "\"";
      if (!params_.empty())

packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-03-1124-fix-gcc13.patch

@@ -1,27 +0,0 @@
-From 73c75ccb8eb20aa1514e8c86deb859e70bc63290 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 15 Apr 2023 10:20:47 +0100
-Subject: [PATCH] Fix build with GCC 13
-
-GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
-are no longer transitively included.
-
-See https://gnu.org/software/gcc/gcc-13/porting_to.html.
-
-Bug: https://bugs.gentoo.org/894742
----
- common/sample_format.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/common/sample_format.hpp b/common/sample_format.hpp
-index 900655f7..b68d00a3 100644
---- a/common/sample_format.hpp
-+++ b/common/sample_format.hpp
-@@ -19,6 +19,7 @@
- #ifndef SAMPLE_FORMAT_H
- #define SAMPLE_FORMAT_H
- 
-+#include <cstdint>
- #include <string>
- 
- 

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/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"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="efibootmgr"
-PKG_VERSION="0ca99d442e9d0a49d3ec373413d781ca392b57bc"
-PKG_SHA256="da746a00b0f263ec87e495a54fb00be84e7b8e7fc3d3f949f2545c97a1b3dff9"
+PKG_VERSION="0a85e9baaac8a34e4a0bb9c23dfcc9c4f759e061"
+PKG_SHA256="05c621b1c08f3fdade8ddd4403240eb528705cee9e65d1bce937b0dc43c4fee9"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rhboot/efibootmgr"

packages/addons/addon-depends/system-tools-depends/efibootmgr/patches/efibootmgr-0001-Revert-Implement-uri-option-for-use-with-ifname.patch

@@ -1,150 +0,0 @@
-From ef1e3502c9431a789a6b2c4a3e9290b6a4611e6f Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Fri, 2 Feb 2024 11:50:56 +0000
-Subject: [PATCH] Revert "Implement --uri option for use with --ifname"
-
-This reverts commit 5ce076c88670eeb63dea80fcaec60e79f0e57ac6.
----
- efibootmgr.spec.in       |  2 +-
- src/efi.c                | 47 +++++++++++++++++++---------------------
- src/efibootmgr.c         |  9 +-------
- src/include/efibootmgr.h |  1 -
- 4 files changed, 24 insertions(+), 35 deletions(-)
-
-diff --git a/efibootmgr.spec.in b/efibootmgr.spec.in
-index ec90e2a..f20e405 100644
---- a/efibootmgr.spec.in
-+++ b/efibootmgr.spec.in
-@@ -6,7 +6,7 @@ Group: System Environment/Base
- License: GPLv2+
- URL: https://github.com/rhboot/%{name}/
- BuildRequires: git, popt-devel
--BuildRequires: efivar-libs >= 39-1, efivar-devel >= 39-1
-+BuildRequires: efivar-libs >= 30-1, efivar-devel >= 30-1
- BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXXX)
- # EFI/UEFI don't exist on PPC
- ExclusiveArch: %{ix86} x86_64 aarch64 arm
-diff --git a/src/efi.c b/src/efi.c
-index 26a3211..4302b5c 100644
---- a/src/efi.c
-+++ b/src/efi.c
-@@ -174,40 +174,37 @@ make_linux_load_option(uint8_t **data, size_t *data_size,
- 	efidp dp = NULL;
- 
- 	if (opts.iface && opts.ip_version == EFIBOOTMGR_IPV4) {
--		needed = efi_generate_ipv4_device_path_with_uri(
--					NULL, 0, opts.iface,
--					opts.local_ip_addr,
--					opts.remote_ip_addr,
--					opts.gateway_ip_addr,
--					opts.ip_netmask,
--					opts.ip_local_port,
--					opts.ip_remote_port,
--					opts.ip_protocol,
--					opts.ip_addr_origin,
--					opts.uri);
-+		needed = efi_generate_ipv4_device_path(NULL, 0, opts.iface,
-+						       opts.local_ip_addr,
-+						       opts.remote_ip_addr,
-+						       opts.gateway_ip_addr,
-+						       opts.ip_netmask,
-+						       opts.ip_local_port,
-+						       opts.ip_remote_port,
-+						       opts.ip_protocol,
-+						       opts.ip_addr_origin);
- 		if (needed < 0) {
--			efi_error("efi_generate_ipv4_device_path_with_uri() = %zd (failed)",
-+			efi_error("efi_generate_ipv4_device_path() = %zd (failed)",
- 					needed);
- 			return -1;
- 		}
- 		if (data_size && *data_size) {
- 			dp = malloc(needed);
- 
--			needed = efi_generate_ipv4_device_path_with_uri(
--					(uint8_t *)dp, needed,
--					opts.iface,
--					opts.local_ip_addr,
--					opts.remote_ip_addr,
--					opts.gateway_ip_addr,
--					opts.ip_netmask,
--					opts.ip_local_port,
--					opts.ip_remote_port,
--					opts.ip_protocol,
--					opts.ip_addr_origin,
--					opts.uri);
-+			needed = efi_generate_ipv4_device_path(
-+							(uint8_t *)dp, needed,
-+							opts.iface,
-+							opts.local_ip_addr,
-+							opts.remote_ip_addr,
-+							opts.gateway_ip_addr,
-+							opts.ip_netmask,
-+							opts.ip_local_port,
-+							opts.ip_remote_port,
-+							opts.ip_protocol,
-+							opts.ip_addr_origin);
- 			if (needed < 0) {
- 				free(dp);
--				efi_error("efi_generate_ipv4_device_path_with_uri() = %zd (failed)",
-+				efi_error("efi_generate_ipv4_device_path() = %zd (failed)",
- 						needed);
- 				return -1;
- 			}
-diff --git a/src/efibootmgr.c b/src/efibootmgr.c
-index 6f51d33..3ba4d1b 100644
---- a/src/efibootmgr.c
-+++ b/src/efibootmgr.c
-@@ -1410,9 +1410,8 @@ usage()
- 	printf("\t-f | --reconnect      Re-connect devices after driver is loaded.\n");
- 	printf("\t-F | --no-reconnect   Do not re-connect devices after driver is loaded.\n");
- 	printf("\t-g | --gpt            Force disk with invalid PMBR to be treated as GPT.\n");
--	printf("\t-i | --iface name     Create a netboot entry for the named interface (IPv4+DHCP support only).\n");
-+	printf("\t-i | --iface name     Create a netboot entry for the named interface.\n");
- 	printf("\t-I | --index number   When creating an entry, insert it in bootorder at specified position (default: 0).\n");
--	printf("\t     --uri Uri        Specify an Uri (for use with --iface option).\n");
- 	printf("\t-l | --loader name     (Defaults to \""DEFAULT_LOADER"\").\n");
- 	printf("\t-L | --label label     Boot manager display label (defaults to \"Linux\").\n");
- 	printf("\t-m | --mirror-below-4G t|f Mirror memory below 4GB.\n");
-@@ -1483,7 +1482,6 @@ parse_opts(int argc, char **argv)
- 			{"gpt",                    no_argument, 0, 'g'},
- 			{"iface",            required_argument, 0, 'i'},
- 			{"index",            required_argument, 0, 'I'},
--			{"uri",	             required_argument, 0, 0},
- 			{"keep",                   no_argument, 0, 'k'},
- 			{"loader",           required_argument, 0, 'l'},
- 			{"label",            required_argument, 0, 'L'},
-@@ -1767,8 +1765,6 @@ parse_opts(int argc, char **argv)
- 				    opts.abbreviate_path != EFIBOOTMGR_PATH_ABBREV_FILE)
- 					errx(41, "contradicting --full-dev-path/--file-dev-path/-e options");
- 				opts.abbreviate_path = EFIBOOTMGR_PATH_ABBREV_FILE;
--			} else if (!strcmp(long_options[option_index].name, "uri")) {
--				opts.uri = optarg;
- 			} else {
- 				usage();
- 				exit(1);
-@@ -1811,9 +1807,6 @@ main(int argc, char **argv)
- 
- 	verbose = opts.verbose;
- 
--	if (opts.uri && !opts.iface)
--		errx(25, "--uri is supported only with --iface option.");
--
- 	if (opts.sysprep && opts.driver)
- 		errx(25, "--sysprep and --driver may not be used together.");
- 
-diff --git a/src/include/efibootmgr.h b/src/include/efibootmgr.h
-index 05e9216..dc2a48b 100644
---- a/src/include/efibootmgr.h
-+++ b/src/include/efibootmgr.h
-@@ -59,7 +59,6 @@ typedef struct {
- 	uint16_t ip_remote_port;
- 	uint16_t ip_protocol;
- 	uint8_t ip_addr_origin;
--	char *uri;
- 
- 	char *loader;
- 	unsigned char *label;
--- 
-2.43.0
-

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

@@ -2,12 +2,12 @@
 # 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"
 

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

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

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

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mc"
-PKG_VERSION="4.8.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,8 +2,8 @@
 # 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"
@@ -17,4 +17,5 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-mad"
 # TODO: mtpfs runs host utils while building, fix and set
 pre_configure_target() {
   export LIBS="-lusb-1.0 -ludev"
+  TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||")
 }

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"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pv"
-PKG_VERSION="1.8.5"
-PKG_SHA256="d22948d06be06a5be37336318de540a2215be10ab0163f8cd23a20149647b780"
+PKG_VERSION="1.8.14"
+PKG_SHA256="0cc18811a4809a587d4b11d47691bbc0ad83a5d95d2c2606af74ea7b4a674756"
 PKG_LICENSE="GNU"
 PKG_SITE="http://www.ivarch.com/programs/pv.shtml"
 PKG_URL="http://www.ivarch.com/programs/sources/pv-${PKG_VERSION}.tar.gz"

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

@@ -2,20 +2,17 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="screen"
-PKG_VERSION="4.9.1"
-PKG_SHA256="26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69"
+PKG_VERSION="5.0.0"
+PKG_SHA256="f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.gnu.org/software/screen/"
-PKG_URL="http://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_SITE="https://www.gnu.org/software/screen/"
+PKG_URL="https://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes"
 PKG_BUILD_FLAGS="-sysroot -parallel"
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
-                           --enable-colors256 \
                            --disable-pam \
-                           --disable-use-locale \
                            --disable-telnet \
                            --disable-socket-dir"
-

packages/addons/addon-depends/system-tools-depends/screen/patches/screen-0001.patch

@@ -0,0 +1,114 @@
+diff -Nu screen-5.0.0/display.c screen-5.0.0/display.c
+--- screen-5.0.0/display.c	2024-08-28 19:55:03.000000000 +0000
++++ screen-5.0.0/display.c	2024-08-29 18:08:34.942979909 +0000
+@@ -47,7 +47,7 @@
+ #include "mark.h"
+ #include "misc.h"
+ #include "process.h"
+-#include "pty.h"
++#include "screen-pty.h"
+ #include "resize.h"
+ #include "termcap.h"
+ #include "tty.h"
+diff -Nu screen-5.0.0/Makefile.in screen-5.0.0/Makefile.in
+--- screen-5.0.0/Makefile.in	2024-08-28 19:55:03.000000000 +0000
++++ screen-5.0.0/Makefile.in	2024-08-29 18:10:05.120409357 +0000
+@@ -66,7 +66,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+ 
+ .c.o:
+-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
++	$(CC) -c -I$(srcdir) $(CPPFLAGS) $(CFLAGS) $< -o $@
+ 
+ check: $(TESTBIN)
+ 	for f in $(TESTBIN); do \
+@@ -197,12 +197,12 @@
+  logfile.h mark.h input.h
+ tty.o: tty.c config.h screen.h os.h ansi.h sched.h acls.h comm.h layer.h \
+  term.h image.h canvas.h display.h layout.h viewport.h window.h logfile.h \
+- fileio.h misc.h pty.h telnet.h tty.h
++ fileio.h misc.h screen-pty.h telnet.h tty.h
+ term.o: term.c term.h
+ window.o: window.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \
+  layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \
+  logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h fileio.h help.h \
+- input.h mark.h misc.h process.h pty.h resize.h telnet.h termcap.h tty.h \
++ input.h mark.h misc.h process.h screen-pty.h resize.h telnet.h termcap.h tty.h \
+  utmp.h
+ utmp.o: utmp.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \
+  layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \
+@@ -229,7 +229,7 @@
+ display.o: display.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \
+  layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \
+  logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h mark.h \
+- misc.h process.h pty.h resize.h termcap.h tty.h
++ misc.h process.h screen-pty.h resize.h termcap.h tty.h
+ comm.o: comm.c config.h os.h screen.h ansi.h sched.h acls.h comm.h \
+  layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \
+  logfile.h
+diff -Nu screen-5.0.0/pty.c screen-5.0.0/pty.c
+--- screen-5.0.0/pty.c	2024-08-28 19:55:03.000000000 +0000
++++ screen-5.0.0/pty.c	2024-08-29 18:09:06.889919017 +0000
+@@ -28,7 +28,7 @@
+ 
+ #include "config.h"
+ 
+-#include "pty.h"
++#include "screen-pty.h"
+ 
+ #include <sys/ioctl.h>
+ 
+diff -Nu screen-5.0.0/pty.h screen-5.0.0/pty.h
+--- screen-5.0.0/pty.h	2024-08-28 19:55:03.000000000 +0000
++++ screen-5.0.0/pty.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,11 +0,0 @@
+-#ifndef SCREEN_PTY_H
+-#define SCREEN_PTY_H
+-
+-int   OpenPTY (char **);
+-int  ClosePTY (int);
+-
+-/* global variables */
+-
+-extern int pty_preopen;
+-
+-#endif /* SCREEN_PTY_H */
+diff -Nu screen-5.0.0/screen-pty.h screen-5.0.0/screen-pty.h
+--- screen-5.0.0/screen-pty.h	1970-01-01 00:00:00.000000000 +0000
++++ screen-5.0.0/screen-pty.h	2024-08-28 19:55:03.000000000 +0000
+@@ -0,0 +1,11 @@
++#ifndef SCREEN_PTY_H
++#define SCREEN_PTY_H
++
++int   OpenPTY (char **);
++int  ClosePTY (int);
++
++/* global variables */
++
++extern int pty_preopen;
++
++#endif /* SCREEN_PTY_H */
+diff -Nu screen-5.0.0/tty.c screen-5.0.0/tty.c
+--- screen-5.0.0/tty.c	2024-08-28 19:55:03.000000000 +0000
++++ screen-5.0.0/tty.c	2024-08-29 18:09:19.073355563 +0000
+@@ -44,7 +44,7 @@
+ #include "screen.h"
+ #include "fileio.h"
+ #include "misc.h"
+-#include "pty.h"
++#include "screen-pty.h"
+ #include "telnet.h"
+ #include "tty.h"
+ 
+diff -Nu screen-5.0.0/window.c screen-5.0.0/window.c
+--- screen-5.0.0/window.c	2024-08-28 19:55:03.000000000 +0000
++++ screen-5.0.0/window.c	2024-08-29 18:14:12.542433618 +0000
+@@ -48,7 +48,7 @@
+ #include "mark.h"
+ #include "misc.h"
+ #include "process.h"
+-#include "pty.h"
++#include "screen-pty.h"
+ #include "resize.h"
+ #include "telnet.h"
+ #include "termcap.h"

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

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

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="stress-ng"
-PKG_VERSION="0.17.06"
-PKG_SHA256="f81dc1ea7f2a821dab11e46cf3a3a893ad45299e51e6976041306871ddbc7f5d"
+PKG_VERSION="0.18.04"
+PKG_SHA256="c76cf067e582fb8a066d47207bbccc6d0d4175ba700b5d122909132d79e7f6ea"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/ColinIanKing/stress-ng"
 PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz"

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

@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2024-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="tree"
+PKG_VERSION="2.1.1"
+PKG_SHA256="1b70253994dca48a59d6ed99390132f4d55c486bf0658468f8520e7e63666a06"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/Old-Man-Programmer/tree"
+PKG_URL="https://github.com/Old-Man-Programmer/tree/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Tree is utility for displaying a dictionary tree's contents including files, directories, and links."
+PKG_TOOLCHAIN="manual"
+
+make_target() {
+  make tree CXX=${CXX} CC=${CC}
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/bin
+    cp -p tree ${INSTALL}/usr/bin/
+}

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

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

packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="miniupnpc"
-PKG_VERSION="2.2.6"
-PKG_SHA256="37fcd91953508c3e62d6964bb8ffbc5d47f3e13481fa54e6214fcc68704c66f1"
+PKG_VERSION="2.2.7"
+PKG_SHA256="b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1"
 PKG_LICENSE="BSD"
 PKG_SITE="http://miniupnp.free.fr"
 PKG_URL="http://miniupnp.free.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/patches/vdr-plugin-eepg-PR2-fix-build-with-vdr-2-7-1.patch

@@ -0,0 +1,148 @@
+From c958894e6a4fffff58b0dc276fc978616560192d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Fri, 13 Sep 2024 13:22:54 +0000
+Subject: [PATCH] fix build with vdr 2.7.1
+
+---
+ eepg.c         | 12 ++++++++++++
+ eit2.c         |  8 ++++++++
+ epghandler.c   | 13 +++++++++++++
+ equivhandler.c |  9 +++++++++
+ util.c         |  9 +++++++++
+ 5 files changed, 51 insertions(+)
+
+diff --git a/eepg.c b/eepg.c
+index a78819d..d39581d 100644
+--- a/eepg.c
++++ b/eepg.c
+@@ -1324,12 +1324,20 @@ void cFilterEEPG::WriteToSchedule(tChannelID channelID, cSchedules* pSchedules,
+   cEvent *Event = NULL;
+   if (ps/*[eq]*/) {
+ 
++#if APIVERSNUM >= 20502
++      Event = (cEvent *) ps->GetEventById (EventId); //since Nagra uses consistent EventIds, try this first
++#else
+       Event = (cEvent *) ps->GetEvent (EventId); //since Nagra uses consistent EventIds, try this first
++#endif
+       bool TableIdMatches = false;
+       if (Event)
+         TableIdMatches = (Event->TableID() == TableId);
+       if (!Event || !TableIdMatches || abs(Event->StartTime() - (time_t) StartTime) > Duration * 60) //if EventId does not match, or it matched with wrong TableId, then try with StartTime
++#if APIVERSNUM >= 20502
++        Event = (cEvent *) ps->GetEventByTime (StartTime);
++#else
+         Event = (cEvent *) ps->GetEvent (EventId, StartTime);
++#endif
+   }
+   cEvent *newEvent = NULL;
+   if (!Event) {  //event is new
+@@ -3477,7 +3485,11 @@ void cFilterEEPG::ProcessPremiere(const u_char *& Data)
+               }
+ 
+               bool newEvent = false;
++#if APIVERSNUM >= 20502
++              cEvent *pEvent = (cEvent *) pSchedule->GetEventById (EventId);
++#else
+               cEvent *pEvent = (cEvent *) pSchedule->GetEvent (EventId, -1);
++#endif
+               if (!pEvent) {
+                 LogI(2, "(new)\n");
+                 pEvent = new cEvent (EventId);
+diff --git a/eit2.c b/eit2.c
+index 9ee190d..31aa816 100644
+--- a/eit2.c
++++ b/eit2.c
+@@ -32,7 +32,11 @@ cEvent* cEIT2::ProcessEitEvent(cSchedule* pSchedule,const SI::EIT::Event* EitEve
+   //    int versionNumber = getVersionNumber();
+ 
+   cEvent *newEvent = NULL;
++#if APIVERSNUM >= 20502
++  cEvent *pEvent = (cEvent *) pSchedule->GetEventByTime (EitEvent->getStartTime ());
++#else
+   cEvent *pEvent = (cEvent *) pSchedule->GetEvent (EitEvent->getEventId (), EitEvent->getStartTime ());
++#endif
+   if (!pEvent) {
+     if (OnlyRunningStatus)
+       return NULL;
+@@ -243,7 +247,11 @@ void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source, u_char Tid,
+           tChannelID(Source, channel->Nid(), channel->Tid(), tsed->getReferenceServiceId()));
+         if (!rSchedule)
+           break;
++#if APIVERSNUM >= 20502
++        rEvent = rSchedule->GetEventById(tsed->getReferenceEventId());
++#else
+         rEvent = rSchedule->GetEvent(tsed->getReferenceEventId());
++#endif
+         if (!rEvent)
+           break;
+         pEvent->SetTitle(rEvent->Title());
+diff --git a/epghandler.c b/epghandler.c
+index 1e2db9f..a81bc86 100644
+--- a/epghandler.c
++++ b/epghandler.c
+@@ -66,10 +66,23 @@ bool cEEpgHandler::HandleEitEvent(cSchedule* Schedule,
+   modified = false;
+   //VDR creates new event if the EitEvent StartTime is different than EEPG time so
+   //the EPG event has to be deleted but the data should be kept
++#if APIVERSNUM >= 20502
++  const cEvent *ev;
++  if (EitEvent->getStartTime() > 0){
++    ev = schedule->GetEventByTime(EitEvent->getStartTime());
++  } else {
++    ev = schedule->GetEventById(EitEvent->getEventId());
++  }
++#else
+   const cEvent* ev = schedule->GetEvent(EitEvent->getEventId(),EitEvent->getStartTime());
++#endif
+   searchDuplicates = !ev; //if the event exist with a same start time, it is handled by SetShortText/SetDescription
+   if (!ev){
++#if APIVERSNUM >= 20502
++      ev = schedule->GetEventById(EitEvent->getEventId());
++#else
+       ev = schedule->GetEvent(EitEvent->getEventId());
++#endif
+       // remove shifted duplicates with same ID
+       if (ev && ((ev->StartTime()>EitEvent->getStartTime() && ev->StartTime() < EitEvent->getStartTime()+EitEvent->getDuration())
+           || (EitEvent->getStartTime() > ev->StartTime() && EitEvent->getStartTime() < ev->EndTime()))) {
+diff --git a/equivhandler.c b/equivhandler.c
+index 75007ec..cd23d38 100644
+--- a/equivhandler.c
++++ b/equivhandler.c
+@@ -143,7 +143,16 @@ void cEquivHandler::updateEquivalent(cSchedules * Schedules, tChannelID channelI
+     if (equChannel) {
+       LogD(2, prep("found Equivalent channel %s"), *equChannelID.ToString());
+       cSchedule *pSchedule = (cSchedule *) Schedules->GetSchedule (equChannel, true);
++#if APIVERSNUM >= 20502
++      cEvent *pEqvEvent;
++      if (pEvent->StartTime() > 0){
++        pEqvEvent = (cEvent *) pSchedule->GetEventByTime (pEvent->StartTime());
++      } else {
++        pEqvEvent = (cEvent *) pSchedule->GetEventById (pEvent->EventID());
++      }
++#else
+       cEvent *pEqvEvent = (cEvent *) pSchedule->GetEvent (pEvent->EventID(), pEvent->StartTime());
++#endif
+       if (pEqvEvent) {
+         LogD(3, prep("equivalent event exists"));
+         if (pEqvEvent == pEvent) {
+diff --git a/util.c b/util.c
+index 1109181..029fcc6 100644
+--- a/util.c
++++ b/util.c
+@@ -214,7 +214,16 @@ void cAddEventThread::Action(void)
+       while (((*it).second->First()) != NULL) {
+         cEvent* event = (*it).second->First();
+ 
++#if APIVERSNUM >= 20502
++        cEvent *pEqvEvent;
++        if (event->StartTime() > 0){
++          pEqvEvent = (cEvent *) schedule->GetEventByTime (event->StartTime());
++        } else {
++          pEqvEvent = (cEvent *) schedule->GetEventById (event->EventID());
++        }
++#else
+         cEvent *pEqvEvent = (cEvent *) schedule->GetEvent (event->EventID(), event->StartTime());
++#endif
+         if (pEqvEvent){
+           (*it).second->Del(event);
+         } else {

packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-epgsearch"
-PKG_VERSION="2.4.2"
-PKG_SHA256="7c0a03c22fedbc73a34220da0edf3293a903185c412d5b20fb48d72f2e4fd118"
+PKG_VERSION="2.4.3"
+PKG_SHA256="3824a72be529391ce26d00f0323b9d71572855c1c660bae9d30064f42366aadf"
 PKG_LICENSE="GPL"
 PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
 PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-live"
-PKG_VERSION="3.3.4"
-PKG_SHA256="9ffa4716c028cc4c1883ceedcdd2b0c4dff5cb84993287ced23b639b3f8779e4"
+PKG_VERSION="3.3.6"
+PKG_SHA256="2dc11ab4d68ce7100d8dca8eef65bc81280e30493bd7670ec661714b2bf18211"
 PKG_LICENSE="GPL"
 PKG_SITE="http://live.vdr-developer.org/en/index.php"
 PKG_URL="https://github.com/MarkusEh/vdr-plugin-live/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="vdr-plugin-restfulapi"
-PKG_VERSION="0.2.6.6"
-PKG_SHA256="a392c8ac9da58bce06674208711a786209ce802e77f93b48d21e424fa79f5eba"
+PKG_VERSION="be8a3a60af7e8926cb28c06e6b6d2adc2c2ed968"
+PKG_SHA256="18cb9b6735f5ac2060ecedd6043a09bc742bd5132f33ef8a0155ddfe266b9dc2"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/yavdr/vdr-plugin-restfulapi"
-PKG_URL="https://github.com/yavdr/${PKG_NAME}/archive/refs/tags/${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/yavdr/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain vdr cxxtools vdr-plugin-wirbelscan"
 PKG_NEED_UNPACK="$(get_pkg_directory vdr) $(get_pkg_directory vdr-plugin-wirbelscan)"
 PKG_LONGDESC="Allows to access many internals of the VDR via a restful API."