Index: head/databases/mysqlwsrep57-server/Makefile =================================================================== --- head/databases/mysqlwsrep57-server/Makefile (revision 461147) +++ head/databases/mysqlwsrep57-server/Makefile (revision 461148) @@ -1,199 +1,199 @@ # Created by: Vasil Dimov # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION?= 5.7.20 +PORTVERSION?= 5.7.21 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.13 +DISTVERSIONSUFFIX?= -25.14 CATEGORIES= databases ipv6 MASTER_SITES+= SF/boost/boost/1.59.0:boost PKGNAMESUFFIX= 57-server DISTFILES+= boost_1_59_0${EXTRACT_SUFX}:boost MAINTAINER= devel@galeracluster.com COMMENT= MySQL database enhanced with Galera replication (server package) LICENSE= GPLv2 RUN_DEPENDS= bash:shells/bash \ lsof:sysutils/lsof \ netcat:net/netcat \ rsync:net/rsync \ socat:net/socat LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4 USES= bison \ cmake:outsource,noninja \ compiler:c++11-lib \ compiler:c11 \ libedit \ mysql:57 \ perl5 \ shebangfix \ ssl USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir USE_GITHUB= yes GH_ACCOUNT= codership GH_PROJECT?= mysql-wsrep DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql NOT_FOR_ARCHS= aarch64 armv6 armv7 powerpc64 NOT_FOR_ARCHS_REASON= Not supported platform CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_BOOST="${WRKDIR}/boost_1_59_0" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DINSTALL_MYSQLTESTDIR=0 \ -DDOWNLOAD_BOOST=1 \ -DWITH_WSREP=1 SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* .ifdef USE_MYSQL .error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine it and try again. .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} CONFLICTS_INSTALL= mariadb*-server-* \ mysql[0-9]*-server-* \ mysqlwsrep56*-server-* \ mysqlwsrep[1-489]*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= my_print_defaults.1 \ myisam_ftdump.1 \ myisamchk.1 \ myisamlog.1 \ myisampack.1 \ mysql.server.1 \ mysql_convert_table_format.1 \ mysql_fix_extensions.1 \ mysql_install_db.1 \ mysql_plugin.1 \ mysql_secure_installation.1 \ mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 \ mysql_upgrade.1 \ mysql_zap.1 \ mysqlbug.1 \ mysqld_multi.1 \ mysqld_safe.1 \ mysqldumpslow.1 \ mysqlhotcopy.1 \ mysqlman.1 \ mysqltest.1 \ perror.1 \ replace.1 \ resolve_stack_dump.1 \ resolveip.1 OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+=FEDER="" .include .if ${SSL_DEFAULT} == base CMAKE_ARGS+= -DWITH_SSL=system .else CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} .endif # ${LOCALBASE}/include/lz4.h does not compile with Clang 6. # Also MySQL code itself needs -Wno-c++11-narrowing when Clang 6 is used. .if ${OSVERSION} >= 1200056 CFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS CXXFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS -Wno-c++11-narrowing LDFLAGS+= -L${LOCALBASE}/lib .endif post-extract: ${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h post-patch: ${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysqlwsrep57-server/distinfo =================================================================== --- head/databases/mysqlwsrep57-server/distinfo (revision 461147) +++ head/databases/mysqlwsrep57-server/distinfo (revision 461148) @@ -1,5 +1,5 @@ -TIMESTAMP = 1501158272 +TIMESTAMP = 1518010828 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.20-25.13_GH0.tar.gz) = 2c55bbbdc7dc1799ffd39a63bbfcfd1a9b8ae76b674016f7d00988887ecab095 -SIZE (codership-mysql-wsrep-wsrep_5.7.20-25.13_GH0.tar.gz) = 51921340 +SHA256 (codership-mysql-wsrep-wsrep_5.7.21-25.14_GH0.tar.gz) = 30991ae681ba38119e3dc5dfd023da50ebeac4e7c4210ecfa6fbe04b7d1d7d55 +SIZE (codership-mysql-wsrep-wsrep_5.7.21-25.14_GH0.tar.gz) = 52003425 Index: head/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc (revision 461147) +++ head/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc (nonexistent) @@ -1,11 +0,0 @@ ---- sql-common/client_authentication.cc.orig 2018-01-22 16:19:07.776289000 +0200 -+++ sql-common/client_authentication.cc 2018-01-22 16:19:26.756981000 +0200 -@@ -84,7 +84,7 @@ - - if (mysql->options.extension != NULL && - mysql->options.extension->server_public_key_path != NULL && -- mysql->options.extension->server_public_key_path != '\0') -+ mysql->options.extension->server_public_key_path[0] != '\0') - { - pub_key_file= fopen(mysql->options.extension->server_public_key_path, - "r"); Property changes on: head/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc (revision 461147) +++ head/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc (nonexistent) @@ -1,11 +0,0 @@ ---- storage/innobase/row/row0sel.cc.orig 2018-01-22 18:12:31.679942000 +0200 -+++ storage/innobase/row/row0sel.cc 2018-01-22 18:12:55.834909000 +0200 -@@ -5193,7 +5193,7 @@ - reporting due to search views etc. */ - if (prev_rec != NULL - && prebuilt->m_mysql_handler->end_range != NULL -- && prebuilt->idx_cond == false && end_loop >= 100) { -+ && prebuilt->idx_cond == NULL && end_loop >= 100) { - - dict_index_t* key_index = prebuilt->index; - bool clust_templ_for_sec = false; Property changes on: head/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt (revision 461147) +++ head/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt (revision 461148) @@ -1,29 +1,29 @@ ---- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ libmysql/CMakeLists.txt -@@ -215,7 +215,7 @@ IF(WIN32) - ENDIF() - +--- libmysql/CMakeLists.txt.orig 2018-01-23 20:34:50.742425000 +0200 ++++ libmysql/CMakeLists.txt 2018-01-23 20:36:13.066280000 +0200 +@@ -235,7 +235,7 @@ + ADD_SUBDIRECTORY(authentication_ldap) + # Merge several convenience libraries into one big mysqlclient --MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL) # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED) +@@ -271,7 +271,8 @@ # and link them together into shared library. - MERGE_LIBRARIES(libmysql SHARED ${LIBS} + MERGE_LIBRARIES_SHARED(libmysql ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) -+IF(FALSE) ++ COMPONENT SharedLibraries SKIP_INSTALL) ++ IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -313,6 +314,7 @@ ENDIF() - # to initialize api_calls[] array in api_test.c +@@ -316,6 +317,7 @@ + SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) + + ENDIF() ++ ENDIF() + ENDIF() + # - SET(CLIENT_API_FUNCTION_LIST "") -+ ENDIF() - FOREACH(api ${CLIENT_API_FUNCTIONS}) - SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") - ENDFOREACH()