From owner-svn-ports-all@freebsd.org Fri Dec 6 16:00:39 2019 Return-Path: Delivered-To: svn-ports-all@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 4F9251CF357; Fri, 6 Dec 2019 16:00:39 +0000 (UTC) (envelope-from fluffy@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Ty3q2B6Dz4Yld; Fri, 6 Dec 2019 16:00:39 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2E4633996; Fri, 6 Dec 2019 16:00:39 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB6G0dZ5018687; Fri, 6 Dec 2019 16:00:39 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB6G0abK018673; Fri, 6 Dec 2019 16:00:36 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <201912061600.xB6G0abK018673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Fri, 6 Dec 2019 16:00:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519153 - in head/databases: percona57-client percona57-client/files percona57-server percona57-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/databases: percona57-client percona57-client/files percona57-server percona57-server/files X-SVN-Commit-Revision: 519153 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2019 16:00:39 -0000 Author: fluffy Date: Fri Dec 6 16:00:36 2019 New Revision: 519153 URL: https://svnweb.freebsd.org/changeset/ports/519153 Log: databases/percona57-{server,client} update to 5.7.27-30 release percona57-client: - Install compat pkgconfig symlink as well as it done for libs (many packages still search for mysqlclient.pc only) percona57-server: - Proper use system lz4/zstd libs for rocksdb engine - Declare system libevent to use instead of bundled one - Stop pollute libdata/pkgconfig dir with unneeded .pc file - Unbreak build with DEFAULT_VERSIONS+=ssl=libressl PR: 239347 Submitted by: fluffy [cleanups], Igor Zabelin [update] Approved by: maintainer (timeout, >3 months) Added: head/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc (contents, props changed) head/databases/percona57-server/files/patch-sql_auth_sha2__password__common.cc (contents, props changed) head/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt (contents, props changed) head/databases/percona57-server/files/patch-vio_viosslfactories.c (contents, props changed) Modified: head/databases/percona57-client/Makefile head/databases/percona57-client/files/patch-scripts_CMakeLists.txt head/databases/percona57-client/pkg-plist head/databases/percona57-server/Makefile head/databases/percona57-server/distinfo head/databases/percona57-server/files/extrapatch-tokudb head/databases/percona57-server/files/patch-scripts_CMakeLists.txt head/databases/percona57-server/files/patch-sql_mysqld.cc head/databases/percona57-server/pkg-plist Modified: head/databases/percona57-client/Makefile ============================================================================== --- head/databases/percona57-client/Makefile Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-client/Makefile Fri Dec 6 16:00:36 2019 (r519153) @@ -49,5 +49,6 @@ post-install: ${LN} -s libperconaserverclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 + ${LN} -s perconaserverclient.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mysqlclient.pc .include "${MASTERDIR}/Makefile" Modified: head/databases/percona57-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/percona57-client/files/patch-scripts_CMakeLists.txt Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-client/files/patch-scripts_CMakeLists.txt Fri Dec 6 16:00:36 2019 (r519153) @@ -37,11 +37,11 @@ @@ -332,6 +337,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) ENDIF() @@ -417,25 +424,7 @@ # On Unix, most of the files end up in the bin directory Modified: head/databases/percona57-client/pkg-plist ============================================================================== --- head/databases/percona57-client/pkg-plist Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-client/pkg-plist Fri Dec 6 16:00:36 2019 (r519153) @@ -128,6 +128,7 @@ lib/mysql/libperconaserverclient.a lib/mysql/libperconaserverclient.so lib/mysql/libperconaserverclient.so.20 %%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so +libdata/pkgconfig/mysqlclient.pc libdata/pkgconfig/perconaserverclient.pc man/man1/comp_err.1.gz man/man1/mysql.1.gz Modified: head/databases/percona57-server/Makefile ============================================================================== --- head/databases/percona57-server/Makefile Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-server/Makefile Fri Dec 6 16:00:36 2019 (r519153) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.7.26-29 -PORTREVISION?= 2 +DISTVERSION= 5.7.27-30 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ SF/boost/boost/1.59.0:boost @@ -18,7 +18,8 @@ COMMENT?= Multithreaded SQL database (server) LICENSE?= GPLv2+ LIB_DEPENDS= libevent.so:devel/libevent \ - liblz4.so:archivers/liblz4 + liblz4.so:archivers/liblz4 \ + libzstd.so:archivers/zstd SLAVEDIRS= databases/percona57-client \ databases/percona57-pam-for-mysql @@ -44,7 +45,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ + -DINSTALL_MYSQLTESTDIR="${MY_TESTDIR}" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ @@ -53,10 +54,12 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_EDITLINE=system \ + -DWITH_LIBEVENT=system \ -DWITH_LIBWRAP=0 \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ - -DINSTALL_MYSQLTESTDIR=0 \ + -DWITH_ZSTD=system \ + -DWITH_ROCKSDB=0 \ -DWITH_BOOST="${WRKDIR}/boost_1_59_0" SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -92,7 +95,7 @@ FASTMTX_DESC= Replace mutexes with spinlocks FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 INNODBMEMCACHED_DESC= InnoDB Memcached plugin INNODBMEMCACHED_CMAKE_ON= -DWITH_INNODB_MEMCACHED=1 -OPENSSL_CMAKE_ON= -DWITH_SSL=system +OPENSSL_CMAKE_ON= -DWITH_SSL="${MY_SSL}" OPENSSL_USES= ssl TOKUDB_DESC= TokuDB Engine (experimental) TOKUDB_CMAKE_ON= -DUSE_CTAGS=0 @@ -128,6 +131,12 @@ CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0 .include +.if !${SSL_DEFAULT:Mlibressl*} +MY_TESTSIR= "share/mysql/tests" +.else +MY_TESTDIR= "" +.endif + .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else @@ -156,6 +165,13 @@ CXXFLAGS+= -fpermissive .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif + +.if ${SSL_DEFAULT} == base +MY_SSL= system +.else +MY_SSL= ${OPENSSLBASE} +.endif + .if ${PORT_OPTIONS:MTOKUDB} NOT_FOR_ARCHS= i386 Modified: head/databases/percona57-server/distinfo ============================================================================== --- head/databases/percona57-server/distinfo Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-server/distinfo Fri Dec 6 16:00:36 2019 (r519153) @@ -1,5 +1,5 @@ -TIMESTAMP = 1560188655 -SHA256 (percona-server-5.7.26-29.tar.gz) = 0deb6d8a6eb910286a585c60beecd5fb8ce38fc2a5134adf45e418efbe4ed6b5 -SIZE (percona-server-5.7.26-29.tar.gz) = 84327421 +TIMESTAMP = 1567963686 +SHA256 (percona-server-5.7.27-30.tar.gz) = b50dff3d222c6444468ff328c652df24a81103627c9da2fa98ee878b8f65a226 +SIZE (percona-server-5.7.27-30.tar.gz) = 84672298 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 Modified: head/databases/percona57-server/files/extrapatch-tokudb ============================================================================== --- head/databases/percona57-server/files/extrapatch-tokudb Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-server/files/extrapatch-tokudb Fri Dec 6 16:00:36 2019 (r519153) @@ -1,13 +1,16 @@ --- storage/tokudb/CMakeLists.txt.orig 2016-03-03 15:32:33.000000000 +0200 +++ storage/tokudb/CMakeLists.txt 2016-03-08 10:13:58.000000000 +0200 -@@ -1,6 +1,6 @@ - SET(TOKUDB_VERSION 5.6.29-76.2) - # PerconaFT only supports x86-64 and cmake-2.8.9+ --IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND -+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" AND - NOT CMAKE_VERSION VERSION_LESS "2.8.9") - CHECK_CXX_SOURCE_COMPILES( - " +@@ -40,8 +40,8 @@ + ENDIF () + + # check platform support, no 32 bit +-IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +- MESSAGE (${TOKUDB_STATUS_MODE} "x86_64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building TokuDB") ++IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") ++ MESSAGE (${TOKUDB_STATUS_MODE} "amd64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building TokuDB") + RETURN () + ENDIF () + @@ -118,5 +118,5 @@ tokudb_thread.cc) MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY Added: head/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc Fri Dec 6 16:00:36 2019 (r519153) @@ -0,0 +1,21 @@ +--- mysys_ssl/my_crypt.cc.orig 2019-05-16 05:06:00 UTC ++++ mysys_ssl/my_crypt.cc +@@ -30,7 +30,7 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) + #define RAND_OpenSSL() RAND_SSLeay() + #endif +@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX() + MyEncryptionCTX::~MyEncryptionCTX() + { + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL) + EVP_CIPHER_CTX_cleanup(ctx); + delete ctx; + ERR_remove_thread_state(0); Modified: head/databases/percona57-server/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/percona57-server/files/patch-scripts_CMakeLists.txt Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-server/files/patch-scripts_CMakeLists.txt Fri Dec 6 16:00:36 2019 (r519153) @@ -3,11 +3,11 @@ @@ -332,6 +332,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) ENDIF() @@ -419,7 +421,6 @@ @@ -25,6 +25,15 @@ mysqldumpslow mysqld_multi mysqld_safe +@@ -443,7 +443,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} + ESCAPE_QUOTES @ONLY) + +- IF(INSTALL_PKGCONFIGDIR) ++ IF(FALSE) + MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") + INSTALL(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} @@ -464,7 +464,7 @@ FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) Added: head/databases/percona57-server/files/patch-sql_auth_sha2__password__common.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-server/files/patch-sql_auth_sha2__password__common.cc Fri Dec 6 16:00:36 2019 (r519153) @@ -0,0 +1,12 @@ +--- sql/auth/sha2_password_common.cc.orig 2019-05-16 05:06:00 UTC ++++ sql/auth/sha2_password_common.cc +@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig + DBUG_RETURN(true); + } + m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL); +-#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) + EVP_MD_CTX_cleanup(md_context); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_MD_CTX_reset(md_context); Modified: head/databases/percona57-server/files/patch-sql_mysqld.cc ============================================================================== --- head/databases/percona57-server/files/patch-sql_mysqld.cc Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-server/files/patch-sql_mysqld.cc Fri Dec 6 16:00:36 2019 (r519153) @@ -1,6 +1,6 @@ --- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC +++ sql/mysqld.cc -@@ -1480,6 +1480,16 @@ static void clean_up_mutexes() +@@ -1517,6 +1517,16 @@ static void clean_up_mutexes() ****************************************************************************/ /* Initialise proxy protocol. */ @@ -17,3 +17,22 @@ static void set_proxy() { const char *p; +@@ -3678,6 +3688,7 @@ static int init_ssl() + { + #ifdef HAVE_OPENSSL + #ifndef HAVE_YASSL ++#ifndef LIBRESSL_VERSION_NUMBER + int fips_mode= FIPS_mode(); + if (fips_mode != 0) + { +@@ -3687,7 +3698,9 @@ static int init_ssl() + " Disabling FIPS."); + FIPS_mode_set(0); + } +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#endif ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_malloc_init(); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + OPENSSL_malloc_init(); Added: head/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt Fri Dec 6 16:00:36 2019 (r519153) @@ -0,0 +1,61 @@ +--- storage/rocksdb/CMakeLists.txt.orig 2019-05-16 05:06:00 UTC ++++ storage/rocksdb/CMakeLists.txt +@@ -23,8 +23,8 @@ + ENDIF () + + # check platform support, no 32 bit +-IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +- MESSAGE (${MYROCKS_STATUS_MODE} "x86_64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building MyRocks") ++IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") ++ MESSAGE (${MYROCKS_STATUS_MODE} "amd64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building MyRocks") + RETURN () + ENDIF () + +@@ -119,38 +119,11 @@ EXECUTE_PROCESS( + # split the list into lines + STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT}) + +-# add bundled compression code +-SET(ROCKSDB_LIB_SOURCES +- ${ROCKSDB_LIB_SOURCES} +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4hc.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4frame.c +- ${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 +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c +-) +- + INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include/rocksdb + ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/third-party/gtest-1.7.0/fused-src +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder + ) + + ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4 +@@ -183,7 +156,7 @@ SET(ROCKSDB_SOURCES + ${ROCKSDB_LIB_SOURCES} + ) + +-SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt") ++SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt -llz4 -lzstd") + + MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY + LINK_LIBRARIES ${rocksdb_static_libs} Added: head/databases/percona57-server/files/patch-vio_viosslfactories.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-server/files/patch-vio_viosslfactories.c Fri Dec 6 16:00:36 2019 (r519153) @@ -0,0 +1,11 @@ +--- vio/viosslfactories.c.orig 2019-05-16 05:06:00 UTC ++++ vio/viosslfactories.c +@@ -123,7 +123,7 @@ static DH *get_dh2048(void) + { + BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); + BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + dh->p= p; + dh->g= g; + if (! dh->p || ! dh->g) Modified: head/databases/percona57-server/pkg-plist ============================================================================== --- head/databases/percona57-server/pkg-plist Fri Dec 6 15:58:40 2019 (r519152) +++ head/databases/percona57-server/pkg-plist Fri Dec 6 16:00:36 2019 (r519153) @@ -149,7 +149,6 @@ lib/mysql/plugin/test_udf_services.so lib/mysql/plugin/udf_example.so lib/mysql/plugin/validate_password.so lib/mysql/plugin/version_token.so -libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc man/man1/myisamchk.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamlog.1.gz