From 1ab0797d3cbf50bccb1f12054dc1e811d399578b Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 12 Mar 2024 11:16:01 +0000
Subject: [PATCH 1/5] containerd: update to 1.7.14

---
 packages/addons/addon-depends/docker/containerd/package.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk
index 17745e21ad..e4ab3e2e49 100644
--- a/packages/addons/addon-depends/docker/containerd/package.mk
+++ b/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.14"
+PKG_SHA256="ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1"
 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="dcf2847247e18caba8dce86522029642f60fe96b"
 
 pre_make_target() {
 

From a36e31f594e8be979339979fcab343776ed2d657 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 7 Feb 2024 12:41:15 +0000
Subject: [PATCH 2/5] mariadb: update to 10.11.7 and addon (1)

ref:
- https://mariadb.com/kb/en/changes-improvements-in-mariadb-1011/
- https://mariadb.com/kb/en/mariadb-10-11-7-release-notes/
---
 packages/addons/service/mariadb/package.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk
index 222d4c207b..3e10e31ee4 100644
--- a/packages/addons/service/mariadb/package.mk
+++ b/packages/addons/service/mariadb/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mariadb"
-PKG_VERSION="10.11.6"
-PKG_REV="0"
-PKG_SHA256="1c0163463e98d71f4780741611a40981eee2bc44d392601ca49bbf948d04dd67"
+PKG_VERSION="10.11.7"
+PKG_REV="1"
+PKG_SHA256="5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://mariadb.org"
 PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
@@ -70,6 +70,8 @@ configure_package() {
     -DMASK_LONGDOUBLE_EXITCODE__TRYRUN_OUTPUT='' \
     -DSTAT_EMPTY_STRING_BUG_EXITCODE=0 \
     -DSTAT_EMPTY_STRING_BUG_EXITCODE__TRYRUN_OUTPUT='' \
+    -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \
+    -DHAVE_SYSTEM_LIBFMT_EXITCODE__TRYRUN_OUTPUT='' \
     -DWITH_LIBFMT=system"
 }
 

From 5fd107839ea56c28fd721aa0ab0aa27a2d10278e Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 21 Mar 2024 10:51:59 +0000
Subject: [PATCH 3/5] moby: update to 26.0.0

---
 packages/addons/addon-depends/docker/moby/package.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk
index d504970867..16edcdae38 100644
--- a/packages/addons/addon-depends/docker/moby/package.mk
+++ b/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="26.0.0"
+PKG_SHA256="fae1aabb63ed5cf6d302a5f4266ed092716b1cea9a974a9d61154ef31b03c302"
 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="8b79278316b532d396048bc8c2fa015a85d53a53"
 
 PKG_MOBY_BUILDTAGS="daemon \
                     autogen \

From d63c878bf7a5f67cc7bea5715df33a3281a06a08 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 21 Mar 2024 10:52:02 +0000
Subject: [PATCH 4/5] cli: update to 26.0.0

---
 packages/addons/addon-depends/docker/cli/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk
index f7bae27302..37c566d2a1 100644
--- a/packages/addons/addon-depends/docker/cli/package.mk
+++ b/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="96ed5d7c33a12f505d13fa03fa48f94cb41cf871178df0df84aa0b76839ad321"
 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="2ae903e86cab51f694c819721cdfdf5eec693720"
 
 configure_target() {
   go_configure

From e2b86a5ec3542aa536ebf0566cc95592516c0122 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 21 Mar 2024 11:29:42 +0000
Subject: [PATCH 5/5] docker: update to 26.0.0 and addon (1)

release notes:
- https://docs.docker.com/engine/release-notes/26.0/

package ipdates:
- cli: update to 26.0.0
- containerd: update to 1.7.14
- moby: update to 26.0.0
---
 packages/addons/service/docker/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index 3bc1fd70e4..8f5d54eb32 100644
--- a/packages/addons/service/docker/package.mk
+++ b/packages/addons/service/docker/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="docker"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"