diff --git a/mysql-Add-sw64-architecture-2.patch b/mysql-Add-sw64-architecture-2.patch new file mode 100644 index 0000000000000000000000000000000000000000..208fc8ea6e1c50db903be7387efce2950bc7b229 --- /dev/null +++ b/mysql-Add-sw64-architecture-2.patch @@ -0,0 +1,108 @@ +From 6f1e1c005ad0f8ce6be1c1a19b851363c6a413f7 Mon Sep 17 00:00:00 2001 +From: zhangchunjing +Date: Fri, 12 Sep 2025 20:26:38 +0800 +Subject: [PATCH] fix sw + +--- + extra/rapidjson/include/rapidjson/rapidjson.h | 2 +- + extra/icu/icu-release-77-1/source/acinclude.m4 | 6 ++++++ + extra/icu/icu-release-77-1/source/config.guess | 8 ++++++++ + extra/icu/icu-release-77-1/source/config.sub | 1 + + extra/icu/icu-release-77-1/source/configure | 6 ++++++ + .../source/i18n/double-conversion-utils.h | 2 +- + 6 files changed, 23 insertions(+), 1 deletion(-) + +diff --git a/extra/rapidjson/include/rapidjson/rapidjson.h b/extra/rapidjson/include/rapidjson/rapidjson.h +index 247b8e68..7f28dc41 100644 +--- a/extra/rapidjson/include/rapidjson/rapidjson.h ++++ b/extra/rapidjson/include/rapidjson/rapidjson.h +@@ -270,7 +270,7 @@ + // Detect with architecture macros + # elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__) + # define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN +-# elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) ++# elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__) || defined(__sw_64__) + # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN + # elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_ARM64)) + # define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN +diff --git a/extra/icu/icu-release-77-1/source/acinclude.m4 b/extra/icu/icu-release-77-1/source/acinclude.m4 +index da29400a..f979158c 100644 +--- a/extra/icu/icu-release-77-1/source/acinclude.m4 ++++ b/extra/icu/icu-release-77-1/source/acinclude.m4 +@@ -21,6 +21,12 @@ case "${host}" in + else + icu_cv_host_frag=mh-solaris + fi ;; ++sw_64*-*-linux-gnu) ++ if test "$GCC" = yes; then ++ icu_cv_host_frag=mh-sw_64-linux-gcc ++ else ++ icu_cv_host_frag=mh-sw_64-linux-cc ++ fi ;; + alpha*-*-linux-gnu) + if test "$GCC" = yes; then + icu_cv_host_frag=mh-alpha-linux-gcc +diff --git a/extra/icu/icu-release-77-1/source/config.guess b/extra/icu/icu-release-77-1/source/config.guess +index 48a68460..1e7d62c4 100644 +--- a/extra/icu/icu-release-77-1/source/config.guess ++++ b/extra/icu/icu-release-77-1/source/config.guess +@@ -1010,6 +1010,14 @@ EOF + UNAME_MACHINE=aarch64_be + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; ++ sw_64:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ sw) UNAME_MACHINE=sw_64 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo ${UNAME_MACHINE}-sunway-linux-${LIBC} ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + EV5) UNAME_MACHINE=alphaev5 ;; +diff --git a/extra/icu/icu-release-77-1/source/config.sub b/extra/icu/icu-release-77-1/source/config.sub +index 4aaae46f..256d309a 100644 +--- a/extra/icu/icu-release-77-1/source/config.sub ++++ b/extra/icu/icu-release-77-1/source/config.sub +@@ -1254,6 +1254,7 @@ case $cpu-$vendor in + | aarch64_be \ + | aarch64c \ + | abacus \ ++ | sw_64 \ + | alpha \ + | alpha64 \ + | alpha64ev56 \ +diff --git a/extra/icu/icu-release-77-1/source/configure b/extra/icu/icu-release-77-1/source/configure +index 5bac9bf5..250c938a 100755 +--- a/extra/icu/icu-release-77-1/source/configure ++++ b/extra/icu/icu-release-77-1/source/configure +@@ -5803,6 +5803,12 @@ case "${host}" in + else + icu_cv_host_frag=mh-solaris + fi ;; ++sw_64*-*-linux-gnu) ++ if test "$GCC" = yes; then ++ icu_cv_host_frag=mh-sw_64-linux-gcc ++ else ++ icu_cv_host_frag=mh-sw_64-linux-cc ++ fi ;; + alpha*-*-linux-gnu) + if test "$GCC" = yes; then + icu_cv_host_frag=mh-alpha-linux-gcc +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..786b0f8a 100644 +--- 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 +@@ -154,7 +154,7 @@ int main(int argc, char** argv) { + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ + defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ +- defined(__SH4__) || defined(__alpha__) || \ ++ defined(__SH4__) || defined(__alpha__) || defined(__sw_64__) || \ + defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) ||\ + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || defined(__e2k__) || \ +-- +2.33.0 + diff --git a/mysql.spec b/mysql.spec index 6baacbd0a7a12ec3746ef73e881d0109ec67ec00..d0b25f94de1269543fb69d14b9e656568aa516e5 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.43 -Release: 1 +Release: 2 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPL-2.0-or-later AND LGPL-2.1-only AND BSL-1.0 AND GPL-1.0-or-later OR Artistic-1.0-Perl AND BSD-2-Clause @@ -61,6 +61,7 @@ Patch81: disable-moutline-atomics-for-aarch64.patch Patch115: boost-1.58.0-pool.patch Patch125: boost-1.57.0-mpl-print.patch Patch126: mysql-Add-sw64-architecture.patch +Patch9000: mysql-Add-sw64-architecture-2.patch BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel lz4 BuildRequires: lz4-devel mecab-devel bison libzstd-devel @@ -229,6 +230,7 @@ pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) popd %ifarch sw_64 %patch126 -p1 +%patch9000 -p1 %endif pushd mysql-test add_test () { @@ -543,6 +545,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Mon Sep 15 2025 zhang_chunjing - 8.0.43-2 +- fix sw patch + * Wed Jul 23 2025 yaoxin <1024769339@qq.com> - 8.0.43-1 - Update to 8.4.6 for fix CVEs (CVE-2025-50068,CVE-2025-50077,CVE-2025-50078, CVE-2025-50079,CVE-2025-50080,CVE-2025-50081,CVE-2025-50082,CVE-2025-50083,