From 04edf093182bcd79c908344535f1515260e8b793 Mon Sep 17 00:00:00 2001 From: siyongchang Date: Tue, 29 Jul 2025 13:23:39 +0800 Subject: [PATCH] Fix the issue with the mysql-Add-sw_64-architecture.patch --- mysql-Add-sw64-architecture.patch | 2 +- mysql.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql-Add-sw64-architecture.patch b/mysql-Add-sw64-architecture.patch index 02445fb..10cab12 100644 --- a/mysql-Add-sw64-architecture.patch +++ b/mysql-Add-sw64-architecture.patch @@ -1510,7 +1510,7 @@ index 329ce92b..50ce8e68 100644 +++ b/extra/rapidjson/include/rapidjson/rapidjson.h @@ -239,7 +239,7 @@ // Detect with architecture macros - # elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__) + # 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(__sw_64__) || 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__) diff --git a/mysql.spec b/mysql.spec index c2ec49c..d99ad5e 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 @@ -543,6 +543,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Tue Jul 29 2025 Yongchang Si - 8.0.43-2 +- Fix the issue with the mysql-Add-sw_64-architecture.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, -- Gitee