From b6ec88a8777c707f9d2b1134e9e6cb78c8d3a437 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Thu, 1 Jun 2023 08:10:28 +0000 Subject: [PATCH] Rebase to version 10.5.20 Patches 11 and 13 were upstreamed: https://github.com/MariaDB/server/commit/75bbf645a66db797be2abd3a348dce32eb753acc https://github.com/MariaDB/server/commit/f575de39afacb24cd43c40bf43c27bfcf97a670b Resolves: CVE-2022-47015 --- mariadb-10.5-gcc13.patch | 12 ------------ mariadb-c99.patch | 21 --------------------- mariadb.spec | 13 ++++++------- rh-skipped-tests-base.list | 18 ++++++++++++++++++ sources | 2 +- 5 files changed, 25 insertions(+), 41 deletions(-) delete mode 100644 mariadb-10.5-gcc13.patch delete mode 100644 mariadb-c99.patch diff --git a/mariadb-10.5-gcc13.patch b/mariadb-10.5-gcc13.patch deleted file mode 100644 index 341b47b..0000000 --- a/mariadb-10.5-gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc -index 8a6688e6775..5eff358723d 100644 ---- a/tpool/aio_linux.cc -+++ b/tpool/aio_linux.cc -@@ -17,6 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ - #include "tpool.h" - - #ifdef LINUX_NATIVE_AIO -+# include - # include - # include - # include diff --git a/mariadb-c99.patch b/mariadb-c99.patch deleted file mode 100644 index ce01dd7..0000000 --- a/mariadb-c99.patch +++ /dev/null @@ -1,21 +0,0 @@ -rocksdb: Define _GNU_SOURCE during fallocate CMake probe - -The glibc headers declare fallocate only if _GNU_SOURCE is defined. -Upstream rocksdb does not need this because the probe is run with the -C++ compiler, and current g++ versions define _GNU_SOURCE -automatically. - -Submitted upstream: - - -diff -ur mariadb-10.5.18-downstream_modified.orig/storage/rocksdb/build_rocksdb.cmake mariadb-10.5.18-downstream_modified/storage/rocksdb/build_rocksdb.cmake ---- mariadb-10.5.18-downstream_modified.orig/storage/rocksdb/build_rocksdb.cmake 2022-11-02 13:37:22.000000000 +0100 -+++ mariadb-10.5.18-downstream_modified/storage/rocksdb/build_rocksdb.cmake 2023-04-11 09:42:17.295837813 +0200 -@@ -138,6 +138,7 @@ - if(WITH_FALLOCATE AND UNIX) - include(CheckCSourceCompiles) - CHECK_C_SOURCE_COMPILES(" -+#define _GNU_SOURCE - #include - #include - int main() { diff --git a/mariadb.spec b/mariadb.spec index 8b69b81..f3ddbbf 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -149,8 +149,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.5.19 -Release: 2%{?with_debug:.debug}%{?dist} +Version: 10.5.20 +Release: 1%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A very fast and robust SQL database server @@ -209,10 +209,7 @@ Patch7: %{pkgnamepatch}-scripts.patch Patch9: %{pkgnamepatch}-ownsetup.patch # Patch10: Fix cipher name in the SSL Cipher name test Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch -# https://gcc.gnu.org/gcc-13/porting_to.html -Patch11: mariadb-10.5-gcc13.patch Patch12: rocksdb-6.8-gcc13.patch -Patch13: mariadb-c99.patch BuildRequires: make BuildRequires: cmake gcc-c++ @@ -744,10 +741,8 @@ rm -r storage/rocksdb/ # Keeping the patch commented out, need to revisit # once the test is re-enabled by upstream in some future release #%patch -P10 -p1 -%patch -P11 -p1 %if %{with rocksdb} %patch -P12 -p1 -d storage/rocksdb/rocksdb/ -%patch -P13 -p1 %endif # generate a list of tests that fail, but are not disabled by upstream @@ -1648,6 +1643,10 @@ fi %endif %changelog +* Tue May 30 2023 Lukas Javorsky - 3:10.5.20-1 +- Rebase to version 10.5.20 +- Patches 11 and 13 were upstreamed + * Fri Apr 28 2023 Siddhesh Poyarekar - 3:10.5.19-2 - Use _fortify_level to disable fortification in debug builds. diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list index 315f5d7..1a86cf8 100644 --- a/rh-skipped-tests-base.list +++ b/rh-skipped-tests-base.list @@ -69,3 +69,21 @@ oqgraph.regression_1213120 : main.information_schema : main.loadxml : main.lock_kill : + +# Fails since 10.5.20 +innodb.innodb_bug51920 : +binlog_encryption.rpl_cant_read_event_incident : +spider/bg.spider_fixes : +spider/bugfix.mdev_29904 : +sys_vars.completion_type_func : +rpl.rpl_report_port : +rpl.rpl_reset_slave_fail : +rpl.rpl_xa_survive_disconnect_lsu_off : +rpl.rpl_heartbeat_basic : +rpl.rpl_xa_survive_disconnect : +rpl.rpl_err_ignoredtable : +rpl.rpl_row_img_sequence_full : +rpl.rpl_row_img_sequence_min : +rpl.rpl_row_img_sequence_noblob : +rpl.rpl_xa_empty_transaction : +rpl.rpl_slave_shutdown_mdev20821 : diff --git a/sources b/sources index 40583f5..5d818a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-10.5.19-downstream_modified.tar.gz) = 29ca4910099d51a0f5c17fad986dfae56739b3016410fa7c3052c155ad18ac9c52df97efc94beb5d896cbfd72b719e74cc1ecf4209fc42f28aa9d1bf5b29b09f +SHA512 (mariadb-10.5.20-downstream_modified.tar.gz) = 5438d656e8998e4f3a3cc61af9348ad93c467d3936ac8a9f4640a9b2b70345f025e4bfdd431ccfd0ad519a7ac756dc5a338885f9d68c6c2fe14b31a1de3241ca