From e4156145dd549a1d100734a13d3db8960fe7905b Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 19 Sep 2024 16:44:23 +1000
Subject: [PATCH] 11.5 EOL

---
 update.sh     |  2 --
 versions.json | 28 +++++++---------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/update.sh b/update.sh
index 2ca14775..cc732cb5 100755
--- a/update.sh
+++ b/update.sh
@@ -55,8 +55,6 @@ update_version()
 			sed -e '/collation-server/d' docker.cnf > "$dir/docker.cnf"
 			if [[ $version != 11.4 ]]; then
 				sed -i -e '/character-set-collations/d' "$dir/docker.cnf"
-			fi
-			if [[ $version != 11.[45] ]]; then
 				sed -i -e '/character-set/d' "$dir/docker.cnf"
 			fi
 		fi
diff --git a/versions.json b/versions.json
index 30d35408..1413724a 100644
--- a/versions.json
+++ b/versions.json
@@ -111,12 +111,12 @@
       "s390x"
     ]
   },
-  "11.5": {
-    "milestone": "11.5",
-    "version": "11.5.2",
-    "fullVersion": "1:11.5.2+maria~ubu2404",
+  "11.4-ubi/": {
+    "milestone": "11.4-ubi/",
+    "version": "11.4.3",
+    "fullVersion": "1:11.4.3+maria~ubu2404",
     "releaseStatus": "Stable",
-    "supportType": "Short Term Support",
+    "supportType": "Long Term Support",
     "base": "ubuntu:noble",
     "arches": [
       "amd64",
@@ -125,26 +125,12 @@
       "s390x"
     ]
   },
-  "11.5-ubi": {
-    "milestone": "11.5",
-    "version": "11.5.2",
-    "fullVersion": "11.5.2",
-    "releaseStatus": "Stable",
-    "supportType": "Short Term Support",
-    "base": "ubi9",
-    "arches": [
-      "amd64",
-      "arm64v8",
-      "ppc64le",
-      "s390x"
-    ]
-  },
   "11.6": {
     "milestone": "11.6",
     "version": "11.6.1",
     "fullVersion": "1:11.6.1+maria~ubu2404",
-    "releaseStatus": "RC",
-    "supportType": "Short Term Support",
+    "releaseStatus": "Unknown",
+    "supportType": "Unknown",
     "base": "ubuntu:noble",
     "arches": [
       "amd64",