From 07ce93bdf81e04679d1ae208ce1ac7f44b44e99c Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Tue, 4 Jun 2024 17:47:25 +0200
Subject: [PATCH] Bump MariaDB to 11.4

---
 config/wo.conf               |  2 +-
 install                      | 11 +++++++++++
 wo/cli/plugins/stack_pref.py |  9 +++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/config/wo.conf b/config/wo.conf
index c422139..dfd7df5 100644
--- a/config/wo.conf
+++ b/config/wo.conf
@@ -84,7 +84,7 @@ version = 8.2
 [mariadb]
 
 ### Default MariaDB release
-release = 10.11
+release = 11.4
 
 [update]
 
diff --git a/install b/install
index b1ad1e4..85a4e04 100755
--- a/install
+++ b/install
@@ -231,6 +231,16 @@ wo_install_dep() {
     fi
 }
 
+wo_download_gpg_keys() {
+    # redis gpg key
+    curl -fsSL https://packages.redis.io/gpg | gpg --dearmor | tee /usr/share/keyrings/redis-archive-keyring.gpg >/dev/null 2>&1
+
+    # mariadb
+    mkdir -p /etc/apt/keyrings
+    curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp'
+
+}
+
 wo_timesync() {
     # set default ntp pools
     if [ "$wo_distro_codename" != "bookworm" ] && [ "$wo_distro_codename" != "noble" ]; then
@@ -851,6 +861,7 @@ else
 
     fi
     _run wo_install_dep "Installing wo dependencies"
+    _run wo_download_gpg_keys
     _run wo_timesync
     # skip steps if travis
     if [ -z "$wo_travis" ]; then
diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py
index 1164aca..f2a2491 100644
--- a/wo/cli/plugins/stack_pref.py
+++ b/wo/cli/plugins/stack_pref.py
@@ -29,7 +29,7 @@ def pre_pref(self, apt_packages):
 
     if ("mariadb-server" in apt_packages or "mariadb-client" in apt_packages):
         # add mariadb repository excepted on raspbian and ubuntu 19.04
-        if not (WOVar.wo_distro == 'raspbian') and not (WOVar.wo_platform_codename == 'noble'):
+        if not (WOVar.wo_distro == 'raspbian'):
             Log.info(self, "Adding repository for MySQL, please wait...")
             mysql_pref = (
                 "Package: *\nPin: origin mariadb.mirrors.ovh.net"
@@ -40,12 +40,9 @@ def pre_pref(self, apt_packages):
             if self.app.config.has_section('mariadb'):
                 mariadb_ver = self.app.config.get(
                     'mariadb', 'release')
-                wo_mysql_repo_conf = ("deb [arch=amd64,arm64,ppc64el] "
+                wo_mysql_repo_conf = ("deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] "
                                       "http://mariadb.mirrors.ovh.net/MariaDB/repo/"
-                                      "{version}/{distro} {codename} main"
-                                      .format(version=mariadb_ver,
-                                              distro=WOVar.wo_distro,
-                                              codename=WOVar.wo_platform_codename))
+                                      f"{mariadb_ver}/{WOVar.wo_distro} {WOVar.wo_platform_codename} main")
             else:
                 wo_mysql_repo_conf = WOVar.wo_mysql_repo
             # APT repositories