From 137d846cbb4095c58a69486434d0942b421a9cdf Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 19 Sep 2022 21:48:09 +0200
Subject: [PATCH 1/5] mariadb_109: 10.9.2 -> 10.9.3

https://mariadb.com/kb/en/mariadb-1093-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index f118c9ab80af..4e14db2e30f3 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -267,7 +267,7 @@ in {
   };
   mariadb_109 = mariadbPackage {
     # Supported until 2023-08(?)
-    version = "10.9.2";
-    hash = "sha256-X0X/deBDlmVVqV+9uPCS5gzipsR7pZ0UTbRuE46SL0g=";
+    version = "10.9.3";
+    hash = "sha256-mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4=";
   };
 }

From d563e5c1e0a8cb6ecf40243f17e0bca433911c43 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 19 Sep 2022 21:51:17 +0200
Subject: [PATCH 2/5] mariadb_108: 10.8.4 -> 10.8.5

https://mariadb.com/kb/en/mariadb-1085-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 4e14db2e30f3..7483fbf82abb 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -262,8 +262,8 @@ in {
   };
   mariadb_108 = mariadbPackage {
     # Supported until 2023-05
-    version = "10.8.4";
-    hash = "sha256-ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY=";
+    version = "10.8.5";
+    hash = "sha256-z37TjDYTTNgYP93WTLPlD1ROgmS6dCAlXbEpcJfgjos=";
   };
   mariadb_109 = mariadbPackage {
     # Supported until 2023-08(?)

From 0f1042dec114f587a44f4eb59cc04794e1143215 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 19 Sep 2022 21:53:30 +0200
Subject: [PATCH 3/5] mariadb_107: 10.7.5 -> 10.7.6

https://mariadb.com/kb/en/mariadb-1076-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 7483fbf82abb..b726ea06c907 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -257,8 +257,8 @@ in {
   };
   mariadb_107 = mariadbPackage {
     # Supported until 2023-02. TODO: remove ahead of 22.11 release.
-    version = "10.7.5";
-    hash = "sha256-f/OkzNoe7S8aZBO4DE7WjMqRFzD1Aaaf1/STo0oJVLo=";
+    version = "10.7.6";
+    hash = "sha256-erX7pDmQV33BdPG5a9NAszN8G9Rv48NmIgsJ0siNLqA=";
   };
   mariadb_108 = mariadbPackage {
     # Supported until 2023-05

From 1b8755548c5c77ef4cd8246eb0fffaee7f61aa9c Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 19 Sep 2022 21:54:56 +0200
Subject: [PATCH 4/5] mariadb_106: 10.6.9 -> 10.6.10

https://mariadb.com/kb/en/mariadb-10610-release-notes/
---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index b726ea06c907..d9207fbe045f 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -252,8 +252,8 @@ in {
   };
   mariadb_106 = mariadbPackage {
     # Supported until 2026-07
-    version = "10.6.9";
-    hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw=";
+    version = "10.6.10";
+    hash = "sha256-atn6hvDIXI7q+tJkNUnV/13ShyAClk51R1LekYY6o7c=";
   };
   mariadb_107 = mariadbPackage {
     # Supported until 2023-02. TODO: remove ahead of 22.11 release.

From 89ce25efe9f942e2d77d477a6a7f0c8377342bdc Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 19 Sep 2022 21:59:46 +0200
Subject: [PATCH 5/5] mariadb: also use openssl_3 for 10.7 and 10.6

follow-up to 84f17a3082491d6a01baa840e3a94c5fb6128941
---
 pkgs/servers/sql/mariadb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index d9207fbe045f..f8a87ae81424 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -46,7 +46,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]
     ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]
     ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ])
-    ++ (if (lib.versionOlder version "10.8")
+    ++ (if (lib.versionOlder version "10.6")
       then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ]
       else [ openssl curl ]);