From owner-dev-commits-ports-main@freebsd.org Sun Aug 8 14:24:56 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 50889657AC0; Sun, 8 Aug 2021 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GjM1N1s83z4hRV; Sun, 8 Aug 2021 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 242A016073; Sun, 8 Aug 2021 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 178EOuBa080067; Sun, 8 Aug 2021 14:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 178EOuZB080066; Sun, 8 Aug 2021 14:24:56 GMT (envelope-from git) Date: Sun, 8 Aug 2021 14:24:56 GMT Message-Id: <202108081424.178EOuZB080066@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: bfbb37ff8d26 - main - databases/percona57-*: update to 5.7.34-37 GA release MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfbb37ff8d26b493b6e316b465b93988019d2aa4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2021 14:24:56 -0000 The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfbb37ff8d26b493b6e316b465b93988019d2aa4 commit bfbb37ff8d26b493b6e316b465b93988019d2aa4 Author: Dima Panov AuthorDate: 2021-08-08 14:22:59 +0000 Commit: Dima Panov CommitDate: 2021-08-08 14:22:59 +0000 databases/percona57-*: update to 5.7.34-37 GA release PR: 257501 --- databases/percona57-client/Makefile | 2 +- ...e_build__configurations_compiler__options.cmake | 6 ++--- ...e_build__configurations_compiler__options.cmake | 6 ++--- databases/percona57-server/Makefile | 2 +- databases/percona57-server/distinfo | 6 ++--- .../percona57-server/files/patch-CMakeLists.txt | 4 ++-- ...e_build__configurations_compiler__options.cmake | 6 ++--- .../files/patch-sql_locks_shared__spin__lock.cc | 11 +++++++++ .../files/patch-storage_rocksdb_CMakeLists.txt | 28 +++++++++++----------- databases/percona57-server/pkg-plist | 2 ++ 10 files changed, 43 insertions(+), 30 deletions(-) diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile index 36ad77a466ce..e2492b832489 100644 --- a/databases/percona57-client/Makefile +++ b/databases/percona57-client/Makefile @@ -1,7 +1,7 @@ # Created by: Mark Felder PORTNAME= percona -PORTREVISION?= 1 +PORTREVISION?= 0 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake index 2c0937746b2a..4eca5cfb5df9 100644 --- a/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake +++ b/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake @@ -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) diff --git a/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake index 2c0937746b2a..4eca5cfb5df9 100644 --- a/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake +++ b/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake @@ -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) diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile index d912d2e405ae..274dbbbe6a59 100644 --- a/databases/percona57-server/Makefile +++ b/databases/percona57-server/Makefile @@ -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 \ diff --git a/databases/percona57-server/distinfo b/databases/percona57-server/distinfo index f952429e98c1..74d6b98d2593 100644 --- a/databases/percona57-server/distinfo +++ b/databases/percona57-server/distinfo @@ -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 diff --git a/databases/percona57-server/files/patch-CMakeLists.txt b/databases/percona57-server/files/patch-CMakeLists.txt index 92d09f7fe3d1..47c8a57168cb 100644 --- a/databases/percona57-server/files/patch-CMakeLists.txt +++ b/databases/percona57-server/files/patch-CMakeLists.txt @@ -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 ) diff --git a/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake index 2c0937746b2a..4eca5cfb5df9 100644 --- a/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake +++ b/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake @@ -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) diff --git a/databases/percona57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/percona57-server/files/patch-sql_locks_shared__spin__lock.cc new file mode 100644 index 000000000000..ca63b9f31439 --- /dev/null +++ b/databases/percona57-server/files/patch-sql_locks_shared__spin__lock.cc @@ -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); + } diff --git a/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt b/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt index 10a074b9cf92..1d6bfda7483e 100644 --- a/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt +++ b/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt @@ -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 diff --git a/databases/percona57-server/pkg-plist b/databases/percona57-server/pkg-plist index 4e6896142dc3..c891a5017afa 100644 --- a/databases/percona57-server/pkg-plist +++ b/databases/percona57-server/pkg-plist @@ -101,6 +101,8 @@ lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/connection_control.so lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/data_masking.ini +lib/mysql/plugin/data_masking.so lib/mysql/plugin/group_replication.so lib/mysql/plugin/ha_example.so lib/mysql/plugin/keyring_file.so