From cba89e13b23bb83433ab37bd02d3451224fe9735 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Fri, 12 Dec 2025 11:10:16 +0800 Subject: [PATCH 1/4] [CVE]update to mysql-8.0.44-1 to #IDCJXZ update to mysql-8.0.44-1 for CVE-2025-53040 CVE-2025-53042 CVE-2025-53044 CVE-2025-53045 CVE-2025-53053 Project: TC2024080204 Signed-off-by: Jacob Wang --- 1000-anolis-mysql-support-loongarch64.patch | 14 ------ ...-fix-derived-condition-pushdown-test.patch | 22 --------- ...have_32bits_time-test-on-loongarch64.patch | 11 ----- ...-loaddata-special-test-for-loongarch.patch | 24 --------- download | 2 +- mysql.spec | 49 ++++--------------- 6 files changed, 10 insertions(+), 112 deletions(-) delete mode 100644 1000-anolis-mysql-support-loongarch64.patch delete mode 100644 1001-fix-derived-condition-pushdown-test.patch delete mode 100644 1002-skip-have_32bits_time-test-on-loongarch64.patch delete mode 100644 1003-fix-loaddata-special-test-for-loongarch.patch diff --git a/1000-anolis-mysql-support-loongarch64.patch b/1000-anolis-mysql-support-loongarch64.patch deleted file mode 100644 index 0d80cb8..0000000 --- a/1000-anolis-mysql-support-loongarch64.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/boost/boost_1_77_0/boost/predef/other/endian.h b/boost/boost_1_73_0/boost/predef/other/endian.h -index b42da538..8cd0a508 100644 ---- a/boost/boost_1_77_0/boost/predef/other/endian.h -+++ b/boost/boost_1_77_0/boost/predef/other/endian.h -@@ -125,7 +125,8 @@ information and acquired knowledge: - defined(__MIPSEL) || \ - defined(__MIPSEL__) || \ - defined(__riscv) || \ -- defined(__e2k__) -+ defined(__e2k__) || \ -+ defined(__loongarch__) - # undef BOOST_ENDIAN_LITTLE_BYTE - # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE - # endif diff --git a/1001-fix-derived-condition-pushdown-test.patch b/1001-fix-derived-condition-pushdown-test.patch deleted file mode 100644 index c9e0414..0000000 --- a/1001-fix-derived-condition-pushdown-test.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- mysql-test/t/derived_condition_pushdown.test.orig 2023-05-19 15:10:36.491463748 +0800 -+++ mysql-test/t/derived_condition_pushdown.test 2023-05-19 15:13:37.235839144 +0800 -@@ -1312,7 +1312,7 @@ - --skip_if_hypergraph # Depends on the query plan. - eval EXECUTE stmt USING @a, @b; - SET @a = 2; --SET @b = '2023-05-06 16:49:45'; -+SET @b = '2033-05-06 16:49:45'; - SET timestamp=UNIX_TIMESTAMP('2023-05-06 16:49:45'); - --replace_regex $elide_costs - --skip_if_hypergraph # Depends on the query plan. ---- mysql-test/r/derived_condition_pushdown.result.orig 2023-05-19 13:53:02.848129213 +0800 -+++ mysql-test/r/derived_condition_pushdown.result 2023-05-19 15:13:15.712675361 +0800 -@@ -2110,7 +2110,7 @@ - -> Zero rows (no matching row in const table) (rows=0) - - SET @a = 2; --SET @b = '2023-05-06 16:49:45'; -+SET @b = '2033-05-06 16:49:45'; - SET timestamp=UNIX_TIMESTAMP('2023-05-06 16:49:45'); - EXECUTE stmt USING @a, @b; - EXPLAIN diff --git a/1002-skip-have_32bits_time-test-on-loongarch64.patch b/1002-skip-have_32bits_time-test-on-loongarch64.patch deleted file mode 100644 index eecf4f4..0000000 --- a/1002-skip-have_32bits_time-test-on-loongarch64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mysql-8.0.32/mysql-test/include/have_32bits_time.inc 2022-12-16 23:34:44.000000000 +0800 -+++ mysql-8.0.32/mysql-test/include/have_32bits_time.inc.new 2023-05-19 22:46:34.731475815 +0800 -@@ -2,7 +2,7 @@ - - let $have_64bit = `SELECT @@version_compile_machine IN - ('x86_64', 'amd64', 'sparc', 'sparc64', 'arm64', 'aarch64', -- 'ppc64', 'ppc64le', 's390x')`; -+ 'loongarch64', 'ppc64', 'ppc64le', 's390x')`; - if ($have_64bit) { - --skip Doesn't support 32 bits UNIX time, only 64 bits - } diff --git a/1003-fix-loaddata-special-test-for-loongarch.patch b/1003-fix-loaddata-special-test-for-loongarch.patch deleted file mode 100644 index 308aa99..0000000 --- a/1003-fix-loaddata-special-test-for-loongarch.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- mysql-test/t/loaddata_special.test.orig 2023-05-20 11:42:30.956908281 +0800 -+++ mysql-test/t/loaddata_special.test 2023-05-22 10:38:18.345995071 +0800 -@@ -13,7 +13,7 @@ - SET GLOBAL net_buffer_length = 1024; - SET GLOBAL max_allowed_packet = 1024; - connect (con2,localhost,root,,); # Makes max_allowed_packet take effect, globally. --select load_file("/proc/modules"); -+select load_file("/proc/crypto"); - connection default; - SET GLOBAL max_allowed_packet = @old_max_allowed_packet; - SET GLOBAL net_buffer_length = @old_net_buffer_length; ---- mysql-test/r/loaddata_special.result.orig 2023-05-20 10:05:30.205788721 +0800 -+++ mysql-test/r/loaddata_special.result 2023-05-22 10:39:16.085415447 +0800 -@@ -6,8 +6,8 @@ - SET @old_max_allowed_packet= @@global.max_allowed_packet; - SET GLOBAL net_buffer_length = 1024; - SET GLOBAL max_allowed_packet = 1024; --select load_file("/proc/modules"); --load_file("/proc/modules") -+select load_file("/proc/crypto"); -+load_file("/proc/crypto") - NULL - Warnings: - Warning 1301 Result of load_file() was larger than max_allowed_packet (1024) - truncated diff --git a/download b/download index 590783c..fcbb654 100644 --- a/download +++ b/download @@ -1 +1 @@ -5f44ad3ef68dc943e145f26574dcf435 mysql-boost-8.0.43.tar.gz +d0cc3c8b6fdcaa1f5a820349816c7d2b mysql-boost-8.0.44.tar.gz diff --git a/mysql.spec b/mysql.spec index ca174f5..1954770 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # SCL stuff %{?scl:%scl_package mysql} %{!?scl:%global pkg_name %{name}} @@ -15,12 +14,12 @@ ExcludeArch: %{ix86} %{!?runselftest:%global runselftest 1} # Set this to 1 to see which tests fail, but 0 on production ready build -%global ignore_testsuite_result 0 +%{!?check_testsuite:%global ignore_testsuite_result 0} # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run # run only "main" suite -%global last_tested_version 8.0.43 +%global last_tested_version 8.0.44 # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 @@ -147,11 +146,11 @@ ExcludeArch: %{ix86} %global scl_upper %{lua:print(string.upper(string.gsub(rpm.expand("%{scl}"), "-", "_")))} %endif -Name: %{?scl_prefix}mysql -Version: 8.0.43 -Release: 1%{anolis_release}%{?with_debug:.debug}%{?dist} -Summary: MySQL client programs and shared libraries -URL: http://www.mysql.com +Name: %{?scl_prefix}mysql +Version: 8.0.44 +Release: 1%{?with_debug:.debug}%{?dist} +Summary: MySQL client programs and shared libraries +URL: http://www.mysql.com # Exceptions allow client libraries to be linked with most open source SW, # not only GPL code. See README.mysql-license @@ -223,23 +222,6 @@ BuildRequires: %{?scl_prefix}lz4-devel BuildRequires: %{?scl_prefix}mecab-devel BuildRequires: %{?scl_prefix}bison BuildRequires: %{?scl_prefix}libcurl-devel - -Patch1000: 1000-anolis-mysql-support-loongarch64.patch -Patch1001: 1001-fix-derived-condition-pushdown-test.patch -Patch1002: 1002-skip-have_32bits_time-test-on-loongarch64.patch -Patch1003: 1003-fix-loaddata-special-test-for-loongarch.patch - -BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: libaio-devel -BuildRequires: libedit-devel -BuildRequires: libevent-devel -BuildRequires: libicu-devel -BuildRequires: %{?scl_prefix}lz4 -BuildRequires: %{?scl_prefix}lz4-devel -BuildRequires: %{?scl_prefix}mecab-devel -BuildRequires: %{?scl_prefix}bison -BuildRequires: %{?scl_prefix}libcurl-devel %ifnarch aarch64 %{arm} s390 s390x BuildRequires: numactl-devel %endif @@ -540,14 +522,6 @@ the MySQL sources. %patch55 -p1 %patch126 -p1 -%patch1000 -p1 -%patch1001 -p0 -%patch1002 -p1 - -%ifarch loongarch64 -%patch1003 -p0 -%endif - # Patch Boost pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) %patch111 -p1 @@ -1232,13 +1206,8 @@ fi %endif %changelog -* Fri Oct 10 2025 zhangbinchen - 8.0.43-1.0.1 -- remove check_testsuite -- redefine ignore_testsuite_result -- Support loongarch64 platform (liwei.glw@openanolis.org) -- skip have_32bits_time test on loongarch64 (liwei.glw@openanolis.org) -- fix main.derived_condition_pushdown test (rb01097748@alibaba-inc.com) -- fix loaddata_special test for loongarch64 (rb01097748@alibaba-inc.com) +* Thu Oct 30 2025 Pavol Sloboda - 8.0.44-1 +- Rebase to MySQL 8.0.44 * Wed Aug 06 2025 Pavol Sloboda - 8.0.43-1 - Rebase to MySQL 8.0.43 -- Gitee From ee6f6d9d183a13ca8f202219de91879b06d26a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BD=AC=E7=90=9B?= Date: Thu, 23 Dec 2021 12:09:22 +0000 Subject: [PATCH 2/4] !1 build fix mysql * spec : fix build --- mysql.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mysql.spec b/mysql.spec index 1954770..f2af3a0 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # SCL stuff %{?scl:%scl_package mysql} %{!?scl:%global pkg_name %{name}} @@ -14,7 +15,7 @@ ExcludeArch: %{ix86} %{!?runselftest:%global runselftest 1} # Set this to 1 to see which tests fail, but 0 on production ready build -%{!?check_testsuite:%global ignore_testsuite_result 0} +%global ignore_testsuite_result 0 # The last version on which the full testsuite has been run # In case of further rebuilds of that version, don't require full testsuite to be run @@ -148,7 +149,7 @@ ExcludeArch: %{ix86} Name: %{?scl_prefix}mysql Version: 8.0.44 -Release: 1%{?with_debug:.debug}%{?dist} +Release: 1%{anolis_release}%{?with_debug:.debug}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -1206,6 +1207,10 @@ fi %endif %changelog +* Fri Dec 12 2025 zhangbinchen - 8.0.44-1.0.1 +- remove check_testsuite +- redefine ignore_testsuite_result + * Thu Oct 30 2025 Pavol Sloboda - 8.0.44-1 - Rebase to MySQL 8.0.44 -- Gitee From 2c85341d38dbc15017d0b430854431ce15b66013 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Tue, 9 Nov 2021 19:52:16 +0800 Subject: [PATCH 3/4] build: support loongarch64 platform Signed-off-by: Liwei Ge --- 1000-anolis-mysql-support-loongarch64.patch | 14 ++++++++++++++ mysql.spec | 6 ++++++ 2 files changed, 20 insertions(+) create mode 100644 1000-anolis-mysql-support-loongarch64.patch diff --git a/1000-anolis-mysql-support-loongarch64.patch b/1000-anolis-mysql-support-loongarch64.patch new file mode 100644 index 0000000..0d80cb8 --- /dev/null +++ b/1000-anolis-mysql-support-loongarch64.patch @@ -0,0 +1,14 @@ +diff --git a/boost/boost_1_77_0/boost/predef/other/endian.h b/boost/boost_1_73_0/boost/predef/other/endian.h +index b42da538..8cd0a508 100644 +--- a/boost/boost_1_77_0/boost/predef/other/endian.h ++++ b/boost/boost_1_77_0/boost/predef/other/endian.h +@@ -125,7 +125,8 @@ information and acquired knowledge: + defined(__MIPSEL) || \ + defined(__MIPSEL__) || \ + defined(__riscv) || \ +- defined(__e2k__) ++ defined(__e2k__) || \ ++ defined(__loongarch__) + # undef BOOST_ENDIAN_LITTLE_BYTE + # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE + # endif diff --git a/mysql.spec b/mysql.spec index f2af3a0..eb84802 100644 --- a/mysql.spec +++ b/mysql.spec @@ -212,6 +212,8 @@ Patch113: boost-1.76.0-fix_multiprecision_issue_419-ppc64le.patch # Use same logfile path in logrotate and mysql configs Patch126: mysql-logrotate-log-path.patch +Patch1000: 1000-anolis-mysql-support-loongarch64.patch + BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libaio-devel @@ -223,6 +225,7 @@ BuildRequires: %{?scl_prefix}lz4-devel BuildRequires: %{?scl_prefix}mecab-devel BuildRequires: %{?scl_prefix}bison BuildRequires: %{?scl_prefix}libcurl-devel + %ifnarch aarch64 %{arm} s390 s390x BuildRequires: numactl-devel %endif @@ -523,6 +526,8 @@ the MySQL sources. %patch55 -p1 %patch126 -p1 +%patch1000 -p1 + # Patch Boost pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) %patch111 -p1 @@ -1210,6 +1215,7 @@ fi * Fri Dec 12 2025 zhangbinchen - 8.0.44-1.0.1 - remove check_testsuite - redefine ignore_testsuite_result +- Support loongarch64 platform (liwei.glw@openanolis.org) * Thu Oct 30 2025 Pavol Sloboda - 8.0.44-1 - Rebase to MySQL 8.0.44 -- Gitee From 737e40f861a0204e0e1a2aae85297e06f44451c6 Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Fri, 19 May 2023 14:07:46 +0800 Subject: [PATCH 4/4] fix test failure Signed-off-by: Bo Ren --- ...-fix-derived-condition-pushdown-test.patch | 22 +++++++++++++++++ ...have_32bits_time-test-on-loongarch64.patch | 11 +++++++++ ...-loaddata-special-test-for-loongarch.patch | 24 +++++++++++++++++++ mysql.spec | 14 +++++++++++ 4 files changed, 71 insertions(+) create mode 100644 1001-fix-derived-condition-pushdown-test.patch create mode 100644 1002-skip-have_32bits_time-test-on-loongarch64.patch create mode 100644 1003-fix-loaddata-special-test-for-loongarch.patch diff --git a/1001-fix-derived-condition-pushdown-test.patch b/1001-fix-derived-condition-pushdown-test.patch new file mode 100644 index 0000000..c9e0414 --- /dev/null +++ b/1001-fix-derived-condition-pushdown-test.patch @@ -0,0 +1,22 @@ +--- mysql-test/t/derived_condition_pushdown.test.orig 2023-05-19 15:10:36.491463748 +0800 ++++ mysql-test/t/derived_condition_pushdown.test 2023-05-19 15:13:37.235839144 +0800 +@@ -1312,7 +1312,7 @@ + --skip_if_hypergraph # Depends on the query plan. + eval EXECUTE stmt USING @a, @b; + SET @a = 2; +-SET @b = '2023-05-06 16:49:45'; ++SET @b = '2033-05-06 16:49:45'; + SET timestamp=UNIX_TIMESTAMP('2023-05-06 16:49:45'); + --replace_regex $elide_costs + --skip_if_hypergraph # Depends on the query plan. +--- mysql-test/r/derived_condition_pushdown.result.orig 2023-05-19 13:53:02.848129213 +0800 ++++ mysql-test/r/derived_condition_pushdown.result 2023-05-19 15:13:15.712675361 +0800 +@@ -2110,7 +2110,7 @@ + -> Zero rows (no matching row in const table) (rows=0) + + SET @a = 2; +-SET @b = '2023-05-06 16:49:45'; ++SET @b = '2033-05-06 16:49:45'; + SET timestamp=UNIX_TIMESTAMP('2023-05-06 16:49:45'); + EXECUTE stmt USING @a, @b; + EXPLAIN diff --git a/1002-skip-have_32bits_time-test-on-loongarch64.patch b/1002-skip-have_32bits_time-test-on-loongarch64.patch new file mode 100644 index 0000000..eecf4f4 --- /dev/null +++ b/1002-skip-have_32bits_time-test-on-loongarch64.patch @@ -0,0 +1,11 @@ +--- mysql-8.0.32/mysql-test/include/have_32bits_time.inc 2022-12-16 23:34:44.000000000 +0800 ++++ mysql-8.0.32/mysql-test/include/have_32bits_time.inc.new 2023-05-19 22:46:34.731475815 +0800 +@@ -2,7 +2,7 @@ + + let $have_64bit = `SELECT @@version_compile_machine IN + ('x86_64', 'amd64', 'sparc', 'sparc64', 'arm64', 'aarch64', +- 'ppc64', 'ppc64le', 's390x')`; ++ 'loongarch64', 'ppc64', 'ppc64le', 's390x')`; + if ($have_64bit) { + --skip Doesn't support 32 bits UNIX time, only 64 bits + } diff --git a/1003-fix-loaddata-special-test-for-loongarch.patch b/1003-fix-loaddata-special-test-for-loongarch.patch new file mode 100644 index 0000000..308aa99 --- /dev/null +++ b/1003-fix-loaddata-special-test-for-loongarch.patch @@ -0,0 +1,24 @@ +--- mysql-test/t/loaddata_special.test.orig 2023-05-20 11:42:30.956908281 +0800 ++++ mysql-test/t/loaddata_special.test 2023-05-22 10:38:18.345995071 +0800 +@@ -13,7 +13,7 @@ + SET GLOBAL net_buffer_length = 1024; + SET GLOBAL max_allowed_packet = 1024; + connect (con2,localhost,root,,); # Makes max_allowed_packet take effect, globally. +-select load_file("/proc/modules"); ++select load_file("/proc/crypto"); + connection default; + SET GLOBAL max_allowed_packet = @old_max_allowed_packet; + SET GLOBAL net_buffer_length = @old_net_buffer_length; +--- mysql-test/r/loaddata_special.result.orig 2023-05-20 10:05:30.205788721 +0800 ++++ mysql-test/r/loaddata_special.result 2023-05-22 10:39:16.085415447 +0800 +@@ -6,8 +6,8 @@ + SET @old_max_allowed_packet= @@global.max_allowed_packet; + SET GLOBAL net_buffer_length = 1024; + SET GLOBAL max_allowed_packet = 1024; +-select load_file("/proc/modules"); +-load_file("/proc/modules") ++select load_file("/proc/crypto"); ++load_file("/proc/crypto") + NULL + Warnings: + Warning 1301 Result of load_file() was larger than max_allowed_packet (1024) - truncated diff --git a/mysql.spec b/mysql.spec index eb84802..be7afe2 100644 --- a/mysql.spec +++ b/mysql.spec @@ -226,6 +226,11 @@ BuildRequires: %{?scl_prefix}mecab-devel BuildRequires: %{?scl_prefix}bison BuildRequires: %{?scl_prefix}libcurl-devel +Patch1000: 1000-anolis-mysql-support-loongarch64.patch +Patch1001: 1001-fix-derived-condition-pushdown-test.patch +Patch1002: 1002-skip-have_32bits_time-test-on-loongarch64.patch +Patch1003: 1003-fix-loaddata-special-test-for-loongarch.patch + %ifnarch aarch64 %{arm} s390 s390x BuildRequires: numactl-devel %endif @@ -527,6 +532,12 @@ the MySQL sources. %patch126 -p1 %patch1000 -p1 +%patch1001 -p0 +%patch1002 -p1 + +%ifarch loongarch64 +%patch1003 -p0 +%endif # Patch Boost pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) @@ -1216,6 +1227,9 @@ fi - remove check_testsuite - redefine ignore_testsuite_result - Support loongarch64 platform (liwei.glw@openanolis.org) +- skip have_32bits_time test on loongarch64 (liwei.glw@openanolis.org) +- fix main.derived_condition_pushdown test (rb01097748@alibaba-inc.com) +- fix loaddata_special test for loongarch64 (rb01097748@alibaba-inc.com) * Thu Oct 30 2025 Pavol Sloboda - 8.0.44-1 - Rebase to MySQL 8.0.44 -- Gitee