rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 1088792 from home:dspinella:branches:server:database

Browse Source 
- 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)

OBS-URL: https://build.opensuse.org/request/show/1088792
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=308
This commit is contained in:
Danilo Spinella
2023-05-24 10:44:51 +00:00
committed by Git OBS Bridge
parent aa5578ed6d
commit d52809a5d6
7 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
gcc13-fix.patch
View File

@@ -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>