From 3e958fabe9aba50eed664e99e98af8a0f957f511 Mon Sep 17 00:00:00 2001 From: Yogita Urade Date: Wed, 14 May 2025 10:40:23 +0530 Subject: [PATCH] mariadb: upgrade 11.4.5 -> 11.4.6 This upgrade includes fix for CVE-2023-52971 Changelog: https://mariadb.com/kb/en/mariadb-11-4-6-changelog/ refresh 0001-Add-missing-includes-cstdint-and-cstdio.patch Droped 3871.patch and mm_malloc.patch as these are available in 11.4.6 Signed-off-by: Yogita Urade Signed-off-by: Khem Raj --- ...ive_11.4.5.bb => mariadb-native_11.4.6.bb} | 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +- ...-missing-includes-cstdint-and-cstdio.patch | 40 +++++++------------ meta-oe/recipes-dbs/mysql/mariadb/3871.patch | 29 -------------- .../recipes-dbs/mysql/mariadb/mm_malloc.patch | 23 ----------- .../{mariadb_11.4.5.bb => mariadb_11.4.6.bb} | 0 6 files changed, 16 insertions(+), 80 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_11.4.5.bb => mariadb-native_11.4.6.bb} (100%) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/3871.patch delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch rename meta-oe/recipes-dbs/mysql/{mariadb_11.4.5.bb => mariadb_11.4.6.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.5.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_11.4.5.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 3a39d036f7..13e55ebacd 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -17,17 +17,15 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \ file://ssize_t.patch \ - file://mm_malloc.patch \ file://sys_futex.patch \ file://cross-compiling.patch \ file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \ - file://3871.patch \ file://riscv32.patch \ " -SRC_URI[sha256sum] = "ff6595f8c482f9921e39b97fa1122377a69f0dcbd92553c6b9032cbf0e9b5354" +SRC_URI[sha256sum] = "1b26c0bb2d025dbfac3b9852d2b7eafda56a171b67ac2e27831ec0414fb7df07" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index 08e73424d1..bc1b992919 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -11,27 +11,14 @@ Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Mingli Yu --- - .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + - storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + - .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + - storage/rocksdb/rocksdb/util/slice.cc | 1 + - storage/rocksdb/rocksdb/util/string_util.h | 1 + - 5 files changed, 5 insertions(+) + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + + storage/rocksdb/rocksdb/util/slice.cc | 2 +- + storage/rocksdb/rocksdb/util/string_util.h | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) -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 -@@ -5,6 +5,7 @@ - - #pragma once - -+#include - #include "rocksdb/rocksdb_namespace.h" - - struct CompactionIterationStats { diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h -index c7f93b4c..3c2ab805 100644 +index 7fb9d489..f7b4e6f0 100644 --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h @@ -8,6 +8,7 @@ @@ -55,19 +42,20 @@ index f356395f..32152217 100644 #include diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc -index 6db11cc9..c26b6a21 100644 +index 3c3656de..b18d7f5d 100644 --- a/storage/rocksdb/rocksdb/util/slice.cc +++ b/storage/rocksdb/rocksdb/util/slice.cc -@@ -8,6 +8,7 @@ - // found in the LICENSE file. See the AUTHORS file for names of contributors. +@@ -12,7 +12,7 @@ + #include #include +- +#include + #include "rocksdb/convenience.h" #include "rocksdb/slice_transform.h" - #include "rocksdb/slice.h" - #include "util/string_util.h" + #include "rocksdb/utilities/object_registry.h" diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h -index a761be66..064d059f 100644 +index 7794dbb0..b480177e 100644 --- a/storage/rocksdb/rocksdb/util/string_util.h +++ b/storage/rocksdb/rocksdb/util/string_util.h @@ -6,6 +6,7 @@ @@ -78,3 +66,5 @@ index a761be66..064d059f 100644 #include #include #include +-- +2.40.0 diff --git a/meta-oe/recipes-dbs/mysql/mariadb/3871.patch b/meta-oe/recipes-dbs/mysql/mariadb/3871.patch deleted file mode 100644 index 4bbca2d706..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/3871.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d6923ac0adc11a0364acd421316116190eedb508 Mon Sep 17 00:00:00 2001 -From: Brad Smith -Date: Fri, 7 Mar 2025 02:04:01 -0500 -Subject: [PATCH] Fix building with Clang and GCC on RISC-V - -Clang does not have the builtin __builtin_riscv_pause(). - -Upstream-Status: Backport [https://github.com/MariaDB/server/pull/3871] -Signed-off-by: Khem Raj ---- - include/my_cpu.h | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/include/my_cpu.h -+++ b/include/my_cpu.h -@@ -97,7 +97,12 @@ static inline void MY_RELAX_CPU(void) - /* Changed from __ppc_get_timebase for musl and clang compatibility */ - __builtin_ppc_get_timebase(); - #elif defined __GNUC__ && defined __riscv -- __builtin_riscv_pause(); -+ /* The GCC-only __builtin_riscv_pause() or the pause instruction is -+ encoded like a fence instruction with special parameters. On RISC-V -+ implementations that do not support arch=+zihintpause this -+ instruction could be interpreted as a more expensive memory fence; -+ it should not be an illegal instruction. */ -+ __asm__ volatile(".long 0x0100000f" ::: "memory"); - #elif defined __GNUC__ - /* Mainly, prevent the compiler from optimizing away delay loops */ - __asm__ __volatile__ ("":::"memory"); diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch b/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch deleted file mode 100644 index a590a3fa36..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 76e4c3e8d001eaaabd0fb34c136b81b82830c420 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 15 Jun 2021 22:48:07 -0700 -Subject: [PATCH] mariadb: Fix build with clang/musl - -Upstream-Status: Pending ---- - storage/rocksdb/rocksdb/port/jemalloc_helper.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/storage/rocksdb/rocksdb/port/jemalloc_helper.h b/storage/rocksdb/rocksdb/port/jemalloc_helper.h -index f6f72f8c..b9657cf3 100644 ---- a/storage/rocksdb/rocksdb/port/jemalloc_helper.h -+++ b/storage/rocksdb/rocksdb/port/jemalloc_helper.h -@@ -5,7 +5,7 @@ - - #pragma once - --#if defined(__clang__) -+#if defined(__clang__) && defined(__GLIBC__) - // glibc's `posix_memalign()` declaration specifies `throw()` while clang's - // declaration does not. There is a hack in clang to make its re-declaration - // compatible with glibc's if they are declared consecutively. That hack breaks diff --git a/meta-oe/recipes-dbs/mysql/mariadb_11.4.5.bb b/meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_11.4.5.bb rename to meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb