From 0e52649561800eed7e32da84f40bb0239401233d Mon Sep 17 00:00:00 2001 From: wenxin Date: Mon, 28 Jul 2025 18:51:43 +0800 Subject: [PATCH] update 8.0.43 to fix cve --- add-loongarch64-support-for-mysql.patch | 10 ++++----- download | 2 +- mysql-paths.patch | 28 ++++++++++++------------- mysql.spec | 27 ++++++++++++++++++++++-- 4 files changed, 45 insertions(+), 22 deletions(-) diff --git a/add-loongarch64-support-for-mysql.patch b/add-loongarch64-support-for-mysql.patch index 9c7315a..595cda0 100644 --- a/add-loongarch64-support-for-mysql.patch +++ b/add-loongarch64-support-for-mysql.patch @@ -5,11 +5,11 @@ Subject: [PATCH] add loongarch64 support for mysql --- boost/boost_1_77_0/boost/predef/other/endian.h | 1 + - .../icu/icu-release-73-1/source/i18n/double-conversion-utils.h | 3 ++- + .../icu/icu-release-77-1/source/i18n/double-conversion-utils.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/boost/boost_1_77_0/boost/predef/other/endian.h b/boost/boost_1_77_0/boost/predef/other/endian.h -index d8ec63ff..040db730 100644 +index d8ec63ff..255a2587 100644 --- a/boost/boost_1_77_0/boost/predef/other/endian.h +++ b/boost/boost_1_77_0/boost/predef/other/endian.h @@ -125,6 +125,7 @@ information and acquired knowledge: @@ -20,10 +20,10 @@ index d8ec63ff..040db730 100644 defined(__e2k__) # undef BOOST_ENDIAN_LITTLE_BYTE # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE -diff --git a/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h b/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h +diff --git a/extra/icu/icu-release-77-1/source/i18n/double-conversion-utils.h b/extra/icu/icu-release-77-1/source/i18n/double-conversion-utils.h index 303668f9..77f5ded2 100644 ---- a/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h -+++ b/extra/icu/icu-release-73-1/source/i18n/double-conversion-utils.h +--- a/extra/icu/icu-release-77-1/source/i18n/double-conversion-utils.h ++++ b/extra/icu/icu-release-77-1/source/i18n/double-conversion-utils.h @@ -160,7 +160,8 @@ int main(int argc, char** argv) { defined(__riscv) || defined(__e2k__) || \ defined(__or1k__) || defined(__arc__) || defined(__ARC64__) || \ diff --git a/download b/download index 7683452..590783c 100644 --- a/download +++ b/download @@ -1 +1 @@ -0f9afecb6fcfc6bdbb31e192e9b9e598 mysql-boost-8.0.42.tar.gz +5f44ad3ef68dc943e145f26574dcf435 mysql-boost-8.0.43.tar.gz diff --git a/mysql-paths.patch b/mysql-paths.patch index d5978b6..6e34556 100644 --- a/mysql-paths.patch +++ b/mysql-paths.patch @@ -4,10 +4,10 @@ Software Collections. Removing these hard-coded paths should fix it. Upstream report: https://mariadb.atlassian.net/browse/MDEV-6485 diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake -index 9f7945d8..6734cdfd 100644 +index d1d50236..6cb09aae 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake -@@ -105,7 +105,7 @@ IF(UNIX) +@@ -106,7 +106,7 @@ IF(UNIX) " Choose between ${VALID_INSTALL_LAYOUTS}" ) ENDIF() @@ -16,19 +16,19 @@ index 9f7945d8..6734cdfd 100644 CACHE PATH "config directory (for my.cnf)") MARK_AS_ADVANCED(SYSCONFDIR) ENDIF() -@@ -189,6 +189,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path}) - # - SET(INSTALL_BINDIR_RPM "bin") - SET(INSTALL_SBINDIR_RPM "sbin") -+SET(INSTALL_SYSCONFDIR_RPM "/etc") +@@ -201,6 +201,7 @@ IF(LINUX_FEDORA_SBIN_MERGE) + SET(INSTALL_SBINDIR_RPM "bin") + ELSE() + SET(INSTALL_SBINDIR_RPM "sbin") ++ SET(INSTALL_SYSCONFDIR_RPM "/etc") + ENDIF() # IF(CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_64BIT_ARCHITECTURES) - SET(INSTALL_LIBDIR_RPM "lib64/mysql") diff --git a/mysys/my_default.cc b/mysys/my_default.cc -index 290f1666..8403425f 100644 +index 117be04c..c01bd799 100644 --- a/mysys/my_default.cc +++ b/mysys/my_default.cc -@@ -1570,12 +1570,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) { +@@ -1652,12 +1652,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) { #else @@ -45,10 +45,10 @@ index 290f1666..8403425f 100644 #endif diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 4149a764..b091d5e2 100644 +index cfee6b80..a66b0959 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt -@@ -288,9 +288,9 @@ IF(UNIX) +@@ -271,9 +271,9 @@ IF(UNIX) ENDIF(UNIX) SET(prefix "${CMAKE_INSTALL_PREFIX}") @@ -61,10 +61,10 @@ index 4149a764..b091d5e2 100644 SET(libsubdir ${INSTALL_LIBDIR}) SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR}) diff --git a/scripts/mysqld_multi.pl.in b/scripts/mysqld_multi.pl.in -index 84dd4d7c..50397ddd 100644 +index 2f26beba..ba8e47a2 100644 --- a/scripts/mysqld_multi.pl.in +++ b/scripts/mysqld_multi.pl.in -@@ -586,9 +586,7 @@ sub list_defaults_files +@@ -587,9 +587,7 @@ sub list_defaults_files my %seen; # Don't list the same file more than once return grep { defined $_ and not $seen{$_}++ and -f $_ and -r $_ } diff --git a/mysql.spec b/mysql.spec index 30fdf23..20fdbe0 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 1 # Name of the package without any prefixes %global pkg_name %{name} %global pkgnamepatch mysql @@ -75,7 +75,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql -Version: 8.0.42 +Version: 8.0.43 Release: %{anolis_release}%{?dist} Summary: MySQL client programs and shared libraries URL: http://www.mysql.com @@ -937,6 +937,29 @@ fi %endif %changelog +* Tue Jul 29 2025 wenxin - 8.0.43-1 +- update 8.0.43 +- fix cve CVE-2025-50081 +- fix cve CVE-2025-50100 +- fix cve CVE-2025-50104 +- fix cve CVE-2025-50077 +- fix cve CVE-2025-50078 +- fix cve CVE-2025-50079 +- fix cve CVE-2025-50080 +- fix cve CVE-2025-50082 +- fix cve CVE-2025-50083 +- fix cve CVE-2025-50084 +- fix cve CVE-2025-50085 +- fix cve CVE-2025-50086 +- fix cve CVE-2025-50087 +- fix cve CVE-2025-50091 +- fix cve CVE-2025-50093 +- fix cve CVE-2025-50094 +- fix cve CVE-2025-50097 +- fix cve CVE-2025-50099 +- fix cve CVE-2025-50101 +- fix cve CVE-2025-53023 + * Wed Jun 11 2025 Shangtong Guo - 8.0.42-2 - Import patch from Ubuntu to fix build error on riscv64 -- Gitee