--- ../percona57-server/Makefile 2021-04-06 14:55:50.000000000 +0300 +++ percona57-server/Makefile 2021-07-30 02:13:02.701665000 +0300 @@ -1,7 +1,7 @@ # Created by: Mark Felder PORTNAME?= percona -DISTVERSION= 5.7.31-34 +DISTVERSION= 5.7.34-37 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ --- ../percona57-server/distinfo 2020-09-02 17:39:50.000000000 +0300 +++ percona57-server/distinfo 2021-07-30 02:13:07.530998000 +0300 @@ -1,5 +1,5 @@ -TIMESTAMP = 1599042632 -SHA256 (percona-server-5.7.31-34.tar.gz) = 60afa347e142077d96ce7f8e8d9c635a3b01b59d2a7487713817be3de5086000 -SIZE (percona-server-5.7.31-34.tar.gz) = 86189514 +TIMESTAMP = 1627600387 +SHA256 (percona-server-5.7.34-37.tar.gz) = 3fae914ffcdcae5f567c83427b6d7799296e46b9deb891dd8e268d307052ae48 +SIZE (percona-server-5.7.34-37.tar.gz) = 88187760 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 --- ../percona57-server/files/patch-CMakeLists.txt 2017-01-10 21:54:32.000000000 +0300 +++ percona57-server/files/patch-CMakeLists.txt 2021-07-30 02:42:17.159312000 +0300 @@ -28,8 +28,8 @@ # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} + INSTALL(FILES + README @@ -714,6 +711,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) --- ../percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake 2020-09-02 17:39:50.000000000 +0300 +++ percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake 2021-07-30 02:19:48.969163000 +0300 @@ -2,10 +2,10 @@ +++ cmake/build_configurations/compiler_options.cmake @@ -50,7 +50,7 @@ IF(UNIX) IF(CMAKE_COMPILER_IS_GNUCC) - SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) # gcc-9 or older -- SET(COMMON_C_FLAGS "-fabi-version=2 ${COMMON_C_FLAGS}") -+ SET(COMMON_C_FLAGS "${COMMON_C_FLAGS}") +- SET(COMMON_C_FLAGS "-fabi-version=2 ${COMMON_C_FLAGS}") ++ SET(COMMON_C_FLAGS "${COMMON_C_FLAGS}") ENDIF() # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND) --- ../percona57-server/files/patch-sql_locks_shared__spin__lock.cc 1970-01-01 03:00:00.000000000 +0300 +++ percona57-server/files/patch-sql_locks_shared__spin__lock.cc 2021-07-30 02:54:19.560641000 +0300 @@ -0,0 +1,11 @@ +--- sql/locks/shared_spin_lock.cc.orig 2021-05-20 11:22:55 UTC ++++ sql/locks/shared_spin_lock.cc +@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or + #if defined(__APPLE__) + my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast(self)); + #else +- my_atomic_store64(&this->m_exclusive_owner, self); ++ my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast(self)); + #endif + return (*this); + } --- ../percona57-server/files/patch-storage_rocksdb_CMakeLists.txt 2020-09-02 17:39:50.000000000 +0300 +++ percona57-server/files/patch-storage_rocksdb_CMakeLists.txt 2021-07-30 02:34:15.562244000 +0300 @@ -1,6 +1,6 @@ ---- storage/rocksdb/CMakeLists.txt.orig 2019-05-16 05:06:00 UTC -+++ storage/rocksdb/CMakeLists.txt -@@ -23,8 +23,8 @@ ELSE () +--- storage/rocksdb/CMakeLists.txt.orig 2021-07-30 02:26:13.135102000 +0300 ++++ storage/rocksdb/CMakeLists.txt 2021-07-30 02:29:42.990461000 +0300 +@@ -23,8 +23,8 @@ ENDIF () # check platform support, no 32 bit @@ -11,13 +11,12 @@ RETURN () ENDIF () -@@ -123,38 +123,6 @@ EXECUTE_PROCESS( - # split the list into lines - STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT}) +@@ -166,37 +166,6 @@ + ${LZ4_INCLUDE_DIR} + ) -# add bundled compression code --SET(ROCKSDB_LIB_SOURCES -- ${ROCKSDB_LIB_SOURCES} +-SET(ZSTD_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c - ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c - ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c @@ -47,13 +46,14 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c -) - - INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb - ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include -@@ -198,6 +166,7 @@ SET(ROCKSDB_SOURCES - ) + SET(ROCKSDB_SOURCES + ${ROCKSDB_SOURCES} + ${ZSTD_SOURCES} +@@ -230,7 +199,7 @@ + SET(rocksdb_static_libs ${rocksdb_static_libs} "${ROCKSDB_LIB_PATH}/${ROCKSDB_LIB_NAME}") + ENDIF() - SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl") +-SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl") +SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl -llz4 -lzstd") MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY --- ../percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake 2020-09-02 17:39:50.000000000 +0300 +++ percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake 2021-07-30 02:47:36.146369000 +0300 @@ -2,10 +2,10 @@ +++ cmake/build_configurations/compiler_options.cmake @@ -50,7 +50,7 @@ IF(UNIX) IF(CMAKE_COMPILER_IS_GNUCC) - SET(COMMON_C_FLAGS "-g -fno-omit-frame-pointer -fno-strict-aliasing") + SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing") IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) # gcc-9 or older -- SET(COMMON_C_FLAGS "-fabi-version=2 ${COMMON_C_FLAGS}") -+ SET(COMMON_C_FLAGS "${COMMON_C_FLAGS}") +- SET(COMMON_C_FLAGS "-fabi-version=2 ${COMMON_C_FLAGS}") ++ SET(COMMON_C_FLAGS "${COMMON_C_FLAGS}") ENDIF() # Disable inline optimizations for valgrind testing to avoid false positives IF(WITH_VALGRIND)