From 1ac20c08a173ae23b1e3c91c38142bc01d272cfa Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Mon, 18 Dec 2023 06:26:39 +0100
Subject: [PATCH] Rebase to 10.9.8

---
 mariadb.spec | 8 +++++++-
 sources      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index 3adae32..62c1a2d 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -154,7 +154,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.8.8
+Version:          10.9.8
 Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
@@ -870,6 +870,7 @@ fi
          -DCONNECT_WITH_MONGO=OFF \
          -DCONNECT_WITH_JDBC=OFF \
          -DPLUGIN_PROVIDER_LZMA=NO \
+         -DPLUGIN_HASHICORP_KEY_MANAGEMENT=NO \
 %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
 
 # The -DSECURITY_HARDENED is used to force a set of compilation flags for hardening
@@ -1429,6 +1430,8 @@ fi
 %config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lz4.cnf
 #%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lzma.cnf
 
+#%config(noreplace) %{_sysconfdir}/my.cnf.d/hashicorp_key_management.cnf
+
 %{_sbindir}/mysqld
 %{_sbindir}/mariadbd
 %{_libexecdir}/{mysqld,mariadbd}
@@ -1661,6 +1664,9 @@ fi
 %endif
 
 %changelog
+* Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.9.8-1
+- Rebase to 10.9.8
+
 * Mon Dec 18 2023 Michal Schorm <mschorm@redhat.com> - 3:10.8.8-1
 - Rebase to 10.8.8
 
diff --git a/sources b/sources
index 24eb620..c4d8566 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.8.8.tar.gz) = 833e0bdbda4c96afeb4c7caab6bd90b2c695be77dd81f3d02f639f4f7cc1873c64ce9f762e5280de3fa5a23f18d3f6a0acdbfc02a7d1724fb57d9215894fd3b5
+SHA512 (mariadb-10.9.8.tar.gz) = a7e7beb9e1a9da6dad9b7d2adea09f922d7130d0b4a280fbd63fd7fd46904c25f5c1193b1ba1f00cc4e8af5ae4d0c5393eb540e214895a13a1da3e43f4f36912