diff --git a/fix-protobuf-version-22-and-up.patch b/fix-protobuf-version-22-and-up.patch new file mode 100644 index 0000000000000000000000000000000000000000..65df2521ee908fd68acb15b359985a3406d2acda --- /dev/null +++ b/fix-protobuf-version-22-and-up.patch @@ -0,0 +1,57 @@ +From 7e252db5027c0dddb4c5a403ba0a481c35c10283 Mon Sep 17 00:00:00 2001 +From: gordonwwang +Date: Sun, 18 Feb 2024 14:27:33 +0800 +Subject: [PATCH] Fix build failure with Protobuf-24.2 + +--- + cmake/fileutils.cmake | 5 ++++- + cmake/protobuf.cmake | 16 ++++++++++++++++ + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/cmake/fileutils.cmake b/cmake/fileutils.cmake +index da98301..22dfb8d 100644 +--- a/cmake/fileutils.cmake ++++ b/cmake/fileutils.cmake +@@ -128,8 +128,11 @@ IF(LINUX) + SET(DEPENDENCIES) + FOREACH(LINE ${OBJDUMP_OUTPUT_LIST}) + STRING(REGEX MATCH +- "^[ ]+NEEDED[ ]+([-_A-Za-z0-9\\.]+)" UNUSED ${LINE}) ++ "^[ ]+NEEDED[ ]+([-+_A-Za-z0-9\\.]+)" UNUSED ${LINE}) + IF(CMAKE_MATCH_1) ++ IF(CMAKE_MATCH_1 STREQUAL "ld-linux-x86-64.so.2" OR CMAKE_MATCH_1 STREQUAL "ld-linux-aarch64.so.1") ++ SET(CMAKE_MATCH_1 "libdl.so.2") ++ ENDIF() + LIST(APPEND DEPENDENCIES ${CMAKE_MATCH_1}) + ENDIF() + ENDFOREACH() +diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake +index 11c0f92..447ce6c 100644 +--- a/cmake/protobuf.cmake ++++ b/cmake/protobuf.cmake +@@ -191,6 +191,22 @@ MACRO(MYSQL_CHECK_PROTOBUF) + ) + ENDIF() + ++ # fix protobuf version 22 and up in Linux ++ IF(LINUX AND WITH_PROTOBUF STREQUAL "system" AND PB_MINOR_VERSION VERSION_GREATER 21) ++ FIND_OBJECT_DEPENDENCIES("${PROTOBUF_LIBRARY}" protobuf_dependencies) ++ SET_TARGET_PROPERTIES(ext::libprotobuf PROPERTIES ++ INTERFACE_LINK_LIBRARIES "${protobuf_dependencies}" ++ ) ++ FIND_OBJECT_DEPENDENCIES("${PROTOBUF_LITE_LIBRARY}" lite_dependencies) ++ SET_TARGET_PROPERTIES(ext::libprotobuf-lite PROPERTIES ++ INTERFACE_LINK_LIBRARIES "${lite_dependencies}" ++ ) ++ FIND_OBJECT_DEPENDENCIES("${Protobuf_PROTOC_LIBRARY}" protoc_dependencies) ++ SET_TARGET_PROPERTIES(ext::libprotoc PROPERTIES ++ INTERFACE_LINK_LIBRARIES "${protoc_dependencies}" ++ ) ++ ENDIF() ++ + IF("${PROTOBUF_VERSION}" VERSION_LESS "${MIN_PROTOBUF_VERSION_REQUIRED}") + COULD_NOT_FIND_PROTOBUF() + ENDIF() +-- +2.33.0 + diff --git a/mysql.spec b/mysql.spec index 1fdbf55d9e4f990bd5b73e50e85fbfc5fec35424..0e427bb881124d45f81f31f8a39c4d28b7e7dcc4 100644 --- a/mysql.spec +++ b/mysql.spec @@ -30,7 +30,7 @@ %global sameevr %{?epoch:%{epoch}:}%{version}-%{release} Name: mysql Version: 8.0.35 -Release: 1 +Release: 2 Summary: MySQL client programs and shared libraries URL: http://www.mysql.com License: GPLv2 with exceptions and LGPLv2 and BSD @@ -65,6 +65,7 @@ Patch125: boost-1.57.0-mpl-print.patch %ifarch riscv64 Patch128: riscv-lock-free.patch %endif +Patch129: fix-protobuf-version-22-and-up.patch BuildRequires: cmake gcc-c++ libaio-devel libedit-devel libevent-devel libicu-devel lz4 BuildRequires: lz4-devel mecab-devel bison libzstd-devel @@ -233,6 +234,7 @@ popd %ifarch riscv64 %patch128 -p1 %endif +%patch129 -p1 pushd mysql-test add_test () { echo "$1" : BUG#0 "${@:2}" >> %{skiplist} @@ -547,6 +549,9 @@ fi %{_mandir}/man1/mysql_config.1* %changelog +* Sun Feb 18 2024 Ge Wang - 8.0.35-2 +- Fix protobuf version 22 and up + * Tue Nov 07 2023 yaoxin - 8.0.35-1 - Upgrade to 8.0.35 for fix cves