From 48de289b90fdd82166dda66e0fa616b7acce8dac Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Fri, 15 Nov 2024 09:29:01 +1100
Subject: [PATCH] Revert "11.5 EOL"

This reverts commit e4156145dd549a1d100734a13d3db8960fe7905b.
---
 update.sh     |  2 ++
 versions.json | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/update.sh b/update.sh
index 331bda8a..9706f78b 100755
--- a/update.sh
+++ b/update.sh
@@ -55,6 +55,8 @@ 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 5facecf5..c25e5331 100644
--- a/versions.json
+++ b/versions.json
@@ -110,5 +110,61 @@
       "ppc64le",
       "s390x"
     ]
+  },
+  "11.5": {
+    "milestone": "11.5",
+    "version": "11.5.2",
+    "fullVersion": "1:11.5.2+maria~ubu2404",
+    "releaseStatus": "Stable",
+    "supportType": "Short Term Support",
+    "base": "ubuntu:noble",
+    "arches": [
+      "amd64",
+      "arm64v8",
+      "ppc64le",
+      "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",
+    "base": "ubuntu:noble",
+    "arches": [
+      "amd64",
+      "arm64v8",
+      "ppc64le",
+      "s390x"
+    ]
+  },
+  "11.6-ubi": {
+    "milestone": "11.6",
+    "version": "11.6.1",
+    "fullVersion": "11.6.1",
+    "releaseStatus": "RC",
+    "supportType": "Short Term Support",
+    "base": "ubi9",
+    "arches": [
+      "amd64",
+      "arm64v8",
+      "ppc64le",
+      "s390x"
+    ]
   }
 }