Merging debian version 1:10.11.8-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

13 files changed, 131 insertions, 273 deletions

diff --git a/debian/patches/1063738-revert-c432c9ef.patch b/debian/patches/1063738-revert-c432c9ef.patch
deleted file mode 100644
index e5e2668e..00000000
--- a/debian/patches/1063738-revert-c432c9ef.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Forwarded: no
-From: Otto Kekäläinen <otto@debian.org>
-Date: Wed, 21 Feb 2024 20:34:12 -0800
-Subject: [PATCH] Revert compile_time_assert() changes from "MDEV-32862 MYSQL struct in C/C and server differs"
-
-This partially reverts commit c432c9ef19bf6ff40ab9551bcae202d7e1319878 which
-most likely caused the regression that broke builds on many 32-bit platforms.
-
---- a/tests/mysql_client_fw.c
-+++ b/tests/mysql_client_fw.c
-@@ -1430,14 +1430,6 @@ int main(int argc, char **argv)
-     tests_to_run[i]= NULL;
-   }
- 
--#ifdef _WIN32
--  /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */
--  compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728);
--#else
--  /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */
--  compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
--#endif
--
-   if (mysql_server_init(embedded_server_arg_count,
-                         embedded_server_args,
-                         (char**) embedded_server_groups))
diff --git a/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch b/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch
deleted file mode 100644
index 7607cfd7..00000000
--- a/debian/patches/2129-new-script-wsrep-sst-backup-fixes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Forwarded: https://github.com/MariaDB/server/pull/2129 (merged in Feb 2024)
-Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2129.patch
-From: Otto Kekäläinen <otto@kekalainen.net>
-Date: Sun, 22 May 2022 10:13:33 -0700
-Subject: [PATCH] Properly introduce wsrep_sst_backup script in project
- packaging
-
-The script wsrep_sst_backup was introduced on MariaDB 10.3 in commit
-9b2fa2a. The new script was automatically included in RPM packages but not
-in Debian packages (which started to fail on warning about stray file).
-
-Include wsrep_sst_backup in the mariadb-server-10.{3..8} package, and
-also include a stub man page so that packaging of a new script is complete.
-
----
- debian/mariadb-server-10.6.install |  2 ++
- man/CMakeLists.txt                 |  2 +-
- man/wsrep_sst_backup.1             | 16 ++++++++++++++++
- 3 files changed, 19 insertions(+), 1 deletion(-)
- create mode 100644 man/wsrep_sst_backup.1
-
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -13,7 +13,7 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335 USA
- 
--SET(MAN1_WSREP wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1
-+SET(MAN1_WSREP wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1 wsrep_sst_backup.1
-     wsrep_sst_mysqldump.1 wsrep_sst_rsync_wan.1 galera_recovery.1 galera_new_cluster.1)
- SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1
-                 aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1
---- /dev/null
-+++ b/man/wsrep_sst_backup.1
-@@ -0,0 +1,16 @@
-+'\" t
-+.\"
-+.TH "\FBWSREP_SST_BACKUP\FR" "1" "22 May 2022" "MariaDB 10\&.3" "MariaDB Database System"
-+.\" -----------------------------------------------------------------
-+.\" * set default formatting
-+.\" -----------------------------------------------------------------
-+.\" disable hyphenation
-+.nh
-+.\" disable justification (adjust text to left margin only)
-+.ad l
-+.SH NAME
-+wsrep_sst_backup \- backup helper script for the MariaDB Galera Cluster
-+.SH DESCRIPTION
-+Use: See source code of script\.
-+.PP
-+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
diff --git a/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch b/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch
index bbc1af6b..b6dd97e3 100644
--- a/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch
+++ b/debian/patches/2541-fix-stack-overflow-in-pinbox-allocator.patch
@@ -1,6 +1,4 @@
-Forwarded: https://github.com/MariaDB/server/pull/2541
-Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2541.patch
-Bug: https://jira.mariadb.org/browse/MDEV-31151
+From fd83a9431cd16e6c61b8cdbb89810c554a315338 Mon Sep 17 00:00:00 2001
 From: Hugo Wen <wenhug@amazon.com>
 Date: Sat, 11 Mar 2023 00:27:42 +0000
 Subject: [PATCH] Fix a stack overflow in pinbox allocator
@@ -126,7 +124,7 @@ Services, Inc.
    {
      for (i= 0; i < LF_PINBOX_PINS; i++)
      {
-       void *p= el->pin[i];
+       void *p= my_atomic_loadptr((void **)&el->pin[i]);
        if (p)
 -        *hv->granary++= p;
 +      {
@@ -172,7 +170,7 @@ Services, Inc.
 -  LF_PINS *el_end= el+LF_DYNARRAY_LEVEL_LENGTH;
 -  for (; el < el_end; el++)
 -    for (i= 0; i < LF_PINBOX_PINS; i++)
--      if (el->pin[i] == addr)
+-      if (my_atomic_loadptr((void **)&el->pin[i]) == addr)
 -        return 1;
 -  return 0;
 -}
diff --git a/debian/patches/2980-riscv-use-rdtime.patch b/debian/patches/2980-riscv-use-rdtime.patch
deleted file mode 100644
index a2e21ddb..00000000
--- a/debian/patches/2980-riscv-use-rdtime.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Forwarded: https://github.com/MariaDB/server/pull/2980 (merged in Feb 2024)
-Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/2980.patch
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Thu, 4 Jan 2024 11:30:34 +0100
-Subject: [PATCH] RISC-V: use RDTIME instead of RDCYCLE
-
-Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on
-RISC-V and can't be used directly from userland. There is a sysctl
-option to change that as a transition period, but it will eventually
-disappear.
-
-Use RDTIME instead, which while less accurate has the advantage of being
-synchronized between CPU (and thus monotonic) and of constant frequency.
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3
----
- include/my_rdtsc.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/include/my_rdtsc.h
-+++ b/include/my_rdtsc.h
-@@ -111,7 +111,7 @@ C_MODE_START
-   On AARCH64, we use the generic timer base register. We override clang
-   implementation for aarch64 as it access a PMU register which is not
-   guaranteed to be active.
--  On RISC-V, we use the rdcycle instruction to read from mcycle register.
-+  On RISC-V, we use the rdtime instruction to read from mtime register.
- 
-   Sadly, we have nothing for the Digital Alpha, MIPS, Motorola m68k,
-   HP PA-RISC or other non-mainstream (or obsolete) processors.
-@@ -211,15 +211,15 @@ static inline ulonglong my_timer_cycles(
-   }
- #elif defined(__riscv)
-   #define MY_TIMER_ROUTINE_CYCLES MY_TIMER_ROUTINE_RISCV
--  /* Use RDCYCLE (and RDCYCLEH on riscv32) */
-+  /* Use RDTIME (and RDTIMEH on riscv32) */
-   {
- # if __riscv_xlen == 32
-     ulong result_lo, result_hi0, result_hi1;
-     /* Implemented in assembly because Clang insisted on branching. */
-     __asm __volatile__(
--        "rdcycleh %0\n"
--        "rdcycle %1\n"
--        "rdcycleh %2\n"
-+        "rdtimeh %0\n"
-+        "rdtime %1\n"
-+        "rdtimeh %2\n"
-         "sub %0, %0, %2\n"
-         "seqz %0, %0\n"
-         "sub %0, zero, %0\n"
-@@ -228,7 +228,7 @@ static inline ulonglong my_timer_cycles(
-     return (static_cast<ulonglong>(result_hi1) << 32) | result_lo;
- # else
-     ulonglong result;
--    __asm __volatile__("rdcycle %0" : "=r"(result));
-+    __asm __volatile__("rdtime %0" : "=r"(result));
-     return result;
-   }
- # endif
diff --git a/debian/patches/3039-os-data-file-no-o-direct.patch b/debian/patches/3039-os-data-file-no-o-direct.patch
deleted file mode 100644
index 634bfbd9..00000000
--- a/debian/patches/3039-os-data-file-no-o-direct.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Forwarded: https://github.com/MariaDB/server/pull/3039 (merged in Feb 2024)
-Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3039.patch
-From: Daniel Black <daniel@mariadb.org>
-Date: Fri, 2 Feb 2024 11:38:00 +1100
-Subject: [PATCH] MDEV-33095 MariaDB-backup - no OS_DATA_FILE_NO_O_DIRECT on
- some platforms
-
-Postfix for a6290a5bc5f3cba096854595c354d19d9267743d, in 10.11
-where OS_DATA_FILE_NO_O_DIRECT gets used. Same #ifdef conditions
-as other uses of OS_DATA_FILE_NO_O_DIRECT.
-
-Noticed on aarch64-macos builder.
----
- extra/mariabackup/xtrabackup.cc | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/extra/mariabackup/xtrabackup.cc
-+++ b/extra/mariabackup/xtrabackup.cc
-@@ -2428,7 +2428,12 @@ static bool innodb_init()
-   os_file_delete_if_exists_func(ib_logfile0.c_str(), nullptr);
-   os_file_t file= os_file_create_func(ib_logfile0.c_str(),
-                                       OS_FILE_CREATE, OS_FILE_NORMAL,
--                                      OS_DATA_FILE_NO_O_DIRECT, false, &ret);
-+#if defined _WIN32 || defined HAVE_FCNTL_DIRECT
-+                                      OS_DATA_FILE_NO_O_DIRECT,
-+#else
-+                                      OS_DATA_FILE,
-+#endif
-+				      false, &ret);
-   if (!ret)
-   {
-   invalid_log:
diff --git a/debian/patches/3154-openssl-alert-protocol-string.patch b/debian/patches/3154-openssl-alert-protocol-string.patch
deleted file mode 100644
index a2aa8767..00000000
--- a/debian/patches/3154-openssl-alert-protocol-string.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Forwarded: https://github.com/MariaDB/server/pull/3154
-Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3154.patch
-From: Zhibo Zhang <zhibo@amazon.com>
-Date: Tue, 19 Mar 2024 19:16:46 +0000
-Subject: [PATCH] Update tests to be compatible with OpenSSL 3.2.0
-
-As of version 3.2.0, OpenSSL updated the error message in new versions
-("https://github.com/openssl/openssl/commit/81b741f68984"). Update the
-tests and result files such that they are compatible with both original
-and new error messages.
-
-All new code of the whole pull request, including one or several files that are
-either new files or modified ones, are contributed under the BSD-new license. I
-am contributing on behalf of my employer Amazon Web Services, Inc.
----
- mysql-test/main/ssl_crl.result | 2 +-
- mysql-test/main/ssl_crl.test   | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/mysql-test/main/ssl_crl.result
-+++ b/mysql-test/main/ssl_crl.result
-@@ -2,4 +2,4 @@
- Variable_name	Value
- Ssl_version	TLS_VERSION
- # try logging in with a certificate in the server's --ssl-crl : should fail
--ERROR 2026 (HY000): TLS/SSL error: sslv3 alert certificate revoked
-+ERROR 2026 (HY000): TLS/SSL error: ssl/tls alert certificate revoked
---- a/mysql-test/main/ssl_crl.test
-+++ b/mysql-test/main/ssl_crl.test
-@@ -7,7 +7,7 @@
- --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/server-new-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/server-new-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'"
- 
- --echo # try logging in with a certificate in the server's --ssl-crl : should fail
--# OpenSSL 1.1.1a correctly rejects the certificate, but the error message is different
----replace_regex /ERROR 2013 \(HY000\): Lost connection to server at '.*', system error: [0-9]+/ERROR 2026 (HY000): TLS\/SSL error: sslv3 alert certificate revoked/
-+# OpenSSL 1.1.1a and later releases correctly rejects the certificate, but the error message is different
-+--replace_regex /(ERROR 2013 \(HY000\): Lost connection to server at '.*', system error: [0-9]+|ERROR 2026 \(HY000\): TLS\/SSL error: sslv3 alert certificate revoked)/ERROR 2026 (HY000): TLS\/SSL error: ssl\/tls alert certificate revoked/
- --error 1
- --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1
diff --git a/debian/patches/MDEV-32975-chartset-collation-fix-php.patch b/debian/patches/MDEV-32975-chartset-collation-fix-php.patch
deleted file mode 100644
index e1282019..00000000
--- a/debian/patches/MDEV-32975-chartset-collation-fix-php.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Origin: https://github.com/MariaDB/server/commit/1b37cb71f44549c94acf8914cf93d43a4293a449 (merged in Feb 2024)
-Bug: https://jira.mariadb.org/browse/MDEV-32975
-From: Alexander Barkov <bar@mariadb.com>
-Date: Fri, 26 Jan 2024 13:12:03 +0400
-Subject: [PATCH] MDEV-32975 Default charset doesn't work with PHP MySQLi
- extension
-
-When sending the server default collation ID to the client
-in the handshake packet, translate a 2-byte collation ID
-to the ID of the default collation for the character set.
----
- sql/sql_acl.cc | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/sql/sql_acl.cc
-+++ b/sql/sql_acl.cc
-@@ -13354,8 +13354,27 @@ static bool send_server_handshake_packet
-   *end++= 0;
- 
-   int2store(end, thd->client_capabilities);
-+
-+  CHARSET_INFO *handshake_cs= default_charset_info;
-+  if (handshake_cs->number > 0xFF)
-+  {
-+    /*
-+      A workaround for a 2-byte collation ID: translate it into
-+      the ID of the primary collation of this character set.
-+    */
-+    CHARSET_INFO *cs= get_charset_by_csname(handshake_cs->cs_name.str,
-+                                            MY_CS_PRIMARY, MYF(MY_WME));
-+    /*
-+      cs should not normally be NULL, however it may be possible
-+      with a dynamic character set incorrectly defined in Index.xml.
-+      For safety let's fallback to latin1 in case cs is NULL.
-+    */
-+    handshake_cs= cs ? cs : &my_charset_latin1;
-+  }
-+
-   /* write server characteristics: up to 16 bytes allowed */
--  end[2]= (char) default_charset_info->number;
-+  end[2]= (char) handshake_cs->number;
-+
-   int2store(end+3, mpvio->auth_info.thd->server_status);
-   int2store(end+5, thd->client_capabilities >> 16);
-   end[7]= data_len;
diff --git a/debian/patches/fix-spelling-mariadb.patch b/debian/patches/fix-spelling-mariadb.patch
index 0eb88d3f..5d5265cb 100644
--- a/debian/patches/fix-spelling-mariadb.patch
+++ b/debian/patches/fix-spelling-mariadb.patch
@@ -14,3 +14,77 @@ Subject: [PATCH] Fix misc spelling in MariaDB Server repository
  		cap = NULL;
  	} catch (const char *msg) {
  		htrc(g->Message, msg);
+--- a/extra/mariabackup/innobackupex.cc
++++ b/extra/mariabackup/innobackupex.cc
+@@ -188,7 +188,7 @@ enum innobackupex_options
+ 	OPT_DATABASES,
+ 	OPT_DECOMPRESS,
+ 
+-	/* options wich are passed directly to xtrabackup */
++	/* options which are passed directly to xtrabackup */
+ 	OPT_CLOSE_FILES,
+ 	OPT_COMPACT,
+ 	OPT_COMPRESS,
+@@ -447,7 +447,7 @@ static struct my_option ibx_long_options
+ 	{"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
+          "This option specifies time in seconds that mariadb-backup should wait for "
+          "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all "
+-         "currently running queries using explicite LOCK TABLES has ended. "
++         "currently running queries using explicit LOCK TABLES has ended. "
+          "If there are still such queries when the timeout expires, mariadb-backup "
+          "terminates with an error. Default is 0, in which case mariadb-backup waits "
+          "indefinitely for BACKUP STAGE START to finish",
+--- a/extra/mariabackup/xtrabackup.cc
++++ b/extra/mariabackup/xtrabackup.cc
+@@ -217,7 +217,7 @@ uint xtrabackup_compress = FALSE;
+ uint xtrabackup_compress_threads;
+ ulonglong xtrabackup_compress_chunk_size = 0;
+ 
+-/* sleep interval beetween log copy iterations in log copying thread
++/* sleep interval between log copy iterations in log copying thread
+ in milliseconds (default is 1 second) */
+ ulint xtrabackup_log_copy_interval = 1000;
+ static ulong max_buf_pool_modified_pct;
+@@ -1597,11 +1597,11 @@ struct my_option xb_client_options[]= {
+      GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+ 
+     {"rsync", OPT_RSYNC,
+-     "Obsolete depricated option",
++     "Obsolete deprecated option",
+      &ignored_option, &ignored_option,  0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+ 
+     {"no-backup-locks", OPT_NO_BACKUP_LOCKS,
+-     "Obsolete depricated option",
++     "Obsolete deprecated option",
+      &ignored_option, &ignored_option,  0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+ 
+     {"force-non-empty-directories", OPT_FORCE_NON_EMPTY_DIRS,
+@@ -1729,7 +1729,7 @@ struct my_option xb_client_options[]= {
+     {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
+      "This option specifies time in seconds that mariadb-backup should wait for "
+      "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all "
+-     "currently running queries using explicite LOCK TABLES has ended. "
++     "currently running queries using explicit LOCK TABLES has ended. "
+      "If there are still such queries when the timeout expires, mariadb-backup "
+      "terminates with an error. Default is 0, in which case mariadb-backup waits "
+      "indefinitely for BACKUP STAGE START to finish",
+@@ -5622,7 +5622,7 @@ void CorruptedPages::backup_fix_ddl(ds_c
+ 	}
+ 
+ 	/* Mariabackup doesn't detect any FILE_OP for the deferred
+-	tablespace. There is a possiblity that page0 could've
++	tablespace. There is a possibility that page0 could've
+ 	been corrupted persistently in the disk */
+ 	for (auto space_name: defer_space_names) {
+ 		if (!check_if_skip_table(space_name.c_str())) {
+--- a/support-files/mysql.server.sh
++++ b/support-files/mysql.server.sh
+@@ -194,7 +194,7 @@ su_kill() {
+ 
+ #
+ # Read defaults file from 'basedir'.   If there is no defaults file there
+-# check if it's in the old (depricated) place (datadir) and read it from there
++# check if it's in the old (deprecated) place (datadir) and read it from there
+ #
+ 
+ extra_args=""
diff --git a/debian/patches/hurd-i386-plugin_disks_information_schema_disks.cc.patch b/debian/patches/hurd-i386-plugin_disks_information_schema_disks.cc.patch
new file mode 100644
index 00000000..ca5b669a
--- /dev/null
+++ b/debian/patches/hurd-i386-plugin_disks_information_schema_disks.cc.patch
@@ -0,0 +1,19 @@
+Forwarded: no
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
+Author: Svante Signell <svante.signell@gmail.com>
+Subject: Bug#1069094: mariadb: FTBFS on hurd-i386
+
+Define PATH_MAX if not defined.
+
+--- a/plugin/disks/information_schema_disks.cc
++++ b/plugin/disks/information_schema_disks.cc
+@@ -32,6 +32,9 @@
+ #include <sys/mntent.h>
+ #endif
+ #endif
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
+ #include <sql_class.h>
+ #include <sql_i_s.h>
+ #include <sql_acl.h>                            /* check_global_access() */
diff --git a/debian/patches/hurd-i386-storage_connect_ioapi.h.patch b/debian/patches/hurd-i386-storage_connect_ioapi.h.patch
new file mode 100644
index 00000000..75cd7dfa
--- /dev/null
+++ b/debian/patches/hurd-i386-storage_connect_ioapi.h.patch
@@ -0,0 +1,22 @@
+Forwarded: no
+Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1069094
+Author: Svante Signell <svante.signell@gmail.com>
+Subject: Bug#1069094: mariadb: FTBFS on hurd-i386
+
+Add Hurd to define __USE_FILE_OFFSET64 et al.
+
+--- a/storage/connect/ioapi.h
++++ b/storage/connect/ioapi.h
+@@ -21,9 +21,10 @@
+ #ifndef _ZLIBIOAPI64_H
+ #define _ZLIBIOAPI64_H
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined (__GNU__)
+ 
+-  // Linux needs this to support file operation on files larger then 4+GB
++  // Linux and Hurd needs this to support file operation on files larger
++  // than 4+GB.
+   // But might need better if/def to select just the platforms that needs them.
+ 
+         #ifndef __USE_FILE_OFFSET64
diff --git a/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch b/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch
index 1034f8c6..eeb91cc7 100644
--- a/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch
+++ b/debian/patches/mroonga-mrn-lib-dirs-path-reproducible-build.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] cmake: add support for reproducible buildS
  We can use target without breaking reproducibility.
 --- a/storage/mroonga/CMakeLists.txt
 +++ b/storage/mroonga/CMakeLists.txt
-@@ -209,7 +209,7 @@ set(MYSQL_INCLUDE_DIRS
+@@ -214,7 +214,7 @@ set(MYSQL_INCLUDE_DIRS
  
  if(MRN_BUNDLED)
    set(MYSQL_PLUGIN_DIR "${INSTALL_PLUGINDIR}")
@@ -18,7 +18,7 @@ Subject: [PATCH] cmake: add support for reproducible buildS
    set(MYSQL_CFLAGS "${CMAKE_C_FLAGS}")
    set(MYSQL_VERSION "${MYSQL_BASE_VERSION}")
  else()
-@@ -248,15 +248,11 @@ endif()
+@@ -253,15 +253,11 @@ endif()
  
  if(MRN_GROONGA_BUNDLED)
    set(GROONGA_INCLUDE_DIRS "${MRN_BUNDLED_GROONGA_DIR}/include")
diff --git a/debian/patches/series b/debian/patches/series
index 69ef5c47..d1a6925a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,15 +4,11 @@ env-perl-usr-bin-perl.patch
 fix-spelling-rocksdb.patch
 fix-reproducible-builds-rocksdb.patch
 mroonga-mrn-lib-dirs-path-reproducible-build.patch
-2129-new-script-wsrep-sst-backup-fixes.patch
 2541-fix-stack-overflow-in-pinbox-allocator.patch
 fix-spelling-libmariadb.patch
-2980-riscv-use-rdtime.patch
 install-files-into-usr.patch
 1006531-hurd-no-auth-socket.patch
-3039-os-data-file-no-o-direct.patch
-1063738-revert-c432c9ef.patch
-MDEV-32975-chartset-collation-fix-php.patch
 startup-message.patch
 fix-spelling-mariadb.patch
-3154-openssl-alert-protocol-string.patch
+hurd-i386-plugin_disks_information_schema_disks.cc.patch
+hurd-i386-storage_connect_ioapi.h.patch
diff --git a/debian/patches/startup-message.patch b/debian/patches/startup-message.patch
index 27b86b3d..6b8bbce7 100644
--- a/debian/patches/startup-message.patch
+++ b/debian/patches/startup-message.patch
@@ -27,7 +27,7 @@ Server output if build in git directory:
 
 --- a/client/mysql.cc
 +++ b/client/mysql.cc
-@@ -1326,6 +1326,9 @@ int main(int argc,char *argv[])
+@@ -1328,6 +1328,9 @@ int main(int argc,char *argv[])
              mysql_thread_id(&mysql), server_version_string(&mysql));
      put_info((char*) glob_buffer.ptr(),INFO_INFO);
      put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
@@ -39,16 +39,16 @@ Server output if build in git directory:
  #ifdef HAVE_READLINE
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -4983,12 +4983,21 @@ static int init_server_components()
-   proc_info_hook= set_thd_stage_info;
+@@ -4985,12 +4985,21 @@ static int init_server_components()
+   my_sleep_for_space= mariadb_sleep_for_space;
  
    /*
--    Print source revision hash, as one of the first lines, if not the
--    first in error log, for troubleshooting and debugging purposes
-+    Print source revision hash, if set, for troubleshooting and debugging
-+     purposes. If not, suggest database adming to help project by giving a
-+     star on GitHub.
-   */
+-    Print source revision hash, as one of the first lines, if not the
+-    first in error log, for troubleshooting and debugging purposes
++    Print source revision hash, if set, for troubleshooting and debugging
++    purposes. If not, suggest database adming to help project by giving a
++    star on GitHub.
+   */
 -  if (!opt_help)
 -    sql_print_information("Starting MariaDB %s source revision %s as process %lu",
 -                          server_version, SOURCE_REVISION, (ulong) getpid());