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
Show Stats 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: mariadb-10.11.3/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
index 963c1d8e..73487edd 100644 ===================================================================
--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h --- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+++ b/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 @@ @@ -5,6 +5,7 @@
#pragma once #pragma once
@ -10,10 +10,10 @@ index 963c1d8e..73487edd 100644
#include "rocksdb/rocksdb_namespace.h" #include "rocksdb/rocksdb_namespace.h"
struct CompactionIterationStats { struct CompactionIterationStats {
diff --git 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
index fbc0b93f..e10d617b 100644 ===================================================================
--- a/storage/rocksdb/rocksdb/env/composite_env_wrapper.h --- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
+++ b/storage/rocksdb/rocksdb/env/composite_env_wrapper.h +++ mariadb-10.11.3/storage/rocksdb/rocksdb/env/composite_env_wrapper.h
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
#pragma once #pragma once
@ -22,10 +22,10 @@ index fbc0b93f..e10d617b 100644
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/file_system.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: mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
index c7f93b4c..3c2ab805 100644 ===================================================================
--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h --- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +++ mariadb-10.11.3/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#pragma once #pragma once
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
@ -34,10 +34,10 @@ index c7f93b4c..3c2ab805 100644
#include <string> #include <string>
#include <vector> #include <vector>
#include "rocksdb/status.h" #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: mariadb-10.11.3/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 --- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+++ b/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 @@ @@ -7,6 +7,7 @@
#include <string> #include <string>
@ -46,10 +46,10 @@ index f356395f..6eaf7173 100644
#include "rocksdb/slice.h" #include "rocksdb/slice.h"
diff --git 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
index a761be66..2e57eda2 100644 ===================================================================
--- a/storage/rocksdb/rocksdb/util/string_util.h --- mariadb-10.11.3.orig/storage/rocksdb/rocksdb/util/string_util.h
+++ b/storage/rocksdb/rocksdb/util/string_util.h +++ mariadb-10.11.3/storage/rocksdb/rocksdb/util/string_util.h
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@ -58,12 +58,12 @@ index a761be66..2e57eda2 100644
#include "rocksdb/rocksdb_namespace.h" #include "rocksdb/rocksdb_namespace.h"
diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc Index: mariadb-10.11.3/tpool/aio_linux.cc
index 5d01c588..90888622 100644 ===================================================================
--- a/tpool/aio_linux.cc --- mariadb-10.11.3.orig/tpool/aio_linux.cc
+++ b/tpool/aio_linux.cc +++ mariadb-10.11.3/tpool/aio_linux.cc
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ @@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi
# include <atomic> # include <cstdio>
# include <libaio.h> # include <libaio.h>
# include <sys/syscall.h> # include <sys/syscall.h>
+# include <cstdio> +# include <cstdio>

3
mariadb-10.11.2.tar.gz
View File

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

16
mariadb-10.11.2.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEF39AEP5WyjM2MAMF8WVvJMdM0dgFAmPlDlwACgkQ8WVvJMdM
0dhG7hAAk6HknexFLwiw7B9q7ciAdNBDDDq9MYZ4Lap05xiJptEKGvEUUazF0drC
zUs4TUdfu1pOAcBWJokIU9XOG5bMozamzEcdP6RkXC3c/BW1iOlxN+VCa9mi191U
jwqCDqkptXRRU4DsziKpcuwPypTIPtX7grQzmEFqTwbl+HDBZ1RXFZ2CLp5xm2ki
SzwUqiUKB/EiDR2vpWjz1pXegH8HnfBSZBCFnGtYxWbPc9vJsqa5JP+W1rYW1kxD
k85Zf7UbPT7//tKC/1hrC5A5Q0Glzs4+HMfYW2F7C0zw2wXikqjvmKovo1IjQfDE
yp0S7nfm95xoq12Tk0J6xGBL7yaraJB9xf0Ywcbyi/y38Fix3zFPCYcJVlI1sWrp
qGaD7paHqRjJsWq7LmPCeen7/6n+8BrZHGrgCwbUjePh2k8kEaaKHUq+SelUQ51Y
LE77n26RWkC9LOXqpr6/ebidjAEWOk5YIKLgwE8rkvQXTJB+OdISsH20UfqFQFtS
IWdEM2qMypXiCJ85nm4bsPlWMYIj5Q6kyVcakbyhzrpYvLQlG9rPvuUSUGDlVl1X
v+2+t4v5gGcOOZQLVrgbRfLE4Jox47AT+EmE+vmuV4KL42Ik3+X69g/N0FsCoHVz
a6WLBAlhNpVgBt0vnllpCVeCGQs1cbL12luMsP1Tv9EftOSau28=
=QClB
-----END PGP SIGNATURE-----

BIN
mariadb-10.11.3.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
mariadb-10.11.3.tar.gz.asc Normal file
View File

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

11
mariadb.changes
View File

@ -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> Wed Mar 8 10:28:23 UTC 2023 - Martin Liška <mliska@suse.cz>

2
mariadb.spec
View File

@ -52,7 +52,7 @@
# Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available # Build with cracklib plugin when cracklib-dict-full >= 2.9.0 is available
%define with_cracklib_plugin 0 %define with_cracklib_plugin 0
Name: mariadb Name: mariadb
Version: 10.11.2 Version: 10.11.3
Release: 0 Release: 0
Summary: Server part of MariaDB Summary: Server part of MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception License: SUSE-GPL-2.0-with-FLOSS-exception