--- percona57-client.26-29/Makefile +++ percona57-client/Makefile @@ -49,5 +49,6 @@ ${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" --- percona57-client.26-29/files/patch-scripts_CMakeLists.txt +++ percona57-client/files/patch-scripts_CMakeLists.txt @@ -34,14 +34,14 @@ IF(NOT WITHOUT_SERVER) INSTALL(FILES -@@ -332,6 +337,8 @@ +@@ -326,6 +326,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 --- percona57-client.26-29/pkg-plist +++ percona57-client/pkg-plist @@ -128,6 +128,7 @@ 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 --- percona57-server.26-29/Makefile +++ percona57-server/Makefile @@ -2,8 +2,8 @@ # $FreeBSD: head/databases/percona57-server/Makefile 507877 2019-08-02 13:30:40Z jbeich $ PORTNAME?= percona -DISTVERSION= 5.7.26-29 -PORTREVISION?= 2 +DISTVERSION= 5.7.27-30 +PORTREVISION?= 0 CATEGORIES= databases ipv6 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 @@ 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 @@ -53,9 +54,11 @@ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_EDITLINE=system \ + -DWITH_LIBEVENT=system \ -DWITH_LIBWRAP=0 \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ + -DWITH_ZSTD=system \ -DINSTALL_MYSQLTESTDIR=0 \ -DWITH_BOOST="${WRKDIR}/boost_1_59_0" --- percona57-server.26-29/distinfo +++ percona57-server/distinfo @@ -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 --- /dev/null +++ percona57-server/files/patch-mysys__ssl_my__crypt.cc @@ -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); --- percona57-server.26-29/files/patch-scripts_CMakeLists.txt +++ percona57-server/files/patch-scripts_CMakeLists.txt @@ -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) --- /dev/null +++ percona57-server/files/patch-sql_auth_sha2__password__common.cc @@ -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); --- percona57-server.26-29/files/patch-sql_mysqld.cc +++ percona57-server/files/patch-sql_mysqld.cc @@ -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(); --- /dev/null +++ percona57-server/files/patch-storage_rocksdb_CMakeLists.txt @@ -0,0 +1,50 @@ +--- storage/rocksdb/CMakeLists.txt.orig 2019-05-16 05:06:00 UTC ++++ storage/rocksdb/CMakeLists.txt +@@ -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} --- /dev/null +++ percona57-server/files/patch-vio_viosslfactories.c @@ -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) --- percona57-server.26-29/pkg-plist +++ percona57-server/pkg-plist @@ -149,7 +149,6 @@ 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