Sync changes to SLFO-1.2 branch

OBS-URL: https://build.opensuse.org/request/show/1283657
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=149

_constraints

@@ -13,6 +13,7 @@
       <arch>i586</arch>
       <arch>x86_64</arch>
       <arch>aarch64</arch>
+      <arch>ppc64le</arch>
       <arch>ppc</arch>
     </conditions>
     <hardware>
@@ -21,16 +22,4 @@
       </physicalmemory>
     </hardware>
   </overwrite>
-
-  <overwrite>
-    <conditions>
-      <arch>ppc64le</arch>
-      <arch>s390x</arch>
-    </conditions>
-    <hardware>
-      <physicalmemory>
-        <size unit="G">16</size>
-      </physicalmemory>
-    </hardware>
-  </overwrite>
 </constraints>

func_math_tests_MDEV-26645.diff

@@ -0,0 +1,71 @@
+https://jira.mariadb.org/browse/MDEV-26645
+
+Some func_math tests are expected to fail with ER_DATA_OUT_OF_RANGE, but "succeed" (with mathematically wrong results) on s390x and ppc64.
+
+Adjust these tests and their expected result so that the build can succeed nevertheless.
+
+(Remove this patch when the upstream bug is fixed.)
+
+
+Index: mysql-test/main/func_math.test
+===================================================================
+--- mysql-test/main/func_math.test.orig	2021-08-03 16:48:39.000000000 +0200
++++ mysql-test/main/func_math.test	2021-10-31 00:25:19.780437063 +0200
+@@ -421,7 +421,6 @@ SELECT -2 + CAST(1 AS UNSIGNED);
+ SELECT CAST(1 AS UNSIGNED) + -2;
+ --error ER_DATA_OUT_OF_RANGE
+ SELECT -9223372036854775808 + -9223372036854775808;
+---error ER_DATA_OUT_OF_RANGE
+ SELECT 9223372036854775807 + 9223372036854775807;
+ 
+ --error ER_DATA_OUT_OF_RANGE
+@@ -438,7 +437,6 @@ SELECT -1 - 9223372036854775808;
+ SELECT -1 - CAST(1 AS UNSIGNED);
+ --error ER_DATA_OUT_OF_RANGE
+ SELECT -9223372036854775808 - 1;
+---error ER_DATA_OUT_OF_RANGE
+ SELECT 9223372036854775807 - -9223372036854775808;
+ 
+ # To test SIGNED overflow when subtraction arguments are both UNSIGNED
+@@ -449,7 +447,6 @@ SELECT 18446744073709551615 - 1;
+ SELECT 18446744073709551615 - CAST(1 AS UNSIGNED);
+ --error ER_DATA_OUT_OF_RANGE
+ SELECT 18446744073709551614 - (-1);
+---error ER_DATA_OUT_OF_RANGE
+ SELECT 9223372036854775807 - -1;
+ set SQL_MODE=default;
+ 
+Index: mysql-test/main/func_math.result
+===================================================================
+--- mysql-test/main/func_math.result.orig	2021-08-03 16:48:39.000000000 +0200
++++ mysql-test/main/func_math.result	2021-10-31 09:22:47.195407958 +0100
+@@ -629,7 +629,8 @@ ERROR 22003: BIGINT UNSIGNED value is ou
+ SELECT -9223372036854775808 + -9223372036854775808;
+ ERROR 22003: BIGINT value is out of range in '-9223372036854775808 + -9223372036854775808'
+ SELECT 9223372036854775807 + 9223372036854775807;
+-ERROR 22003: BIGINT value is out of range in '9223372036854775807 + 9223372036854775807'
++9223372036854775807 + 9223372036854775807
++-2
+ SELECT CAST(0 AS UNSIGNED) - 9223372036854775809;
+ ERROR 22003: BIGINT UNSIGNED value is out of range in 'cast(0 as unsigned) - 9223372036854775809'
+ SELECT 9223372036854775808 - 9223372036854775809;
+@@ -645,7 +646,8 @@ ERROR 22003: BIGINT UNSIGNED value is ou
+ SELECT -9223372036854775808 - 1;
+ ERROR 22003: BIGINT value is out of range in '-9223372036854775808 - 1'
+ SELECT 9223372036854775807 - -9223372036854775808;
+-ERROR 22003: BIGINT value is out of range in '9223372036854775807 - -9223372036854775808'
++9223372036854775807 - -9223372036854775808
++-1
+ set SQL_MODE='NO_UNSIGNED_SUBTRACTION';
+ SELECT 18446744073709551615 - 1;
+ ERROR 22003: BIGINT value is out of range in '18446744073709551615 - 1'
+@@ -654,7 +656,8 @@ ERROR 22003: BIGINT value is out of rang
+ SELECT 18446744073709551614 - (-1);
+ ERROR 22003: BIGINT value is out of range in '18446744073709551614 - -1'
+ SELECT 9223372036854775807 - -1;
+-ERROR 22003: BIGINT value is out of range in '9223372036854775807 - -1'
++9223372036854775807 - -1
++-9223372036854775808
+ set SQL_MODE=default;
+ SELECT 4294967296 * 4294967296;
+ ERROR 22003: BIGINT value is out of range in '4294967296 * 4294967296'

gcc13-fix.patch

@@ -1,19 +1,7 @@
-Index: mariadb-10.11.3/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+Index: b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
 ===================================================================
---- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+--- a/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
-+++ mariadb-10.11.3/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
++++ b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
-@@ -5,6 +5,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include "rocksdb/rocksdb_namespace.h"
- 
- struct CompactionIterationStats {
-Index: mariadb-10.11.3/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
-===================================================================
---- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
-+++ mariadb-10.11.3/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
 @@ -5,6 +5,7 @@
  
  #pragma once
@@ -21,11 +9,11 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
 +#include <cstdint>
  #include "rocksdb/env.h"
  #include "rocksdb/file_system.h"
- 
+ #include "rocksdb/system_clock.h"
-Index: mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+Index: b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
 ===================================================================
---- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-+++ mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
++++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
 @@ -8,6 +8,7 @@
  #pragma once
  #ifndef ROCKSDB_LITE
@@ -34,10 +22,10 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpo
  #include <string>
  #include <vector>
  #include "rocksdb/status.h"
-Index: mariadb-10.11.3/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+Index: b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
 ===================================================================
---- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
-+++ mariadb-10.11.3/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
 @@ -7,6 +7,7 @@
  
  #include <string>
@@ -46,10 +34,10 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/table/block_based/data_block_hash
  
  #include "rocksdb/slice.h"
  
-Index: mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
+Index: b/storage/rocksdb/rocksdb/util/string_util.h
 ===================================================================
---- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/util/string_util.h
+--- a/storage/rocksdb/rocksdb/util/string_util.h
-+++ mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
++++ b/storage/rocksdb/rocksdb/util/string_util.h
 @@ -10,6 +10,7 @@
  #include <string>
  #include <unordered_map>
@@ -58,15 +46,3 @@ Index: mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
  
  #include "rocksdb/rocksdb_namespace.h"
  
-Index: mariadb-10.11.3/tpool/aio_linux.cc
-===================================================================
---- mariadb-10.11.3.orig/tpool/aio_linux.cc
-+++ mariadb-10.11.3/tpool/aio_linux.cc
-@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- # include <cstdio>
- # include <libaio.h>
- # include <sys/syscall.h>
-+# include <cstdio>
- 
- /**
-   Invoke the io_getevents() system call, without timeout parameter.

macros.mariadb-test

@@ -57,7 +57,7 @@ mysql_install_db --defaults-file=$TEST_RUN_DIR/my.cnf \
 \
 echo '>>> Invoking mysqld' \
 /usr/sbin/mysqld --defaults-file=$TEST_RUN_DIR/my.cnf& \
-sleep 2 \
+sleep 10 \
 \
 echo ">>> Creating \'$TEST_DB\' database, (credentials: $TEST_USER, $TEST_PASS)" \
 mysqladmin       --defaults-file=$TEST_RUN_DIR/my.cnf --user=abuild password abuildpw \

mariadb-10.2.4-fortify-and-O.patch

@@ -5,11 +5,11 @@ conflicts like FORTIFY and -O0. Removing hardcoded options.
 
 Maintainer: Michal Hrusecky <mhrusecky@suse.cz>
 
-Index: CMakeLists.txt
+Index: b/CMakeLists.txt
 ===================================================================
---- CMakeLists.txt.orig
+--- a/CMakeLists.txt
-+++ CMakeLists.txt
++++ b/CMakeLists.txt
-@@ -263,7 +263,6 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN A
+@@ -262,7 +262,6 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN A
    MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC")
    MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now")
    MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4")

mariadb-10.2.4-logrotate.patch

@@ -5,11 +5,11 @@ In SUSE we've got MySQL log in different directory. It's located in
 
 Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org>
 
-Index: support-files/mariadb.logrotate.sh
+Index: b/support-files/mariadb.logrotate.sh
 ===================================================================
---- support-files/mariadb.logrotate.sh.orig
+--- a/support-files/mariadb.logrotate.sh
-+++ support-files/mariadb.logrotate.sh
++++ b/support-files/mariadb.logrotate.sh
-@@ -32,6 +32,14 @@
+@@ -54,6 +54,14 @@
      then
        @bindir@/mariadb-admin $EXTRAPARAM --local flush-error-log \
          flush-engine-log flush-general-log flush-slow-log

mariadb-10.4.12-fix-install-db.patch

@@ -1,8 +1,8 @@
-Index: mariadb-10.4.32/scripts/mysql_install_db.sh
+Index: b/scripts/mysql_install_db.sh
 ===================================================================
---- mariadb-10.4.32.orig/scripts/mysql_install_db.sh
+--- a/scripts/mysql_install_db.sh
-+++ mariadb-10.4.32/scripts/mysql_install_db.sh
++++ b/scripts/mysql_install_db.sh
-@@ -494,20 +494,22 @@ if test -n "$user"
+@@ -487,20 +487,22 @@ if test -n "$user"
  then
    if test -z "$srcdir" -a "$in_rpm" -eq 0 -a -d "$pamtooldir/auth_pam_tool_dir"
    then

mariadb-10.4.12-harden_setuid.patch

@@ -2,11 +2,11 @@ SUSE specific patch that hardens the auth_pam_tool setuid-root binary.
 Matthias Gerstner wants it as a prerequisite for allowing auth_pam_tool
 setuid-root binary in [bsc#1160285].
 
-Index: mariadb-10.4.12/plugin/auth_pam/auth_pam_base.c
+Index: b/plugin/auth_pam/auth_pam_base.c
 ===================================================================
---- mariadb-10.4.12.orig/plugin/auth_pam/auth_pam_base.c
+--- a/plugin/auth_pam/auth_pam_base.c
-+++ mariadb-10.4.12/plugin/auth_pam/auth_pam_base.c
++++ b/plugin/auth_pam/auth_pam_base.c
-@@ -149,6 +149,12 @@ static int pam_auth_base(struct param *p
+@@ -150,6 +150,12 @@ static int pam_auth_base(struct param *p
    const char *service = info->auth_string && info->auth_string[0]
                            ? info->auth_string : "mysql";
  

mariadb-11.5.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e25fac00aeb34610faf62182836a14e3310c0ca5d882e9109f63bd8dfdc3542d
-size 108221481

mariadb-11.5.2.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmaxf6gACgkQ8WVvJMdM
-0diboxAA7mHaK3gKRt0Ghko+HeQqhyDovPBSaxM+Z/2SY3KxHSbkzVLnMSOVn4Wy
-Jj4dHBDRTpZqBmLep5Xi0qgYRoiVaUC4hBmk4oAD7rRRLSf3LYVTHtst5HZeIRMm
-XuP/+egoP/Jb6C14cZilzB7nEc31mNpCqhARShm2fQmZ+SuKBoiUrYfNKH4/fqd2
-KbOCWxigitOieWKPUMk+g+qBa2ETbWOzcWvhECeavLJ+kgGIm43KRJ17lyHlBbFR
-Cey/XHfVrdpCmV9uqJectnfnXTFqZ/uxINMKMyX2I53tB7oNBzGa4feOwqhlQiUd
-raiaCdbit7fs1ud9yDDW41gJzopR7i/X2PRWk7w+zl8ioNiCu/KlSOs2naPeCzez
-dRbNxU8Samjey8uprXMyioAsrX8gv7al/eFVqgxxCumc3nO7Umpmi2tHvWx+B98T
-8HEbY7p31qCxk+fkwqcZc03g1p2XcxsfVb5jzzYxjk08g3zZAIueDab9umViIPBH
-S0JYwUbm0bktUW5E3qaMEh9UA6Tu8L2b9q+eESRllYqNsB3mU5ik6gLBd8Ly5GQ4
-UTKRq+oYjqZt9X7m1jQJ9IdIQtwMfxhDJa0mPvekB8abT80CuzXwStYvA9n1QMas
-QgRhRpG2yoCoL/u5BwtjvyzPKYTYvC/jc8pk/A+CJCgFHTAC4o8=
-=fqEG
------END PGP SIGNATURE-----

mariadb-11.8.2.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmg2Y8YACgkQ8WVvJMdM
+0djHsg/+IPOZ+SFaNdls2979ouHjDxIzD6e0LhJjfZl0EszCFXvTgAMzV6hylPiZ
+e9e6a9vpKpzvJO7rXwKfx7i6BUMOCqFtWW3HfaULb3U8X8OciJeRT6sQH2HT5+fb
+EcNn0/kZ/j5bVnQaHRIYshN+qUit7L+SqpAsrQLdFQrabF7+GlnFR25hwLw5JNCi
+L2kKFYC7hPkgyiQ1KkCG45HM9gJnvsmqQUxMoTuHQUVbMszjYeCfVfGFoVItOx9C
+sreA+Wtc59HCA1YivEp+zI6nPCEHCkojrk/Eqf7SsW2qpJSeOk4hUcc82y7gD+jm
+PUT+io5WOXRLawckxSjIllNZ2JLutI6mPdflLNhIDxXd1uvHnVFrcvy4qIw/QWHe
+zxGbPotHWJiIJYtWp+DEE9V9+HRUBdIuqrNxJKce+E5X0tAkjGBZFeHNr7J0aAcw
+Ct9ZoQJtrrtL6aDXDiWXNoVIZLvU5wo9y90y2KEJ2EkOgajmZI9n74UUtTfFmfAJ
+IwCA77Rk5dy3Df9cloADrspaM08l/P7nMhL3yJzdITOJEMtjtnCwj6WSLt0tLEmA
+oQNpXsHDnLnVl5wWgKtm004QPGrsXyQkg0xk/WGKUf1xIyz3LD2ZorpGeuLRsSJb
+TUevOlCQr1YUi3sVrtw/oISDNLT6aokoANJyHbzywrzY21M3UHQ=
+=GKb5
+-----END PGP SIGNATURE-----

mariadb.changes

@@ -1,116 +1,163 @@
 -------------------------------------------------------------------
-Tue Aug 20 17:00:30 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+Fri Jul  4 12:45:45 UTC 2025 - pgajdos@suse.com
 
-- Update to 11.5.2:
+- %check: increase delay between server invocation and its usage
-    https://mariadb.com/kb/en/mariadb-11-5-2-release-notes/
+  in %mysql_testserver_start rpm macro [bsc#1244014] 
-    https://mariadb.com/kb/en/mariadb-11-5-2-changelog/
+- modified sources
+  % macros.mariadb-test
+
+-------------------------------------------------------------------
+Thu Jun  5 17:11:37 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 11.8.2:
+    https://mariadb.com/kb/en/mariadb-11-8-2-release-notes/
+    https://mariadb.com/kb/en/mariadb-11-8-2-changelog/
+- Remove patch included in upstream release
+  * pcre2-1045-fix_MDEV-36078.patch
+- Refresh gcc13-fix.patch
 - Update list of skipped tests
 
 -------------------------------------------------------------------
-Sun Jul 14 13:28:44 UTC 2024 - Sarah Kriesch <sarah.kriesch@opensuse.org>
+Sun Jun  1 10:58:37 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
 
-- Remove func_math_tests_MDEV-26645.diff as patch for s390x/ppc64le
+- Add patch pcre2-1045-fix_MDEV-36078.patch:
-- Add s390x to the constraints file
+  * Fixes build with pcre2 10.45 and higher (bsc#1243739) 
 
 -------------------------------------------------------------------
-Tue Jun 18 20:39:59 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+Tue May  6 17:52:00 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
 
-- Remove errmsg-utf8.txt from mariadb-errormessages.
+- Update skipped test list
-  * The file was only used for generating .sys files and isn't needed
+  * Fixes builds for aarch64 (bsc#1239556)
-    in the package.
 
 -------------------------------------------------------------------
-Thu May 30 12:48:55 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
+Mon Apr 28 19:43:48 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
 
-- Update to 11.4.2:
+- Use %patch -P N notation to fix build with rpm 4.20. (bsc#1240154) 
-    https://mariadb.com/kb/en/changes-improvements-in-mariadb-11-4/
+
-    https://mariadb.com/kb/en/changes-improvements-in-mariadb-11-3/
+-------------------------------------------------------------------
+Mon Apr 28 18:32:26 UTC 2025 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
+
+- Fix galera condition in SLFO
+- Fix exclude list for galera-related files when galera is disabled
+
+-------------------------------------------------------------------
+Tue Apr  8 20:07:05 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 11.4.5:
+    https://mariadb.com/kb/en/mariadb-11-4-5-release-notes/
+    https://mariadb.com/kb/en/mariadb-11-4-5-changelog/
+    https://mariadb.com/kb/en/mariadb-11-4-4-release-notes/
+    https://mariadb.com/kb/en/mariadb-11-4-4-changelog/
+    https://mariadb.com/kb/en/mariadb-11-4-3-release-notes/
+    https://mariadb.com/kb/en/mariadb-11-4-3-changelog/
     https://mariadb.com/kb/en/mariadb-11-4-2-release-notes/
     https://mariadb.com/kb/en/mariadb-11-4-2-changelog/
     https://mariadb.com/kb/en/mariadb-11-4-1-release-notes/
     https://mariadb.com/kb/en/mariadb-11-4-1-changelog/
     https://mariadb.com/kb/en/mariadb-11-4-0-release-notes/
-    https://mariadb.com/kb/en/mariadb-11-4-0-changelog/
+  * fixes for the following security vulnerabilities:
-- Refresh mariadb-10.2.4-fortify-and-O.patch
+    11.4.5: CVE-2025-21490
 - Update list of skipped tests
-
--------------------------------------------------------------------
-Fri Feb 23 11:14:44 UTC 2024 - pgajdos@suse.com
-
-- Use %patch -P N instead of deprecated %patchN.
-
--------------------------------------------------------------------
-Wed Feb 14 10:40:40 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
-
-- Update to 11.2.3:
-    https://mariadb.com/kb/en/mariadb-11-2-3-release-notes/
-    https://mariadb.com/kb/en/mariadb-11-2-3-changelog/
-- Update list of skipped tests
-
--------------------------------------------------------------------
-Mon Nov 27 13:28:45 UTC 2023 - Jiri Slaby <jslaby@suse.cz>
-
 - Fix location of unwanted binaries (which are deleted)
 - Fix location in rpmlintrc
-- Disable LTO on ppc64le due to error
+- drop unknown options, this yields nothing in the sources:
-- constraints: increase memory to 16G on ppc64le, 10G is no longer enough
+  grep -rwE 'WITH_LIBEVENT|WITH_LIBEDIT|WITH_EDITLINE|WITH_XTRADB_STORAGE_ENGINE|WITH_CSV_STORAGE_ENGINE|WITH_HANDLERSOCKET_STORAGE_ENGINE|WITH_INNODB_MEMCACHED|WITH_INNODB_DISALLOW_WRITES|WITH_LIBARCHIVE'
-  (perhaps a linker bug?)
+- set -DWITH_READLINE=OFF as it is a bool (and not =0)  
+- Remove extra compiler flags. These don't seem to be needed anymore
+  and were overwriting predefined flags
 
 -------------------------------------------------------------------
-Wed Nov 22 11:19:45 UTC 2023 - Danilo Spinella <oss@danyspin97.org>
+Thu Aug 15 21:36:38 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
 
-- Update to 11.2.2:
+- Update to 10.11.9:
-    https://mariadb.com/kb/en/mariadb-11-2-2-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-9-release-notes/
-    https://mariadb.com/kb/en/mariadb-11-2-2-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-9-changelog/
-
--------------------------------------------------------------------
-Mon Nov 20 12:16:52 UTC 2023 - Danilo Spinella <oss@danyspin97.org>
-
-- Update to 11.1.3:
-    https://mariadb.com/kb/en/mariadb-11-1-3-release-notes/
-    https://mariadb.com/kb/en/mariadb-11-1-3-changelog/
   * fixes for the following security vulnerabilities:
-    11.1.3: none
+    10.11.9: none
+- Update list of skipped tests
+
+-------------------------------------------------------------------
+Tue May 28 18:18:07 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 10.11.8:
+    https://mariadb.com/kb/en/mariadb-10-11-8-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-8-changelog/
+  * fixes for the following security vulnerabilities:
+    10.11.8: CVE-2024-21096 (bsc#1225983)
+    10.11.7: none
+- Refreshed patches:
+  * mariadb-10.2.4-fortify-and-O.patch
+  * mariadb-10.2.4-logrotate.patch
+  * mariadb-10.4.12-fix-install-db.patch
+  * mariadb-10.4.12-harden_setuid.patch
+- Update list of skipped tests
+
+-------------------------------------------------------------------
+Wed Jan 10 15:26:30 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Update list of skipped tests for ppc64le
+
+-------------------------------------------------------------------
+Wed Nov 22 10:49:22 UTC 2023 - Danilo Spinella <oss@danyspin97.org>
+
+- Update to 10.11.6:
+    https://mariadb.com/kb/en/mariadb-10-11-6-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-6-changelog/
+  * fixes for the following security vulnerabilities:
+    10.11:6: CVE-2023-22084, (bsc#1217405)
 - Refreshed patches:
   * mariadb-10.4.12-fix-install-db.patch
 
 -------------------------------------------------------------------
-Tue Oct 17 15:27:14 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
+Wed Sep 13 10:25:07 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
 
-- Update list of skipped tests
+- update the list of the skipped tests for s390x, fix bsc#1215255
 
 -------------------------------------------------------------------
-Mon Sep 25 13:17:53 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
+Thu Aug 31 14:38:52 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
 
-- Update to 11.1.2:
+- Update to 10.11.5:
-    https://mariadb.com/kb/en/mariadb-11-1-2-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-5-release-notes/
-    https://mariadb.com/kb/en/mariadb-11-1-2-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-5-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-4-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-4-changelog/
   * fixes for the following security vulnerabilities:
-    11.1.2: none
+    10.11.5: none
-- Refresh list of skipped tests
+    10.11.4: none
-
+- Issues that aren't affecting this package:
--------------------------------------------------------------------
+  * CVE-2021-46669
-Wed Sep  6 18:44:22 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+  * CVE-2022-27376 (bsc#1198628)
-
+  * CVE-2022-27377 (bsc#1198603)
-- Workaround build failure with fmt-10: require fmt < 10
+  * CVE-2022-27378 (bsc#1198604)
-
+  * CVE-2022-27379 (bsc#1198605)
--------------------------------------------------------------------
+  * CVE-2022-27380 (bsc#1198606)
-Wed Aug 23 14:20:35 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
+  * CVE-2022-27381 (bsc#1198607)
-
+  * CVE-2022-27382 (bsc#1198609)
-- Update to 11.0.3:
+  * CVE-2022-27383 (bsc#1198610)
-  * release notes and changelog:
+  * CVE-2022-27384 (bsc#1198611)
-    https://mariadb.com/kb/en/mariadb-11-0-3-release-notes/
+  * CVE-2022-27386 (bsc#1198612)
-    https://mariadb.com/kb/en/mariadb-11-0-3-changelog/
+  * CVE-2022-27387 (bsc#1198613)
-  * fixes for the following security vulnerabilities:
+  * CVE-2022-27444 (bsc#1198634)
-    11.0.3: none
+  * CVE-2022-27445 (bsc#1198629)
-
+  * CVE-2022-27446 (bsc#1198630)
--------------------------------------------------------------------
+  * CVE-2022-27447 (bsc#1198631)
-Mon Jun 12 12:42:03 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
+  * CVE-2022-27448 (bsc#1198632)
-
+  * CVE-2022-27449 (bsc#1198633)
-- Update to 11.0.2:
+  * CVE-2022-27451 (bsc#1198639)
-  * release notes and changelog:
+  * CVE-2022-27452 (bsc#1198640)
-    https://mariadb.com/kb/en/mariadb-11-0-2-release-notes/
+  * CVE-2022-27455 (bsc#1198638)
-    https://mariadb.com/kb/en/mariadb-11-0-2-changelog/
+  * CVE-2022-27456 (bsc#1198635)
+  * CVE-2022-27457 (bsc#1198636)
+  * CVE-2022-27458 (bsc#1198637)
+  * CVE-2022-32088 (bsc#1201168)
+  * CVE-2022-32087 (bsc#1201167)
+  * CVE-2022-32086 (bsc#1201166)
+  * CVE-2022-32085 (bsc#1201165)
+  * CVE-2022-32083 (bsc#1201163)
+  * CVE-2022-21427
+  * bsc#1199928
+  * bsc#1195076
+  * jsc#SLE-22245
 
 -------------------------------------------------------------------
 Mon Jun  5 08:16:57 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>

mariadb.spec

@@ -38,7 +38,7 @@
 %endif
 # Build galera on SLE. Galera requires mariadb >= 10.5, so only
 # build it on SLE15SP3 onwards
-%if 0%{?is_opensuse} || 0%{?sle_version} >= 150300
+%if 0%{?is_opensuse} || 0%{?sle_version} >= 150300 || 0%{?suse_version} >= 1600
 %bcond_without galera
 %else
 %bcond_with    galera
@@ -52,14 +52,14 @@
 # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
 %define with_cracklib_plugin 0
 Name:           mariadb
-Version:        11.5.2
+Version:        11.8.2
 Release:        0
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Productivity/Databases/Servers
 URL:            https://www.mariadb.org
-Source:         https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz
+Source:         https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz
-Source1:        https://downloads.mariadb.com/MariaDB/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc
+Source1:        https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Source4:        README.debug
 Source5:        suse-test-run
@@ -78,6 +78,7 @@ Patch1:         mariadb-10.2.4-logrotate.patch
 Patch4:         mariadb-10.2.4-fortify-and-O.patch
 Patch6:         mariadb-10.4.12-harden_setuid.patch
 Patch7:         mariadb-10.4.12-fix-install-db.patch
+Patch9:         func_math_tests_MDEV-26645.diff
 Patch10:        fix-pamdir.patch
 Patch11:        gcc13-fix.patch
 # needed for bison SQL parser and wsrep API
@@ -135,7 +136,7 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Time::HiRes)
 # Do not ever switch away from BuildRequires: pkgconfig(libsystemd); BuildRequires systemd/systemd-devel causes build cycles
 BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(fmt) < 10
+BuildRequires:  pkgconfig(fmt)
 #!BuildIgnore:  user(mysql)
 # Required by rcmysql
 Requires:       %{name}-client
@@ -352,10 +353,15 @@ PAM module.
 %setup -q
 # Remove JAR files from the tarball (used for testing from the source)
 find . -name "*.jar" -type f -exec rm --verbose -f {} \;
-%patch -P 1
+%patch -P 1 -p1
-%patch -P 4
+%patch -P 4 -p1
 %patch -P 6 -p1
 %patch -P 7 -p1
+%if 0%{?suse_version} > 1500
+%ifarch s390x ppc64 ppc64le
+%patch -P 9
+%endif
+%endif
 # usrmerge has only been applied to TW
 %if 0%{?suse_version} > 1500
 %patch -P 10 -p1
@@ -390,22 +396,14 @@ cat %{SOURCE50} | tee -a mysql-test/unstable-tests
 
 %build
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
-EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter"
-# Mariadb devs seems to fall in love with -Werror option
-EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error"
-export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS"
-export CXXFLAGS="$CFLAGS -felide-constructors"
 %cmake -DWITH_SSL=system                                            \
        -DWITH_LIBWRAP=ON                                            \
        -DENABLED_PROFILING=ON                                       \
        -DENABLE_DEBUG_SYNC=OFF                                      \
        -DWITH_PIC=ON                                                \
        -DWITH_ZLIB=system                                           \
-       -DWITH_LIBEVENT=system                                       \
        -DWITH_JEMALLOC=no                                           \
-       -DWITH_READLINE=0                                            \
+       -DWITH_READLINE=OFF                                          \
-       -DWITH_LIBEDIT=0                                             \
-       -DWITH_EDITLINE=system                                       \
        -DINSTALL_LAYOUT=RPM                                         \
        -DWITH_LZ4=system                                            \
        -DMYSQL_UNIX_ADDR="%{_rundir}/mysql/mysql.sock"              \
@@ -427,28 +425,18 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
        -DPLUGIN_ROCKSDB=NO                                          \
 %endif
        -DPYTHON_SHEBANG=%{python_path}                              \
-       -DWITH_XTRADB_STORAGE_ENGINE=1                               \
-       -DWITH_CSV_STORAGE_ENGINE=1                                  \
-       -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1                        \
-       -DWITH_INNODB_MEMCACHED=ON                                   \
        -DWITH_EMBEDDED_SERVER=true                                  \
 %if %{with galera}
        -DWITH_WSREP=ON                                              \
-       -DWITH_INNODB_DISALLOW_WRITES=1                              \
 %endif
-       -DWITH_LIBARCHIVE=ON                                         \
        -DWITH_MARIABACKUP=ON                                        \
        -DCOMPILATION_COMMENT="MariaDB package"                      \
        -DDENABLE_DOWNLOADS=false                                    \
        -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin"               \
        -DINSTALL_LIBDIR_RPM="%{_lib}"                               \
        -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d"              \
-       -DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS"                     \
-       -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS"                 \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo                            \
        -DINSTALL_SQLBENCHDIR=share                                  \
-       -DCMAKE_C_FLAGS="$CFLAGS"                                    \
-       -DCMAKE_CXX_FLAGS="$CXXFLAGS"                                \
        -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \
        -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \
        -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now -Wl,-Bsymbolic -Wl,-Bsymbolic-functions" \
@@ -599,8 +587,8 @@ filelist galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariaback
 touch mariadb-galera-exclude.files
 %else
 filelist_excludes galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan wsrep_sst_backup >mariadb-galera-exclude.files
-echo "%exclude %{_datadir}/mysql/systemd/use_galera_new_cluster.conf" >>mariadb-galera-exclude.files
+echo "%exclude %{_datadir}/mariadb/systemd/use_galera_new_cluster.conf" >>mariadb-galera-exclude.files
-echo "%exclude %{_datadir}/mysql/wsrep_notify" >>mariadb-galera-exclude.files
+echo "%exclude %{_datadir}/mariadb/wsrep_notify" >>mariadb-galera-exclude.files
 %endif
 
 # mariadb-bench.files

suse_skipped_tests.list

@@ -1,7 +1,91 @@
 #----------------------------------------------------------------
-type_test.type_test_double                       : since 10.5.6 - all
 
+# The SSL tests that are failing correctly
+main.ssl_7937                                : bsc#937835, MDEV-8404
+main.ssl_crl                                 : bsc#937835, MDEV-8404
+main.ssl_8k_key                              : bsc#937835, MDEV-8404
+
+# Main and perfschema tests
+main.userstat                                : bsc#937836, MDEV-8446
+perfschema.nesting                           : bsc#937836, MDEV-8446
+perfschema.socket_summary_by_event_name_func : bsc#937836, MDEV-8446
+perfschema.socket_summary_by_instance_func   : bsc#937836, MDEV-8446
+
+# Failing because of "Self Signed Certificate in the Certificate Chain"
+perfschema.cnf_option                        : all
+rpl.rpl_row_img_blobs                        : all MDEV-13875
+rpl.rpl_row_img_eng_min                      : all MDEV-13875
+rpl.rpl_row_img_eng_noblob                   : all MDEV-13875
+
+# The tests of plugins we don't build
+main.plugin_auth                             : since 10.4.10 - all, we don't build mysql_clear_password plugin
+plugins.auth_ed25519                         : since 10.4.10 - all, we don't build client_ed25519 plugin
+plugins.multiauth                            : since 10.4.10 - all, we don't build client_ed25519 plugin
+unit.ed25519                                 : since 10.4.12 - ppc, we don't build client_ed25519 plugin
+
+#----------------------------------------------------------------
+
+# Needs to be investigated (issues trackers will be added)
+sys_vars.slave_parallel_threads_basic            : since 10.3.16 - x86_64, i386, s390x, armv7l, aarch64, ppc64, ppc64le
+main.gis_notembedded                             : since 10.3.16 - x86_64, i386, s390x, armv7l, aarch64, ppc64, ppc64le
+versioning.partition                             : since 10.3.16 - armv7l
+innodb.innodb-page_compression_lzma              : since 10.3.20 - armv7l
+sys_vars.sysvars_wsrep                           : since 10.4.12 - ppc
+rpl.rpl_ip_mix                                   : since 10.4.10 - all
+rpl.rpl_ip_mix2                                  : since 10.4.10 - all
+rpl.rpl_ipv4_as_ipv6                             : since 10.4.10 - all
+rpl.rpl_ipv6                                     : since 10.4.10 - all 
+perfschema.socket_instances_func                 : since 10.4.10 - all 
+main.ipv4_and_ipv6                               : since 10.4.10 - all 
+main.ipv4_as_ipv6                                : since 10.4.10 - all 
+main.ipv6                                        : since 10.4.10 - all 
+main.information_schema                          : since 10.4.10 - all 
+main.system_mysql_db                             : since 10.4.10 - all 
+main.gis_notembedded                             : since 10.4.10 - all 
+funcs_1.is_columns_mysql                         : since 10.4.10 - all 
+sys_vars.tcp_nodelay                             : since 10.4.10 - all
+oqgraph.social                                   : since 10.4.12 - i586 (MDEV-22280)
+main.symlink-myisam-11902                        : since 10.4.13 - i586
+main.ssl_system_ca                               : since 10.4.14 - all
+type_test.type_test_double                       : since 10.5.6 - all
+main.sp2                                         : since 10.5.8 - all
+main.mysqld--help-aria                           : since 10.5.8 - all
+unit.conc_connection                             : since 10.5.8 - all
+main.not_partition                               : since 10.5.8 - aarch64
+period.overlaps                                  : since 10.5.8 - s390x
+perfschema.memory_aggregate_32bit                : since 10.5.8 - s390x
+perfschema.socket_connect                        : since 10.5.8 - s390x
+sys_vars.gtid_ignore_duplicates_grant            : since 10.5.8 - i586
+sys_vars.myisam_stats_method_basic               : since 10.5.8 - i586
+innodb.innodb-page_compression_bzip2             : since 10.5.8 - i586
+sys_vars.read_only_func                          : since 10.5.8 - i586
+sys_vars.big_tables_basic                        : since 10.5.8 - i586
+main.mysql_protocols                             : since 10.5.8 - i586
+sys_vars.max_prepared_stmt_count_func            : since 10.5.8 - i586
+sys_vars.net_read_timeout_basic                  : since 10.5.8 - i586
+sys_vars.key_cache_age_threshold_basic           : since 10.5.8 - i586
+main.upgrade_MDEV-19650                          : since 10.5.8 - x86_64
+main.upgrade_MDEV-23102-1                        : since 10.5.8 - x86_64
+main.upgrade_MDEV-23102-2                        : since 10.5.8 - x86_64
+main.mysql_upgrade_to_100502                     : since 10.5.8 - x86_64
+sys_vars.profiling_history_size_basic            : since 10.5.8 - x86_64
+sys_vars.old_alter_table_basic                   : since 10.5.8 - x86_64
+
+roles.acl_statistics                             : since 10.7.3 - x86_64
+main.stat_tables_innodb                          : since 10.7.3 - x86_64
+main.stat_tables                                 : since 10.7.3 - x86_64
+plugins.feedback_plugin_load                     : since 10.7.3 - x86_64
+main.explain_non_select                          : since 10.7.3 - x86_64
+main.selectivity_no_engine                       : since 10.7.3 - x86_64
 main.mysql_upgrade                               : since 10.7.3 - x86_64
+perfschema.privilege_table_io                    : since 10.7.3 - x86_64
+
+perfschema.threads_mysql                         : since 10.8.3 - x86_64 (MDEV-28674)
+disks.disks                                      : since 10.8.3 - x86_64
+disks.disks_notembedded                          : since 10.8.3 - x86_64
+innodb.row_size_error_log_warnings_3             : since 10.8.3 - s390x
+main.func_json_notembedded                       : since 10.8.3 - s390x, ppc64
+main.func_math                                   : since 10.8.3 - ppc64le
 
 binlog_encryption.rpl_cant_read_event_incident   : since 10.9.2 - all
 rpl.rpl_perfschema_applier_status_by_coordinator : since 10.9.2 - all
@@ -13,39 +97,42 @@ rpl.rpl_report_port                              : since 10.9.2 - all
 rpl.rpl_reset_slave_fail                         : since 10.9.2 - all
 rpl.rpl_domain_id_filter_restart                 : since 10.9.2 - all
 rpl.rpl_upgrade_master_info                      : since 10.9.2 - all
- 
+binlog_encryption.rpl_gtid_basic                 : since 10.9.2 - all
+multi_source.info_logs                           : since 10.9.2 - all
+rpl.rpl_mdev6020                                 : since 10.9.2 - all
+rpl.rpl_semi_sync_wait_point                     : since 10.9.2 - all
+rpl.rpl_err_ignoredtable                         : since 10.9.2 - all
+rpl.rpl_trigger                                  : since 10.9.2 - all
+rpl.rpl_row_img_sequence                         : since 10.9.2 - all
+rpl.rpl_gtid_basic                               : since 10.9.2 - all
+rpl.rpl_old_master                               : since 10.9.2 - all
+main.loadxml                                     : since 10.9.2 - all
+main.lock_kill                                   : since 10.9.2 - all
+innodb.innodb_bug51920                           : since 10.9.2 - all
+rpl.rpl_slave_shutdown_mdev20821                 : since 10.9.2 - all
+
+rpl.rpl_change_master_demote                     : since 10.10.2 - all
+
 rpl.rpl_rewrite_db_sys_vars                      : since 10.11.2 - all
- 
-binlog_encryption.rpl_gtid_basic                 : since 11.1.2 - all
-multi_source.info_logs                           : since 11.1.2 - all
-rpl.rpl_change_master_demote                     : since 11.1.2 - all
-rpl.rpl_mdev6020                                 : since 11.1.2 - all
-rpl.rpl_trigger                                  : since 11.1.2 - all
-rpl.rpl_semi_sync_wait_point                     : since 11.1.2 - all
-rpl.rpl_err_ignoredtable                         : since 11.1.2 - all
-rpl.rpl_old_master                               : since 11.1.2 - all
-rpl.rpl_gtid_basic                               : since 11.1.2 - all
-rpl.rpl_slave_shutdown_mdev20821                 : since 11.1.2 - all
-main.userstat                                    : since 11.1.2 - all
-perfschema.threads_mysql                         : since 11.1.2 - all
-main.information_schema                          : since 11.1.2 - all
-main.ssl_crl                                     : since 11.1.2 - all
-perfschema.nesting                               : since 11.1.2 - all
-perfschema.socket_summary_by_event_name_func     : since 11.1.2 - all
-perfschema.socket_summary_by_instance_func       : since 11.1.2 - all
-main.lock_kill                                   : since 11.1.2 - all
-main.loadxml                                     : since 11.1.2 - all
-sys_vars.tcp_nodelay                             : since 11.1.2 - all
 
-perfschema.show_aggregate                        : since 11.2.3 - all
+unit.aes                                         : since 10.11.3 - s390x
-main.mdev375                                     : since 11.2.3 - all
+mariabackup.encrypted_page_corruption            : since 10.11.5 - s390x
+perfschema.show_aggregate                        : since 10.11.5 - s390x
+mariabackup.huge_lsn                             : since 10.11.5 - s390x
+mariabackup.xb_file_key_management               : since 10.11.5 - s390x
 
-main.func_json_notembedded                       : since 11.2.3 - s390x
+mariabackup.full_backup                          : since 10.11.6 - ppc64le
-mariabackup.encrypted_page_corruption            : since 11.2.3 - s390x
+rpl.rpl_get_lock                                 : since 10.11.8 - all
+main.mdev375                                     : since 10.11.8 - all
+perfschema.threads_innodb                        : since 10.11.8 - x86_64
 
-main.ssl_autoverify                              : since 11.4.2 - all
+main.having_cond_pushdown                        : since 10.11.9 - s390x
-binlog.max_binlog_total_size                     : since 11.4.2 - all
+main.connect                                     : since 11.4.5 - all
-
+main.ssl_cipher                                  : since 11.4.5 - all
-main.mysqld--help-aria                           : since 11.5.2 - all
+main.ssl_autoverify                              : since 11.4.5 - all
-plugins.feedback_plugin_load                     : since 11.5.2 - all
+binlog.max_binlog_total_size                     : since 11.4.5 - all
+unit.conc_async                                  : since 11.4.5 - aarch64
+main.desc_index_min_max                          : since 11.4.5 - aarch64
+main.init_connect                                : since 11.4.5 - all
+plugins.parsec                                   : since 11.6.1 - all