$ git diff --patch-with-stat --summary 802b918b94eee1eaae960d544929d81711e28b64..5d0338eda5fab5250111ce567cd6081bf07c4ec7
.abf.yml | 2 +-
check-update.sh | 2 +
mariadb-10.3.6-enable-rocksdb-on-x86_32.patch | 12 +-
mariadb-10.4.4-static-wsrep.patch | 16 +-
mariadb-10.9.2-fix-libcurl-detection.patch | 12 +
mariadb-groonga.patch | 30 ---
mariadb-logrotate.patch | 92 +------
mariadb-openssl3.patch | 339 --------------------------
mariadb-ownsetup.patch | 24 +-
mariadb-scripts.patch | 13 +-
mariadb.spec | 47 ++--
11 files changed, 86 insertions(+), 503 deletions(-)
create mode 100755 check-update.sh
create mode 100644 mariadb-10.9.2-fix-libcurl-detection.patch
delete mode 100644 mariadb-groonga.patch
delete mode 100644 mariadb-openssl3.patch
diff --git a/.abf.yml b/.abf.yml
index 86f221e..ffe3094 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- mariadb-10.7.1.tar.gz: 36bd3c7af0ecb15b9e26f1cdb6d53eab63d28929
+ mariadb-11.2.4.tar.gz: 2e46154b7453272451433a3f070679dc4ba984a4
diff --git a/check-update.sh b/check-update.sh
new file mode 100755
index 0000000..cea97b4
--- /dev/null
+++ b/check-update.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+curl -s -L https://mariadb.org/download |grep "Latest releases" |sed -e 's,.*RC),,;s,</a>.*,,;s,.*>,,' 2>/dev/null
diff --git a/mariadb-10.3.6-enable-rocksdb-on-x86_32.patch b/mariadb-10.3.6-enable-rocksdb-on-x86_32.patch
index e8676eb..94d3e6f 100644
--- a/mariadb-10.3.6-enable-rocksdb-on-x86_32.patch
+++ b/mariadb-10.3.6-enable-rocksdb-on-x86_32.patch
@@ -1,9 +1,9 @@
-diff -up mariadb-10.3.8/storage/rocksdb/CMakeLists.txt.0005~ mariadb-10.3.8/storage/rocksdb/CMakeLists.txt
---- mariadb-10.3.8/storage/rocksdb/CMakeLists.txt.0005~ 2018-07-03 18:54:59.680912603 +0200
-+++ mariadb-10.3.8/storage/rocksdb/CMakeLists.txt 2018-07-03 18:55:47.856909106 +0200
-@@ -23,12 +23,6 @@ IF(WITH_VALGRIND)
- ADD_DEFINITIONS(-DROCKSDB_VALGRIND_RUN=1)
- ENDIF()
+diff -up mariadb-10.10.4/storage/rocksdb/CMakeLists.txt.7~ mariadb-10.10.4/storage/rocksdb/CMakeLists.txt
+--- mariadb-10.10.4/storage/rocksdb/CMakeLists.txt.7~ 2023-05-12 19:44:57.801928373 +0200
++++ mariadb-10.10.4/storage/rocksdb/CMakeLists.txt 2023-05-12 19:45:35.012185272 +0200
+@@ -35,12 +35,6 @@ ADD_DEFINITIONS(-Duint32_t=u_int32_t)
+ ADD_DEFINITIONS(-Duint16_t=u_int16_t)
+ ADD_DEFINITIONS(-Duint8_t=u_int8_t)
-# We've had our builders hang during the build process. This prevents MariaRocks
-# to be built on 32 bit intel OS kernels.
diff --git a/mariadb-10.4.4-static-wsrep.patch b/mariadb-10.4.4-static-wsrep.patch
index d15b857..47effd3 100644
--- a/mariadb-10.4.4-static-wsrep.patch
+++ b/mariadb-10.4.4-static-wsrep.patch
@@ -1,17 +1,17 @@
-diff -up mariadb-10.4.4/wsrep-lib/src/CMakeLists.txt.omv~ mariadb-10.4.4/wsrep-lib/src/CMakeLists.txt
---- mariadb-10.4.4/wsrep-lib/src/CMakeLists.txt.omv~ 2019-05-04 20:44:49.845671249 +0200
-+++ mariadb-10.4.4/wsrep-lib/src/CMakeLists.txt 2019-05-04 20:44:57.070604478 +0200
+diff -up mariadb-10.10.4/wsrep-lib/src/CMakeLists.txt.8~ mariadb-10.10.4/wsrep-lib/src/CMakeLists.txt
+--- mariadb-10.10.4/wsrep-lib/src/CMakeLists.txt.8~ 2023-05-12 19:45:49.065281831 +0200
++++ mariadb-10.10.4/wsrep-lib/src/CMakeLists.txt 2023-05-12 19:46:11.841437810 +0200
@@ -3,6 +3,7 @@
#
add_library(wsrep-lib
+ STATIC
+ allowlist_service_v1.cpp
client_state.cpp
- exception.cpp
- gtid.cpp
-diff -up mariadb-10.4.4/wsrep-lib/wsrep-API/CMakeLists.txt.omv~ mariadb-10.4.4/wsrep-lib/wsrep-API/CMakeLists.txt
---- mariadb-10.4.4/wsrep-lib/wsrep-API/CMakeLists.txt.omv~ 2019-05-04 20:45:08.740496692 +0200
-+++ mariadb-10.4.4/wsrep-lib/wsrep-API/CMakeLists.txt 2019-05-04 20:45:11.886467648 +0200
+ config_service_v1.cpp
+diff -up mariadb-10.10.4/wsrep-lib/wsrep-API/CMakeLists.txt.8~ mariadb-10.10.4/wsrep-lib/wsrep-API/CMakeLists.txt
+--- mariadb-10.10.4/wsrep-lib/wsrep-API/CMakeLists.txt.8~ 2023-05-05 15:13:12.000000000 +0200
++++ mariadb-10.10.4/wsrep-lib/wsrep-API/CMakeLists.txt 2023-05-12 19:45:49.065281831 +0200
@@ -1,4 +1,4 @@
-add_library(wsrep_api_v26
+add_library(wsrep_api_v26 STATIC
diff --git a/mariadb-10.9.2-fix-libcurl-detection.patch b/mariadb-10.9.2-fix-libcurl-detection.patch
new file mode 100644
index 0000000..4daacec
--- /dev/null
+++ b/mariadb-10.9.2-fix-libcurl-detection.patch
@@ -0,0 +1,12 @@
+diff -up mariadb-10.9.2/plugin/hashicorp_key_management/CMakeLists.txt.omv~ mariadb-10.9.2/plugin/hashicorp_key_management/CMakeLists.txt
+--- mariadb-10.9.2/plugin/hashicorp_key_management/CMakeLists.txt.omv~ 2022-09-05 19:22:02.679871841 +0200
++++ mariadb-10.9.2/plugin/hashicorp_key_management/CMakeLists.txt 2022-09-05 19:22:36.159428341 +0200
+@@ -12,7 +12,7 @@ set(CPACK_RPM_hashicorp-key-management_P
+
+ MYSQL_ADD_PLUGIN(HASHICORP_KEY_MANAGEMENT
+ hashicorp_key_management_plugin.cc
+- LINK_LIBRARIES ${CURL_LIBRARIES}
++ LINK_LIBRARIES CURL::libcurl
+ CONFIG hashicorp_key_management.cnf
+ COMPONENT hashicorp-key-management
+ MODULE_ONLY)
diff --git a/mariadb-groonga.patch b/mariadb-groonga.patch
deleted file mode 100644
index 3a0e74c..0000000
--- a/mariadb-groonga.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Fixing conflict with groonga package
-# https://bugzilla.redhat.com/show_bug.cgi?id=1763287
-
---- mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt.withoutoption 2019-11-11 14:01:07.762595716 +0100
-+++ mariadb-10.3.18/storage/mroonga/vendor/groonga/CMakeLists.txt 2019-11-11 14:33:05.224012458 +0100
-@@ -86,7 +86,9 @@
- set(INCLUDE_DIR "include")
- set(GRN_INCLUDE_DIR "include/groonga")
- set(DATA_DIR "share")
--set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}")
-+if(NOT DEFINED GRN_DATA_DIR)
-+ set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}")
-+endif()
- set(CONFIG_DIR "etc")
- set(GRN_CONFIG_DIR "${CONFIG_DIR}/${GRN_PROJECT_NAME}")
- set(GRN_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${GRN_CONFIG_DIR}/groonga.conf")
-
---- mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt.withoutoption 2019-11-11 14:34:22.661005715 +0100
-+++ mariadb-10.3.18/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt 2019-11-11 14:35:59.962244120 +0100
-@@ -16,7 +16,9 @@
- # MA 02110-1335 USA
-
- cmake_minimum_required(VERSION 2.6)
--set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
-+if (NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
-+ set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
-+endif()
- project("${GROONGA_NORMALIZER_MYSQL_PROJECT_NAME}")
-
- if(DEFINED GROONGA_NORMALIZER_MYSQL_EMBED)
diff --git a/mariadb-logrotate.patch b/mariadb-logrotate.patch
index aa46e59..78ab2b4 100644
--- a/mariadb-logrotate.patch
+++ b/mariadb-logrotate.patch
@@ -1,81 +1,13 @@
-Adjust the mysql-log-rotate script in several ways:
-
-* Use the correct log file pathname for Red Hat installations.
-* Enable creation of the log file by logrotate (needed since
- /var/log/ isn't writable by mysql user); and set the same 640
- permissions we normally use.
-* Comment out the actual rotation commands, so that user must edit
- the file to enable rotation. This is unfortunate, but the fact
- that the script will probably fail without manual configuration
- (to set a root password) means that we can't really have it turned
- on by default. Fortunately, in most configurations the log file
- is low-volume and so rotation is not critical functionality.
-
-See discussions at RH bugs 799735, 547007
-* Note they are from Fedora 15 / 16
-
-Update 3/2017
-* it would be big unexpected change for anyone upgrading, if we start shipping it now.
- Maybe it is good candidate for shipping with MariaDB 10.2 ?
-* the 'mysqladmin flush logs' doesn´t guarantee, no entries are lost
- during flushing, the operation is not atomic.
- We should not ship it in that state
-
-Update 6/2018
-* the SIGHUP causes server to flush all logs. No password admin needed, the only constraint is
- beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can.
-* Submited as PR: https://github.com/MariaDB/server/pull/807
-
-Update 02/2021
-* Enhance the script as proposed in:
- https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/
-* Discussion continues in:
- https://jira.mariadb.org/browse/MDEV-16621
-
---- mariadb-10.5.8/support-files/mysql-log-rotate.sh 2021-02-12 08:37:47.857289694 +0100
-+++ mariadb-10.5.8/support-files/mysql-log-rotate.sh_pacthed 2021-02-12 08:40:26.420372325 +0100
-@@ -3,35 +3,22 @@
- # in the [mysqld] section as follows:
- #
- # [mysqld]
--# log-error=@localstatedir@/mysqld.log
--#
--# If the root user has a password you have to create a
--# /root/.my.cnf configuration file with the following
--# content:
--#
--# [mysqladmin]
--# password = <secret>
--# user= root
--#
--# where "<secret>" is the password.
--#
--# ATTENTION: This /root/.my.cnf should be readable ONLY
--# for root !
-+# log-error=@LOG_LOCATION@
+diff -up mariadb-11.1.2/support-files/mariadb.logrotate.sh.1~ mariadb-11.1.2/support-files/mariadb.logrotate.sh
+--- mariadb-11.1.2/support-files/mariadb.logrotate.sh.1~ 2023-08-22 11:51:48.811510712 +0200
++++ mariadb-11.1.2/support-files/mariadb.logrotate.sh 2023-08-22 11:52:21.833837663 +0200
+@@ -6,7 +6,8 @@
+ # Read https://mariadb.com/kb/en/error-log/ to learn more about logging and
+ # https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/ about rotating logs.
--@localstatedir@/mysqld.log {
-- # create 600 mysql mysql
-+@LOG_LOCATION@ {
-+ create 600 mysql mysql
- notifempty
- daily
- rotate 3
- missingok
- compress
-+ delaycompress
-+ sharedscripts
- postrotate
- # just if mariadbd is really running
-- if test -x @bindir@/mysqladmin && \
-- @bindir@/mysqladmin ping &>/dev/null
-- then
-- @bindir@/mysqladmin --local flush-error-log \
-- flush-engine-log flush-general-log flush-slow-log
-- fi
-+ if [ -e @PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid ]
-+ then
-+ kill -1 $(<@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid)
-+ fi
- endscript
- }
+-@localstatedir@/mysqld.log @localstatedir@/mariadb.log @logdir@/*.log {
++@LOG_LOCATION@ @localstatedir@/mariadb.log @logdir@/*.log {
++ create 600 mysql mysql
+
+ # Depends on a mysql@localhost unix_socket authenticated user with RELOAD privilege
+ @su_user@
diff --git a/mariadb-openssl3.patch b/mariadb-openssl3.patch
deleted file mode 100644
index 8cefcb6..0000000
--- a/mariadb-openssl3.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-diff -up mariadb-10.7.1/cmake/ssl.cmake.1~ mariadb-10.7.1/cmake/ssl.cmake
---- mariadb-10.7.1/cmake/ssl.cmake.1~ 2021-11-05 21:29:26.000000000 +0100
-+++ mariadb-10.7.1/cmake/ssl.cmake 2021-12-03 20:59:26.104102060 +0100
-@@ -139,9 +139,20 @@ MACRO (MYSQL_CHECK_SSL)
- SET(SSL_INTERNAL_INCLUDE_DIRS "")
- SET(SSL_DEFINES "-DHAVE_OPENSSL")
-
-+ FOREACH(x INCLUDES LIBRARIES DEFINITIONS)
-+ SET(SAVE_CMAKE_REQUIRED_${x} ${CMAKE_REQUIRED_${x}})
-+ ENDFOREACH()
-+
-+ # Silence "deprecated in OpenSSL 3.0"
-+ IF((NOT OPENSSL_VERSION) # 3.0 not determined by older cmake
-+ OR NOT(OPENSSL_VERSION VERSION_LESS "3.0.0"))
-+ SET(SSL_DEFINES "${SSL_DEFINES} -DOPENSSL_API_COMPAT=0x10100000L")
-+ SET(CMAKE_REQUIRED_DEFINITIONS -DOPENSSL_API_COMPAT=0x10100000L)
-+ ENDIF()
-+
- SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
- SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES})
-- SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
-+
- CHECK_SYMBOL_EXISTS(ERR_remove_thread_state "openssl/err.h"
- HAVE_ERR_remove_thread_state)
- CHECK_SYMBOL_EXISTS(EVP_aes_128_ctr "openssl/evp.h"
-@@ -150,8 +161,10 @@ MACRO (MYSQL_CHECK_SSL)
- HAVE_EncryptAes128Gcm)
- CHECK_SYMBOL_EXISTS(X509_check_host "openssl/x509v3.h"
- HAVE_X509_check_host)
-- SET(CMAKE_REQUIRED_INCLUDES)
-- SET(CMAKE_REQUIRED_LIBRARIES)
-+
-+ FOREACH(x INCLUDES LIBRARIES DEFINITIONS)
-+ SET(CMAKE_REQUIRED_${x} ${SAVE_CMAKE_REQUIRED_${x}})
-+ ENDFOREACH()
- ELSE()
- IF(WITH_SSL STREQUAL "system")
- MESSAGE(FATAL_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support")
-diff -up mariadb-10.7.1/include/ssl_compat.h.1~ mariadb-10.7.1/include/ssl_compat.h
---- mariadb-10.7.1/include/ssl_compat.h.1~ 2021-11-05 21:29:26.000000000 +0100
-+++ mariadb-10.7.1/include/ssl_compat.h 2021-12-03 20:59:26.104102060 +0100
-@@ -24,7 +24,7 @@
- #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
- #define ERR_remove_state(X) ERR_clear_error()
- #define EVP_CIPHER_CTX_SIZE 176
--#define EVP_MD_CTX_SIZE 48
-+#define EVP_MD_CTX_SIZE 72
- #undef EVP_MD_CTX_init
- #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
- #undef EVP_CIPHER_CTX_init
-@@ -74,7 +74,6 @@
- #endif
-
- #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G))
--#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
- #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt)
- #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX)
-
-diff -up mariadb-10.7.1/mysql-test/lib/openssl.cnf.1~ mariadb-10.7.1/mysql-test/lib/openssl.cnf
---- mariadb-10.7.1/mysql-test/lib/openssl.cnf.1~ 2021-11-05 21:29:26.000000000 +0100
-+++ mariadb-10.7.1/mysql-test/lib/openssl.cnf 2021-12-03 20:59:26.104102060 +0100
-@@ -9,4 +9,4 @@ ssl_conf = ssl_section
- system_default = system_default_section
-
- [system_default_section]
--CipherString = ALL:@SECLEVEL=1
-+CipherString = ALL:@SECLEVEL=0
-diff -up mariadb-10.7.1/mysql-test/main/ssl_cipher.result.1~ mariadb-10.7.1/mysql-test/main/ssl_cipher.result
---- mariadb-10.7.1/mysql-test/main/ssl_cipher.result.1~ 2021-11-05 21:29:27.000000000 +0100
-+++ mariadb-10.7.1/mysql-test/main/ssl_cipher.result 2021-12-03 20:59:26.104102060 +0100
-@@ -61,8 +61,8 @@ connect ssl_con,localhost,root,,,,,SSL;
- SHOW STATUS LIKE 'Ssl_cipher';
- Variable_name Value
- Ssl_cipher AES128-SHA
--SHOW STATUS LIKE 'Ssl_cipher_list';
--Variable_name Value
--Ssl_cipher_list AES128-SHA
-+SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list';
-+VARIABLE_VALUE like '%AES128-SHA%'
-+1
- disconnect ssl_con;
- connection default;
-diff -up mariadb-10.7.1/mysql-test/main/ssl_cipher.test.1~ mariadb-10.7.1/mysql-test/main/ssl_cipher.test
---- mariadb-10.7.1/mysql-test/main/ssl_cipher.test.1~ 2021-12-03 20:59:26.105102065 +0100
-+++ mariadb-10.7.1/mysql-test/main/ssl_cipher.test 2021-12-03 21:00:00.898258615 +0100
-@@ -98,6 +98,6 @@ let $restart_parameters=--ssl-cipher=AES
- source include/restart_mysqld.inc;
- connect (ssl_con,localhost,root,,,,,SSL);
- SHOW STATUS LIKE 'Ssl_cipher';
--SHOW STATUS LIKE 'Ssl_cipher_list';
-+SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list';
- disconnect ssl_con;
- connection default;
-diff -up mariadb-10.7.1/mysys_ssl/my_crypt.cc.1~ mariadb-10.7.1/mysys_ssl/my_crypt.cc
---- mariadb-10.7.1/mysys_ssl/my_crypt.cc.1~ 2021-11-05 21:29:29.000000000 +0100
-+++ mariadb-10.7.1/mysys_ssl/my_crypt.cc 2021-12-03 20:59:26.105102065 +0100
-@@ -29,11 +29,7 @@
- #include <ssl_compat.h>
- #include <cstdint>
-
--#ifdef HAVE_WOLFSSL
- #define CTX_ALIGN 16
--#else
--#define CTX_ALIGN 0
--#endif
-
- class MyCTX
- {
-@@ -100,8 +96,9 @@ class MyCTX_nopad : public MyCTX
- {
- public:
- const uchar *key;
-- uint klen, buf_len;
-+ uint klen, source_tail_len;
- uchar oiv[MY_AES_BLOCK_SIZE];
-+ uchar source_tail[MY_AES_BLOCK_SIZE];
-
- MyCTX_nopad() : MyCTX() { }
- ~MyCTX_nopad() { }
-@@ -112,7 +109,7 @@ public:
- compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX_nopad));
- this->key= key;
- this->klen= klen;
-- this->buf_len= 0;
-+ this->source_tail_len= 0;
- if (ivlen)
- memcpy(oiv, iv, ivlen);
- DBUG_ASSERT(ivlen == 0 || ivlen == sizeof(oiv));
-@@ -123,26 +120,41 @@ public:
- return res;
- }
-
-+ /** Update last partial source block, stored in source_tail array. */
-+ void update_source_tail(const uchar* src, uint slen)
-+ {
-+ if (!slen)
-+ return;
-+ uint new_tail_len= (source_tail_len + slen) % MY_AES_BLOCK_SIZE;
-+ if (new_tail_len)
-+ {
-+ if (slen + source_tail_len < MY_AES_BLOCK_SIZE)
-+ {
-+ memcpy(source_tail + source_tail_len, src, slen);
-+ }
-+ else
-+ {
-+ DBUG_ASSERT(slen > new_tail_len);
-+ memcpy(source_tail, src + slen - new_tail_len, new_tail_len);
-+ }
-+ }
-+ source_tail_len= new_tail_len;
-+ }
-+
- int update(const uchar *src, uint slen, uchar *dst, uint *dlen)
- {
-- buf_len+= slen;
-+ update_source_tail(src, slen);
- return MyCTX::update(src, slen, dst, dlen);
- }
-
- int finish(uchar *dst, uint *dlen)
- {
-- buf_len %= MY_AES_BLOCK_SIZE;
-- if (buf_len)
-+ if (source_tail_len)
- {
-- uchar *buf= EVP_CIPHER_CTX_buf_noconst(ctx);
- /*
- Not much we can do, block ciphers cannot encrypt data that aren't
- a multiple of the block length. At least not without padding.
- Let's do something CTR-like for the last partial block.
--
-- NOTE this assumes that there are only buf_len bytes in the buf.
-- If OpenSSL will change that, we'll need to change the implementation
-- of this class too.
- */
- uchar mask[MY_AES_BLOCK_SIZE];
- uint mlen;
-@@ -154,10 +166,10 @@ public:
- return rc;
- DBUG_ASSERT(mlen == sizeof(mask));
-
-- for (uint i=0; i < buf_len; i++)
-- dst[i]= buf[i] ^ mask[i];
-+ for (uint i=0; i < source_tail_len; i++)
-+ dst[i]= source_tail[i] ^ mask[i];
- }
-- *dlen= buf_len;
-+ *dlen= source_tail_len;
- return MY_AES_OK;
- }
- };
-diff -up mariadb-10.7.1/unittest/mysys/aes-t.c.1~ mariadb-10.7.1/unittest/mysys/aes-t.c
---- mariadb-10.7.1/unittest/mysys/aes-t.c.1~ 2021-11-05 21:29:30.000000000 +0100
-+++ mariadb-10.7.1/unittest/mysys/aes-t.c 2021-12-03 20:59:26.105102065 +0100
-@@ -21,27 +21,96 @@
- #include <string.h>
- #include <ctype.h>
-
--#define DO_TEST(mode, nopad, slen, fill, dlen, hash) \
-- SKIP_BLOCK_IF(mode == 0xDEADBEAF, nopad ? 4 : 5, #mode " not supported") \
-- { \
-- memset(src, fill, src_len= slen); \
-- ok(my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, \
-- src, src_len, dst, &dst_len, \
-- key, sizeof(key), iv, sizeof(iv)) == MY_AES_OK, \
-- "encrypt " #mode " %u %s", src_len, nopad ? "nopad" : "pad"); \
-- if (!nopad) \
-- ok (dst_len == my_aes_get_size(mode, src_len), "my_aes_get_size");\
-- my_md5(md5, (char*)dst, dst_len); \
-- ok(dst_len == dlen && memcmp(md5, hash, sizeof(md5)) == 0, "md5"); \
-- ok(my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_DECRYPT, \
-- dst, dst_len, ddst, &ddst_len, \
-- key, sizeof(key), iv, sizeof(iv)) == MY_AES_OK, \
-- "decrypt " #mode " %u", dst_len); \
-- ok(ddst_len == src_len && memcmp(src, ddst, src_len) == 0, "memcmp"); \
-+
-+/** Test streaming encryption, bytewise update.*/
-+static int aes_crypt_bytewise(enum my_aes_mode mode, int flags, const unsigned char *src,
-+ unsigned int slen, unsigned char *dst, unsigned int *dlen,
-+ const unsigned char *key, unsigned int klen,
-+ const unsigned char *iv, unsigned int ivlen)
-+{
-+ /* Allocate context on odd address on stack, in order to
-+ catch misalignment errors.*/
-+ void *ctx= (char *)alloca(MY_AES_CTX_SIZE+1)+1;
-+
-+ int res1, res2;
-+ uint d1= 0, d2;
-+ uint i;
-+
-+ if ((res1= my_aes_crypt_init(ctx, mode, flags, key, klen, iv, ivlen)))
-+ return res1;
-+ for (i= 0; i < slen; i++)
-+ {
-+ uint tmp_d1=0;
-+ res1= my_aes_crypt_update(ctx, src+i,1, dst, &tmp_d1);
-+ if (res1)
-+ return res1;
-+ d1+= tmp_d1;
-+ dst+= tmp_d1;
-+ }
-+ res2= my_aes_crypt_finish(ctx, dst, &d2);
-+ *dlen= d1 + d2;
-+ return res1 ? res1 : res2;
-+}
-+
-+
-+#ifndef HAVE_EncryptAes128Ctr
-+const uint MY_AES_CTR=0xDEADBEAF;
-+#endif
-+#ifndef HAVE_EncryptAes128Gcm
-+const uint MY_AES_GCM=0xDEADBEAF;
-+#endif
-+
-+#define MY_AES_UNSUPPORTED(x) (x == 0xDEADBEAF)
-+
-+static void do_test(uint mode, const char *mode_str, int nopad, uint slen,
-+ char fill, size_t dlen, const char *hash)
-+{
-+ uchar key[16]= {1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6};
-+ uchar iv[16]= {2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7};
-+ uchar src[1000], dst[1100], dst2[1100], ddst[1000];
-+ uchar md5[MY_MD5_HASH_SIZE];
-+ uint src_len, dst_len, dst_len2, ddst_len;
-+ int result;
-+
-+ if (MY_AES_UNSUPPORTED(mode))
-+ {
-+ skip(nopad?7:6, "%s not supported", mode_str);
-+ return;
-+ }
-+ memset(src, fill, src_len= slen);
-+ result= my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, src, src_len,
-+ dst, &dst_len, key, sizeof(key), iv, sizeof(iv));
-+ ok(result == MY_AES_OK, "encrypt %s %u %s", mode_str, src_len,
-+ nopad ? "nopad" : "pad");
-+
-+ if (nopad)
-+ {
-+ result= aes_crypt_bytewise(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, src,
-+ src_len, dst2, &dst_len2, key, sizeof(key),
-+ iv, sizeof(iv));
-+ ok(result == MY_AES_OK, "encrypt bytewise %s %u", mode_str, src_len);
-+ /* Compare with non-bytewise encryption result*/
-+ ok(dst_len == dst_len2 && memcmp(dst, dst2, dst_len) == 0,
-+ "memcmp bytewise %s %u", mode_str, src_len);
- }
-+ else
-+ {
-+ int dst_len_real= my_aes_get_size(mode, src_len);
-+ ok(dst_len_real= dst_len, "my_aes_get_size");
-+ }
-+ my_md5(md5, (char *) dst, dst_len);
-+ ok(dst_len == dlen, "md5 len");
-+ ok(memcmp(md5, hash, sizeof(md5)) == 0, "md5");
-+ result= my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_DECRYPT,
-+ dst, dst_len, ddst, &ddst_len, key, sizeof(key), iv,
-+ sizeof(iv));
-+
-+ ok(result == MY_AES_OK, "decrypt %s %u", mode_str, dst_len);
-+ ok(ddst_len == src_len && memcmp(src, ddst, src_len) == 0, "memcmp");
-+}
-
--#define DO_TEST_P(M,S,F,D,H) DO_TEST(M,0,S,F,D,H)
--#define DO_TEST_N(M,S,F,D,H) DO_TEST(M,ENCRYPTION_FLAG_NOPAD,S,F,D,H)
-+#define DO_TEST_P(M, S, F, D, H) do_test(M, #M, 0, S, F, D, H)
-+#define DO_TEST_N(M, S, F, D, H) do_test(M, #M, ENCRYPTION_FLAG_NOPAD, S, F, D, H)
-
- /* useful macro for debugging */
- #define PRINT_MD5() \
-@@ -53,25 +122,15 @@
- printf("\"\n"); \
- } while(0);
-
--#ifndef HAVE_EncryptAes128Ctr
--const uint MY_AES_CTR=0xDEADBEAF;
--#endif
--#ifndef HAVE_EncryptAes128Gcm
--const uint MY_AES_GCM=0xDEADBEAF;
--#endif
-
- int
- main(int argc __attribute__((unused)),char *argv[])
- {
-- uchar key[16]= {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6};
-- uchar iv[16]= {2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7};
-- uchar src[1000], dst[1100], ddst[1000];
-- uchar md5[MY_MD5_HASH_SIZE];
-- uint src_len, dst_len, ddst_len;
-
- MY_INIT(argv[0]);
-
-- plan(87);
-+ plan(122);
-+
- DO_TEST_P(MY_AES_ECB, 200, '.', 208, "\xd8\x73\x8e\x3a\xbc\x66\x99\x13\x7f\x90\x23\x52\xee\x97\x6f\x9a");
- DO_TEST_P(MY_AES_ECB, 128, '?', 144, "\x19\x58\x33\x85\x4c\xaa\x7f\x06\xd1\xb2\xec\xd7\xb7\x6a\xa9\x5b");
- DO_TEST_P(MY_AES_CBC, 159, '%', 160, "\x4b\x03\x18\x3d\xf1\xa7\xcd\xa1\x46\xb3\xc6\x8a\x92\xc0\x0f\xc9");
diff --git a/mariadb-ownsetup.patch b/mariadb-ownsetup.patch
index 7728cf1..a3b9a5f 100644
--- a/mariadb-ownsetup.patch
+++ b/mariadb-ownsetup.patch
@@ -1,6 +1,7 @@
---- mariadb-10.4.14/support-files/CMakeLists.txt 2020-08-06 17:28:28.000000000 +0200
-+++ mariadb-10.4.14/support-files/CMakeLists.txt_patched 2020-09-03 13:21:07.826658279 +0200
-@@ -187,6 +187,7 @@ IF(UNIX)
+diff -up mariadb-11.1.2/support-files/CMakeLists.txt.3~ mariadb-11.1.2/support-files/CMakeLists.txt
+--- mariadb-11.1.2/support-files/CMakeLists.txt.3~ 2023-08-17 17:25:34.000000000 +0200
++++ mariadb-11.1.2/support-files/CMakeLists.txt 2023-08-22 11:54:32.210117534 +0200
+@@ -237,6 +237,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
COMPONENT SharedLibraries)
INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
COMPONENT Client)
@@ -8,24 +9,17 @@
INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
COMPONENT IniFiles)
INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
-
-diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/support-files/rpm/server.cnf
---- mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup 2015-01-24 23:55:55.110063592 +0100
-+++ mariadb-10.0.15/support-files/rpm/server.cnf 2015-01-24 23:57:42.308114387 +0100
-@@ -9,7 +9,16 @@
- [server]
+diff -up mariadb-11.1.2/support-files/rpm/server.cnf.3~ mariadb-11.1.2/support-files/rpm/server.cnf
+--- mariadb-11.1.2/support-files/rpm/server.cnf.3~ 2023-08-22 11:54:32.210117534 +0200
++++ mariadb-11.1.2/support-files/rpm/server.cnf 2023-08-22 11:55:55.238924829 +0200
+@@ -13,6 +13,10 @@
- # this is only for the mysqld standalone daemon
-+# Settings user and group are ignored when systemd is used.
-+# If you need to run mysqld under a different user or group,
-+# customize your systemd unit file for mysqld/mariadb according to the
-+# instructions in http://fedoraproject.org/wiki/Systemd
+ # This group is read by both MariaDB and MySQL servers
[mysqld]
+datadir=@MYSQL_DATADIR@
+socket=@MYSQL_UNIX_ADDR@
+log-error=@LOG_LOCATION@
+pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid
-+
#
# * Galera-related settings
diff --git a/mariadb-scripts.patch b/mariadb-scripts.patch
index 3b6dc16..1a50fba 100644
--- a/mariadb-scripts.patch
+++ b/mariadb-scripts.patch
@@ -1,11 +1,8 @@
-We have some downstream patches and other scripts that include variables to
-be expanded by cmake. Cmake needs to know about them, so adding them manually.
-
- # Install libgcc as mylibgcc.a
---- mariadb-10.5.5/scripts/CMakeLists.txt.old 2020-09-24 10:13:35.272589689 +0200
-+++ mariadb-10.5.5/scripts/CMakeLists.txt 2020-09-24 10:17:31.428985798 +0200
-@@ -377,6 +377,34 @@
- INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
+diff -up mariadb-11.1.2/scripts/CMakeLists.txt.2~ mariadb-11.1.2/scripts/CMakeLists.txt
+--- mariadb-11.1.2/scripts/CMakeLists.txt.2~ 2023-08-22 11:52:37.766994984 +0200
++++ mariadb-11.1.2/scripts/CMakeLists.txt 2023-08-22 11:54:15.358953007 +0200
+@@ -388,6 +388,34 @@ ELSE()
+ INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT}Symlinks)
ENDIF()
ENDFOREACH()
+
diff --git a/mariadb.spec b/mariadb.spec
index 3664518..a246699 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -12,12 +12,12 @@
Summary: The MariaDB database, a drop-in replacement for MySQL
Name: mariadb
-Version: 10.7.1
+Version: 11.2.4
Release: 1
URL: http://mariadb.org/
License: GPL
Group: System/Servers
-Source0: http://mirrors.n-ix.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz
+Source0: https://mirror.mva-n.net/mariadb//mariadb-%{version}/source/mariadb-%{version}.tar.gz
Source1: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mysql_config_multilib.sh
Source2: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/my.cnf.in
Source3: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb.tmpfiles.d.in
@@ -31,7 +31,6 @@ Source10: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/clustercheck.
Source20: mariadb.sysusers
Source1000: %{name}.rpmlintrc
# Fedora patches
-Patch1: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-openssl3.patch
# Patch4: Red Hat distributions specific logrotate fix
# it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2
Patch4: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-logrotate.patch
@@ -43,8 +42,6 @@ Patch9: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-ownset
Patch10: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-ssl-cipher-tests.patch
# Patch11: Use PCDIR CMake option, if configured
Patch11: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-pcdir.patch
-# Patch15: Add option to edit groonga's and groonga-normalizer-mysql install path
-Patch15: https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-groonga.patch
# OpenMandriva patches
# Don't strip -Wformat from --cflags -- -Werror=format-string without -Wformat
@@ -58,6 +55,8 @@ Patch102: mariadb-10.3.6-enable-rocksdb-on-x86_32.patch
# It also doesn't have soname info etc., so it should be a static
# lib
Patch103: mariadb-10.4.4-static-wsrep.patch
+# Fix libcurl detection/linkage
+Patch104: mariadb-10.9.2-fix-libcurl-detection.patch
Requires: %{name}-server = %{EVRD}
Requires: %{name}-client = %{EVRD}
BuildRequires: bison
@@ -71,6 +70,7 @@ BuildRequires: libaio-devel
BuildRequires: stdc++-devel
BuildRequires: pkgconfig(readline)
BuildRequires: xfsprogs-devel
+BuildRequires: pkgconfig(fmt)
BuildRequires: pkgconfig(jemalloc)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(ncursesw)
@@ -83,9 +83,11 @@ BuildRequires: pkgconfig(snappy)
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(libzmq)
BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(msgpack)
+BuildRequires: pkgconfig(msgpack-c)
BuildRequires: pkgconfig(krb5-gssapi)
BuildRequires: pkgconfig(com_err)
+BuildRequires: pkgconfig(libssh2)
+BuildRequires: pkgconfig(libidn2)
# For _tmpfilesdir macro
BuildRequires: systemd-rpm-macros
BuildRequires: cracklib-devel
@@ -221,6 +223,7 @@ Static libraries for the MariaDB database.
%files -n %{staticpackage}
%{_libdir}/libmysqlclient.a
%{_libdir}/libmysqlclient_r.a
+%{_libdir}/libmariadb.a
%{_libdir}/libmariadbclient.a
%{_libdir}/libmariadbd.a
%{_libdir}/libmysqlservices.a
@@ -299,6 +302,8 @@ Plugins for the MariaDB database.
%{_libdir}/mysql/plugin/provider_lzma.so
%{_libdir}/mysql/plugin/provider_lzo.so
%{_libdir}/mysql/plugin/provider_snappy.so
+%{_libdir}/mysql/plugin/hashicorp_key_management.so
+%{_libdir}/mysql/plugin/zstd.so
%doc %{_mandir}/man1/mysql_plugin.1*
%{_libdir}/mysql/plugin/debug_key_management.so
%{_libdir}/mysql/plugin/example_key_management.so
@@ -334,6 +339,7 @@ MariaDB test suite.
%doc %{_mandir}/man1/mariadb-client-test.1*
%{_bindir}/mysql_client_test_embedded
%{_datadir}/mysql-test
+%{_datadir}/mysql/mini-benchmark
%{_libdir}/mysql/plugin/func_test.so
%{_libdir}/mysql/plugin/type_test.so
%doc %{_mandir}/man1/mariadb-test.1*
@@ -366,6 +372,7 @@ package '%{name}'.
%optional %{_libdir}/mysql/plugin/ha_s3.so
%{_libdir}/mysql/plugin/test_sql_service.so
%{_libdir}/mysql/plugin/type_mysql_json.so
+%{_libdir}/mysql/plugin/type_mysql_timestamp.so
%doc %{_mandir}/man1/aria_s3_copy.1*
%doc %{_mandir}/man1/mariadb-conv.1*
%doc %{_mandir}/man1/myrocks_hotbackup.1*
@@ -381,10 +388,10 @@ package '%{name}'.
%dir %{_datadir}/mysql
%{_datadir}/mysql/errmsg-utf8.txt
%{_datadir}/mysql/fill_help_tables.sql
-%{_datadir}/mysql/mysql_performance_tables.sql
-%{_datadir}/mysql/mysql_system_tables.sql
-%{_datadir}/mysql/mysql_system_tables_data.sql
-%{_datadir}/mysql/mysql_test_data_timezone.sql
+%{_datadir}/mysql/mariadb_performance_tables.sql
+%{_datadir}/mysql/mariadb_system_tables.sql
+%{_datadir}/mysql/mariadb_system_tables_data.sql
+%{_datadir}/mysql/mariadb_test_data_timezone.sql
%{_datadir}/mysql/wsrep_notify
%{_datadir}/mysql/*.cnf
%{_datadir}/mysql/maria_add_gis_sp.sql
@@ -399,7 +406,8 @@ package '%{name}'.
%doc %{_mandir}/man8/*
%dir %{_libdir}/mysql
%dir %{_libdir}/mysql/plugin
-%{_sysconfdir}/logrotate.d/mysql
+%{_sysconfdir}/logrotate.d/mariadb
+%{_datadir}/mysql/mariadb.logrotate
%config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf
%config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf
%config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf
@@ -471,7 +479,7 @@ package '%{name}'.
%{_unitdir}/*.socket
%dir %{_unitdir}/mariadb@bootstrap.service.d
%{_unitdir}/mariadb@bootstrap.service.d/*.conf
-%{_datadir}/mysql/mysql_test_db.sql
+%{_datadir}/mysql/mariadb_test_db.sql
%doc %{_docdir}/%{name}-%{version}
%attr(711,%{muser},%{muser}) /srv/mysql
%attr(711,%{muser},%{muser}) %{_localstatedir}/log/mysqld
@@ -511,7 +519,9 @@ package '%{name}'.
%doc %{_mandir}/man1/wsrep_sst_rsync.1*
%doc %{_mandir}/man1/wsrep_sst_mariabackup.1*
%doc %{_mandir}/man1/wsrep_sst_rsync_wan.1*
-%{_datadir}/mysql/mysql_sys_schema.sql
+%doc %{_mandir}/man1/wsrep_sst_backup.1.zst
+
+%{_datadir}/mysql/mariadb_sys_schema.sql
%package msql2mysql
Summary: Tool to convert code written for mSQL to MySQL/MariaDB
@@ -543,11 +553,14 @@ Common files needed by both the MariaDB server and client.
%{_sysconfdir}/my.cnf.d/*
%{_datadir}/mysql/english
%{_datadir}/mysql/charsets
+%{_datadir}/mysql/bulgarian
+%{_datadir}/mysql/chinese
%{_datadir}/mysql/czech
%{_datadir}/mysql/danish
%{_datadir}/mysql/dutch
%{_datadir}/mysql/estonian
%{_datadir}/mysql/french
+%{_datadir}/mysql/georgian
%{_datadir}/mysql/german
%{_datadir}/mysql/greek
%{_datadir}/mysql/hindi
@@ -564,6 +577,7 @@ Common files needed by both the MariaDB server and client.
%{_datadir}/mysql/serbian
%{_datadir}/mysql/slovak
%{_datadir}/mysql/spanish
+%{_datadir}/mysql/swahili
%{_datadir}/mysql/swedish
%{_datadir}/mysql/ukrainian
%{_datadir}/mysql/policy
@@ -654,7 +668,7 @@ MariaDB command line client.
%autosetup -p1
# MariaDB uses python2 scripts to autogenerate some sources...
# Let's use python3 instead.
-find . -name "*.py" |xargs 2to3 -w
+#find . -name "*.py" |xargs 2to3 -w
cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} scripts
@@ -719,7 +733,7 @@ sed -i 's|WSREP_NORETURN|__attribute__((noreturn))|' wsrep-lib/include/wsrep/thr
-DINSTALL_MYSQLSHAREDIR=share/mysql \
-DINSTALL_MYSQLTESTDIR=share/mysql-test \
-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
- -DINSTALL_SBINDIR=sbin \
+ -DINSTALL_SBINDIR=bin \
-DINSTALL_SCRIPTDIR=bin \
-DINSTALL_SUPPORTFILESDIR=share/mysql \
-DINSTALL_PCDIR=%{_lib}/pkgconfig \
@@ -742,7 +756,8 @@ sed -i 's|WSREP_NORETURN|__attribute__((noreturn))|' wsrep-lib/include/wsrep/thr
-DWITH_WSREP:BOOL=ON \
-DWITH_EMBEDDED_SERVER:BOOL=ON \
-DWITH_MARIABACKUP:BOOL=ON \
- -DPLUGIN_ROCKSDB=DYNAMIC
+ -DPLUGIN_ROCKSDB=DYNAMIC \
+ -DCURL_LIBRARIES=-lcurl
%make_build -k || make