From fdeb2da9ab89088dd860b144dec9a719cad002b1 Mon Sep 17 00:00:00 2001 From: wenyuzifang Date: Fri, 5 Dec 2025 11:09:12 +0800 Subject: [PATCH] Update code from upstream --- mysql-c99.patch | 12 ++++++++++++ mysql.spec | 10 ++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 mysql-c99.patch diff --git a/mysql-c99.patch b/mysql-c99.patch new file mode 100644 index 0000000..935e64f --- /dev/null +++ b/mysql-c99.patch @@ -0,0 +1,12 @@ +diff -ur mysql-8.0.35.orig/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c mysql-8.0.35/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c +--- mysql-8.0.35.orig/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c 2023-10-12 13:45:01.000000000 +0200 ++++ mysql-8.0.35/plugin/innodb_memcached/daemon_memcached/daemon/memcached.c 2023-12-19 10:48:46.718006624 +0100 +@@ -4070,7 +4070,7 @@ + do { + while(key_token->length != 0) { + /* whether there are more keys to fetch */ +- bool next_get = (key_token + 1)->value; ++ bool next_get = (key_token + 1)->value != NULL; + + key = key_token->value; + nkey = key_token->length; diff --git a/mysql.spec b/mysql.spec index 20fdbe0..479b6b3 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,4 @@ -%define anolis_release 1 -# Name of the package without any prefixes -%global pkg_name %{name} +%define anolis_release 2\n%global pkg_name %{name} %global pkgnamepatch mysql # Regression tests may take a long time (many cores recommended), skip them by @@ -42,6 +40,7 @@ # rather include it than ship the file again, since conflicts between # those files may create issues %bcond_with config +Patch55: %{pkgnamepatch}-c99.patch\n # For deep debugging we need to build binaries with extra debug info %bcond_with debug @@ -122,7 +121,7 @@ Patch113: add-loongarch64-support-for-mysql.patch #add support for riscv64 Patch114: riscv-lock-free.patch - +Patch55: %{pkgnamepatch}-c99.patch\n BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libaio-devel @@ -937,6 +936,9 @@ fi %endif %changelog +| + * Tue Dec 19 2023 Florian Weimer - 8.0.43-2 + * Tue Jul 29 2025 wenxin - 8.0.43-1 - update 8.0.43 - fix cve CVE-2025-50081 -- Gitee