Update mariadb to version 10.11.3 / rev 131 via SR 1088818

https://build.opensuse.org/request/show/1088818 by user dspinella + dimstar_suse
bmwiedemann · May 26, 2023 · ef2bd72 · ef2bd72
1 parent 44a9fcc
commit ef2bd72
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 44 deletions.
diff --git a/packages/m/mariadb/.files b/packages/m/mariadb/.files
diff --git a/packages/m/mariadb/.rev b/packages/m/mariadb/.rev
@@ -1864,4 +1864,12 @@ See http://lists.opensuse.org/opensuse-factory/2013-01/msg00544.html for more co
     <comment></comment>
     <requestid>1070141</requestid>
   </revision>
+  <revision rev="131" vrev="1">
+    <srcmd5>2850d7a3c28993ce49735f0bb1718b09</srcmd5>
+    <version>10.11.3</version>
+    <time>1685124862</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>1088818</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/m/mariadb/gcc13-fix.patch b/packages/m/mariadb/gcc13-fix.patch
@@ -1,7 +1,7 @@
-diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-index 963c1d8e..73487edd 100644
---- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+Index: mariadb-10.11.3/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+===================================================================
+--- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
++++ mariadb-10.11.3/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
 @@ -5,6 +5,7 @@
 
  #pragma once
@@ -10,10 +10,10 @@ index 963c1d8e..73487edd 100644
  #include "rocksdb/rocksdb_namespace.h"
 
  struct CompactionIterationStats {
-diff --git a/storage/rocksdb/rocksdb/env/composite_env_wrapper.h b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
-index fbc0b93f..e10d617b 100644
---- a/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
-+++ b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
+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
@@ -22,10 +22,10 @@ index fbc0b93f..e10d617b 100644
  #include "rocksdb/env.h"
  #include "rocksdb/file_system.h"
 
-diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-index c7f93b4c..3c2ab805 100644
---- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+Index: mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+===================================================================
+--- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
++++ mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
 @@ -8,6 +8,7 @@
  #pragma once
  #ifndef ROCKSDB_LITE
@@ -34,10 +34,10 @@ index c7f93b4c..3c2ab805 100644
  #include <string>
  #include <vector>
  #include "rocksdb/status.h"
-diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
-index f356395f..6eaf7173 100644
---- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
-+++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+Index: mariadb-10.11.3/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
++++ mariadb-10.11.3/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
 @@ -7,6 +7,7 @@
 
  #include <string>
@@ -46,10 +46,10 @@ index f356395f..6eaf7173 100644
 
  #include "rocksdb/slice.h"
 
-diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h
-index a761be66..2e57eda2 100644
---- a/storage/rocksdb/rocksdb/util/string_util.h
-+++ b/storage/rocksdb/rocksdb/util/string_util.h
+Index: mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
+===================================================================
+--- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/util/string_util.h
++++ mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
 @@ -10,6 +10,7 @@
  #include <string>
  #include <unordered_map>
@@ -58,12 +58,12 @@ index a761be66..2e57eda2 100644
 
  #include "rocksdb/rocksdb_namespace.h"
 
-diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc
-index 5d01c588..90888622 100644
---- a/tpool/aio_linux.cc
-+++ b/tpool/aio_linux.cc
-@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
- # include <atomic>
+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>

diff --git a/packages/m/mariadb/mariadb-10.11.2.tar.gz b/packages/m/mariadb/mariadb-10.11.2.tar.gz
diff --git a/packages/m/mariadb/mariadb-10.11.2.tar.gz.asc b/packages/m/mariadb/mariadb-10.11.2.tar.gz.asc
diff --git a/packages/m/mariadb/mariadb-10.11.3.tar.gz b/packages/m/mariadb/mariadb-10.11.3.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeichb5hon42xgf2aw5bewtebam24ioznruehvvvip7p5ji3yejzc3q
diff --git a/packages/m/mariadb/mariadb-10.11.3.tar.gz.asc b/packages/m/mariadb/mariadb-10.11.3.tar.gz.asc
@@ -0,0 +1,16 @@
+-----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-----
diff --git a/packages/m/mariadb/mariadb.changes b/packages/m/mariadb/mariadb.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue May 23 13:33:46 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Refresh gcc13-fix.patch
+- Update to 10.11.3:
+  * release notes and changelog:
+    https://mariadb.com/kb/en/mariadb-10-11-3-release-notes/
+    https://mariadb.com/kb/en/mariadb-10-11-3-changelog/
+  * fixes for the following security vulnerabilities:
+    10.11.3: CVE-2022-47015 (bsc#1207404)
+
 -------------------------------------------------------------------
 Wed Mar  8 10:28:23 UTC 2023 - Martin Liška <mliska@suse.cz>
 

diff --git a/packages/m/mariadb/mariadb.spec b/packages/m/mariadb/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.2
+Version:        10.11.3
 Release:        0
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception