Sync from SUSE:SLFO:Main mariadb revision 49a8fa341a70c8f8638976b16ea135d7

mariadb-10.11.10.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmcjhmcACgkQ8WVvJMdM
+0dhqUhAAtdExNgkcdt9OlYb/u7EY+BwsHXg997C1Jydx43hQgiwqQi9vAfW08Pq7
+Fe2IOufervLgNjUEo06EHnz8Dnvz5xU0eTN9MNhznqy21IA4HoMb8iGcS8hngVqk
+D+5dOokRnVgI7+VSmZD4RADRglgZLTsMLFwSbbvGYjM1VGe1l/s46IdkOWm0Qi7h
+eC9tLmfyLgjR0ZOolMCaZ67MtMsxv18J9yk1gvchrl0Znn9kJrSd8P0VMcTpqtea
+AkIKeKcfAwB0a4XZLb+a9JFNNnXP0D1tGKpmcQU29vXL673Bfwu73bAv7nZIIo+x
+hWN2n+IQvVZ5Mp+DIKru7FNb45S7wECJ2l+ftUNRWzGc9sliOZqhpuicG7IzsOdm
+8zxhE/Dm8GjSoqjZZZhr59Nt7Fl9+L/GK/XbDdfuQ/aTwi9K39N5EsNsiJMyWJLc
+9aCPIdV9BD61r75rljeN5hqrN9wOdJ5sHxNlH3zBdRk5XcYfWYT6gfsGp3n93Ij+
+sFZ+RH2wwbYPqmliHCayZTbRR6BRTyP+Ty/YxOc+GGMmRe55/VuW1BZY02SyFxsa
+VtmLSCxpYmWfLe54b/O+Y+ItwsR9vtAiNYK1bkRUlqLg84p17+JufEwfG9VGJ5mt
+dBKtFfK2+vpMghzIcrlKl+Mj7jkXE2KLYQULa+XW+MWbbV9chgE=
+=XX3l
+-----END PGP SIGNATURE-----

mariadb-10.11.3.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmRY9DIACgkQ8WVvJMdM
-0djOkxAAjx9FHxvD1vurtHnYgR0tRXb3dESu5OzBlmkKCxKVGtt6h9m0zNjNKJla
-dqTbsUMLkocPL0LLzCAajfhtAuhNBFV+BXu+oFsxMZ6BxyE4K2nu0Z8oxEkKRB2o
-BAQguEKlqB72CGU1mjGh2Mmnhez1rnFlvGLkXlefstoROn6giOpngsSo42yIAbve
-pezZ1PrhFlOLokFONC5+xR48K4FbxLBncIjqF+OvQhtS9QLFquLXH5fY1xr7Sn+w
-9i6YFx/9uf8xfrpsqWoE5m4wUGEE5iKnUlcYZuVqI8mNi+kTJ1L2wutGgtwNiXN1
-dnMfxJszDjStgUVItsKV9OHi85Sd+c4Ttf9KQcvArh6I37LvEB5dG7CHvl6/s8e1
-RBORcl364gHF6lvua/Kix03SAjor+3Di2ki1HR2eSyiY0pWWOul2OB73JSOkf49I
-/w+qlyZXvviq+WM0So+LDmdH86JK4bmmCFIsiGE2tNiB7rXyaJghHfIzRavLmpkJ
-fH5i5erf2bQvJ5gvXkUr1paUVf31Ko0tPGdvtADyzEQgKwfBsoG0bSKWEJBqGpqj
-XGVlvsk9jrRRLIJL1Zi1gqc1hcZ8G/AIYzxOZRDEtdnLs/l5o2i3W3S6Udpwa1nx
-4v0bGXVxCShEB91EQvWriZikn1K2C/xr/SGLtMRDkAMOskcQIDM=
-=VaWA
------END PGP SIGNATURE-----

mariadb-10.2.4-fortify-and-O.patch

@@ -5,15 +5,15 @@ 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
-@@ -242,7 +242,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")
 -  MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
  ENDIF()
  
- INCLUDE(wsrep)
+ OPTION(WITH_DBUG_TRACE "Enable DBUG_ENTER()/DBUG_RETURN()/DBUG_PRINT()" ON)

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,10 +1,10 @@
-Index: mariadb-10.4.12/scripts/mysql_install_db.sh
+Index: b/scripts/mysql_install_db.sh
 ===================================================================
---- mariadb-10.4.12.orig/scripts/mysql_install_db.sh
+--- a/scripts/mysql_install_db.sh
-+++ mariadb-10.4.12/scripts/mysql_install_db.sh
++++ b/scripts/mysql_install_db.sh
-@@ -482,20 +482,22 @@ if test -n "$user"
+@@ -487,20 +487,22 @@ if test -n "$user"
  then
-   if test -z "$srcdir" -a "$in_rpm" -eq 0
+   if test -z "$srcdir" -a "$in_rpm" -eq 0 -a -d "$pamtooldir/auth_pam_tool_dir"
    then
 -    chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
 -    chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"

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.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Mon Nov  4 13:21:07 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Update to 10.11.10:
+  * release notes and changelog:
+    https://mariadb.com/kb/en/mariadb-10-11-10-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-10-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-9-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-9-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-8-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-8-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-7-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-7-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-6-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-6-changelog/
+    https://mariadb.com/kb/en/mariadb-10-11-5-release-notes/
+    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:
+    10.11.4: none
+    10.11.5: none
+    10.11.6: CVE-2023-22084 (bsc#1217405)
+    10.11.7: none
+    10.11.8: CVE-2024-21096 (bsc#1225983)
+    10.11.9: none
+    10.11.10: 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
+
 -------------------------------------------------------------------
 Mon Jun  5 08:16:57 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
 

mariadb.spec

@@ -52,7 +52,7 @@
 # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
 %define with_cracklib_plugin 0
 Name:           mariadb
-Version:        10.11.3
+Version:        10.11.10
 Release:        0
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@@ -353,8 +353,8 @@ 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 {} \;
-%patch1
+%patch1 -p1
-%patch4
+%patch4 -p1
 %patch6 -p1
 %patch7 -p1
 %if 0%{?suse_version} > 1500

suse_skipped_tests.list

@@ -116,4 +116,16 @@ rpl.rpl_change_master_demote                     : since 10.10.2 - all
 rpl.rpl_rewrite_db_sys_vars                      : since 10.11.2 - all
 
 unit.aes                                         : since 10.11.3 - s390x
+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
 
+mariabackup.full_backup                          : since 10.11.6 - ppc64le
+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.having_cond_pushdown                        : since 10.11.9 - s390x
+innodb.log_file_name                             : since 10.11.10 - all
+main.connect                                     : since 10.11.10 - all