From d4d97eee8bedb5449501cdb0e442be3720ba3572 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 1 Jun 2024 00:39:03 +0000
Subject: [PATCH 1/6] mariadb: update to 11.4.2 and addon (2)

The MariaDB Foundation is pleased to announce the availability
of MariaDB 11.4.2, the first stable release in the MariaDB
11.4 long-term maintenance series, maintained for five years.

release notes and changelog:
- https://mariadb.com/kb/en/mdb-11-4-2-rn/
- https://mariadb.com/kb/en/mdb-11-4-2-cl/
---
 packages/addons/service/mariadb/changelog.txt | 4 +++-
 packages/addons/service/mariadb/package.mk    | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/addons/service/mariadb/changelog.txt b/packages/addons/service/mariadb/changelog.txt
index 927b2407d4..5618cef650 100644
--- a/packages/addons/service/mariadb/changelog.txt
+++ b/packages/addons/service/mariadb/changelog.txt
@@ -1 +1,3 @@
-initial release
+2
+
+- mariadb: update to 11.4.2
diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk
index 9b7615f2b5..f72e9cfcd6 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.8"
-PKG_REV="1"
-PKG_SHA256="5f04f3e33d9f1cbeff05e79c54d41d302630500c995aee72b0638e2f9dfcdf0f"
+PKG_VERSION="11.4.2"
+PKG_REV="2"
+PKG_SHA256="8c600e38adb899316c1cb11c68b87979668f4fb9d858000e347e6d8b7abe51b0"
 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"

From af464d28191185308a3aba457acd091728c3a104 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 5 Jun 2024 08:11:26 +0000
Subject: [PATCH 2/6] go: update to 1.22.4

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

diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk
index aa68494379..56cef0e59f 100644
--- a/packages/addons/addon-depends/go/package.mk
+++ b/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.3"
-PKG_SHA256="a6ec566a848966c33154bb7d7f13be593a13365de48f4cb599a3cfdc9779ecd7"
+PKG_VERSION="1.22.4"
+PKG_SHA256="8e035e7418ae53a20a4c9eedc906e5c43e8c31f5bfc044d2f9f70dc409cd88b1"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"

From 60773faafb43ffd77872070adeb5a5c79ed553c7 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 6 Jun 2024 03:10:27 +0000
Subject: [PATCH 3/6] moby: update to 26.1.4

---
 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 fec9a66c86..92d8c3d0f2 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="26.1.3"
-PKG_SHA256="2f51e2dd1c122e364510c95f66e94b7fff9d5199545484e92c2e52b0efcdc2e6"
+PKG_VERSION="26.1.4"
+PKG_SHA256="74d3f38f2b88399012e0b889e6408d81e2d198437deda71da6d1da72dcc8afcc"
 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="8e96db1c328d0467b015768e42a62c0f834970bb"
+export PKG_GIT_COMMIT="de5c9cf0b96e4e172b96db54abababa4a328462f"
 
 PKG_MOBY_BUILDTAGS="daemon \
                     autogen \

From 64501d4a00c4c1b0e06e7cba86e0a87e691f2734 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 6 Jun 2024 03:10:30 +0000
Subject: [PATCH 4/6] cli: update to 26.1.4

---
 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 bf86ebce7b..af52d9f3ce 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="d361896cd02deb3bd160c627401eba2cd8e2513a085c55427319bea8c6412ad4"
+PKG_SHA256="73f914421db873d1a19d4d15e8ae21bebc35079f3034f574dfc6cd0449edcf89"
 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="b72abbb6f0351eb22e5c7bdbba9112fef6b41429"
+export PKG_GIT_COMMIT="5650f9b10226d75e8e9a490a31cc3e5b846e0034"
 
 configure_target() {
   go_configure

From 0886a8a5469949df6b1193834b45903aad3630e4 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 6 Jun 2024 03:09:34 +0000
Subject: [PATCH 5/6] containerd: update to 1.7.18

---
 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 e741dd289d..b08b1bc2d6 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.17"
-PKG_SHA256="fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7"
+PKG_VERSION="1.7.18"
+PKG_SHA256="91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4"
 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="3a4de459a68952ffb703bbe7f2290861a75b6b67"
+export PKG_GIT_COMMIT="ae71819c4f5e67bb4d5ae76a6b735f29cc25774e"
 
 pre_make_target() {
 

From a5a9372bdb8babfe926ec9219056f4a88b8a58ed Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 6 Jun 2024 10:40:30 +0000
Subject: [PATCH 6/6] docker: update to 26.1.4 and addon (2)

- containerd: update to 1.7.18
- cli: update to 26.1.4
- go: update to 1.22.4
- moby: update to 26.1.4
---
 packages/addons/service/docker/changelog.txt | 7 ++++++-
 packages/addons/service/docker/package.mk    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt
index 927b2407d4..4b817afcb4 100644
--- a/packages/addons/service/docker/changelog.txt
+++ b/packages/addons/service/docker/changelog.txt
@@ -1 +1,6 @@
-initial release
+2
+
+- containerd: update to 1.7.18
+- cli: update to 26.1.4
+- go: update to 1.22.4
+- moby: update to 26.1.4
diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index 8f5d54eb32..92dc961a70 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="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"