Index: head/databases/mariadb103-server/Makefile =================================================================== --- head/databases/mariadb103-server/Makefile (revision 518786) +++ head/databases/mariadb103-server/Makefile (revision 518787) @@ -1,224 +1,224 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.17 +PORTVERSION= 10.3.20 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ \ http://ftp.osuosl.org/pub/${SITESDIR}/ PKGNAMESUFFIX?= 103-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE .if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_DEFINE= CONNECT_EXTRA DOCS OPTIONS_DEFINE_amd64= WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB OPTIONS_GROUP_GROONGA= ZMQ MSGPACK OPTIONS_EXCLUDE_i386= TOKUDB CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine COMPRESSION_DESC= Optional page compression ENGINES_DESC= Optional MariaDB storage engines GROONGA_DESC= Optional Mroonga features INNOBASE_DESC= InnoDB default engine MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine ROCKSDB_DESC= RocksDB LSM engine (Alpha) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine WSREP_DESC= Build wsrep clustering ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif CMAKE_ARGS+= -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="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ -DWITH_SSL="${OPENSSLBASE}" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DCMAKE_PREFIX_PATH=${PREFIX} \ CMAKE_OFF+= CONNECT_WITH_MONGO WITH_UNIT_TESTS CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \ EXAMPLE_KEY_MANAGEMENT FTEXAMPLE DATADIR= ${PREFIX}/share/mysql CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF OPTIONS_SUB= yes .if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER CMAKE_OFF+= CONC_WITH_UNITTEST WITH_WSREP USES+= readline USE_LDCONFIG= ${PREFIX}/lib/mysql .else # ! ${PKGNAMESUFFIX:M*-client} # MySQL-Server part USES+= mysql:103m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER CMAKE_OFF+= WITH_CLIENT .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI LZ4_CMAKE_BOOL= GRN_WITH_LZ4 WITH_INNODB_LZ4 WITH_ROCKSDB_LZ4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_BOOL= WITH_INNODB_LZO LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi WSREP_CMAKE_BOOL= WITH_WSREP WSREP_LIB_DEPENDS= libgalera.so:databases/galera ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include .for PLUGIN in ${DISABLED_PLUGINS} CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .endfor .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .endif # ${PKGNAMESUFFIX:M*-client} .if defined(WITH_OPENSSL_PORT) GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .include .if ${ARCH} != amd64 PLIST_SUB+= WSREP="@comment " .endif .if ${OPSYS} == DragonFly CMAKE_OFF+= WITH_TOKUDB .endif post-patch: ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake + ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c # Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 post-configure-INNOBASE-on: ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt .if ${PKGNAMESUFFIX:M*-client} post-install: ${RM} -r ${STAGEDIR}${DATADIR} ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .else # ! ${PKGNAMESUFFIX:M*-client} post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private .endif # ${PKGNAMESUFFIX:M*-client} .include Index: head/databases/mariadb103-server/distinfo =================================================================== --- head/databases/mariadb103-server/distinfo (revision 518786) +++ head/databases/mariadb103-server/distinfo (revision 518787) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564591845 -SHA256 (mariadb-10.3.17.tar.gz) = 20a1ea4fc59aae89dcc82aff0d4907b036daf9bfbd252f08162399f055097097 -SIZE (mariadb-10.3.17.tar.gz) = 71894997 +TIMESTAMP = 1575013477 +SHA256 (mariadb-10.3.20.tar.gz) = 53818f2d684e060143b4d8293da44c7f09cc676d71959405f84e6dc8affbc492 +SIZE (mariadb-10.3.20.tar.gz) = 71990355 Index: head/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt =================================================================== --- head/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (revision 518786) +++ head/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (revision 518787) @@ -1,31 +1,30 @@ ---- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC +--- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-11 05:31:43 UTC +++ libmariadb/plugins/auth/CMakeLists.txt -@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES) - LIBRARIES ${GSSAPI_LIBS}) - ENDIF() +@@ -75,6 +75,7 @@ IF(CRYPTO_PLUGIN) + ${CRYPT_SOURCE} + LIBRARIES ${CRYPT_LIBS}) -+IF(NOT WITHOUT_CLIENT) - IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL") - IF(WIN32) - SET(SHA256_LIBS crypt32) -@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W - SOURCES ${AUTH_DIR}/sha256_pw.c - LIBRARIES ${SHA256_LIBS}) ++ IF(NOT WITHOUT_CLIENT) + IF(WITH_SSL STREQUAL "GNUTLS" AND NOT WIN32) + MESSAGE1(STATUS "sha256_password not supported by GnuTLS due to missing OAEP padding") + ELSE() +@@ -85,6 +86,7 @@ IF(CRYPTO_PLUGIN) + SOURCES ${AUTH_DIR}/sha256_pw.c + LIBRARIES ${CRYPT_LIBS}) + ENDIF() ++ ENDIF() ENDIF() -+ENDIF() - # old_password plugin - REGISTER_PLUGIN(TARGET mysql_old_password -@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor + #GSSAPI client authentication plugin +@@ -119,9 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password + DEFAULT STATIC SOURCES ${AUTH_DIR}/old_password.c) - +IF(NOT WITHOUT_CLIENT) # Cleartext REGISTER_PLUGIN(TARGET mysql_clear_password TYPE MARIADB_CLIENT_PLUGIN_AUTH CONFIGURATIONS DYNAMIC STATIC OFF DEFAULT DYNAMIC SOURCES ${AUTH_DIR}/mariadb_cleartext.c) -- +ENDIF() Index: head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt =================================================================== --- head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt (nonexistent) +++ head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt (revision 518787) @@ -0,0 +1,11 @@ +--- storage/mroonga/CMakeLists.txt.orig 2019-11-06 16:01:58 UTC ++++ storage/mroonga/CMakeLists.txt +@@ -80,7 +80,7 @@ else() + set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) + endif() + +-file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) ++file(READ ${MRN_SOURCE_DIR}/version_txt MRN_VERSION) + file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) + file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) + file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) Property changes on: head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake =================================================================== --- head/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 518786) +++ head/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 518787) @@ -1,39 +1,36 @@ -Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports - ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2017-05-14 23:13:20 UTC +--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-06 16:01:58 UTC +++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake -@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) - endif () - endif () +@@ -1,5 +1,12 @@ + include(ExternalProject) +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + include_directories("/usr/include") + + add_library(lzma SHARED IMPORTED) + set_target_properties(lzma PROPERTIES IMPORTED_LOCATION + "/usr/lib/liblzma.so") +ELSE() ## add lzma with an external project set(xz_configure_opts --with-pic --enable-static) if (APPLE) @@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED) set_target_properties(lzma PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") add_dependencies(lzma build_lzma) +ENDIF() +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + include_directories("%%LOCALBASE%%/include") + add_library(snappy SHARED IMPORTED) + set_target_properties(snappy PROPERTIES IMPORTED_LOCATION + "%%LOCALBASE%%/lib/libsnappy.so") +ELSE() ## add snappy with an external project set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") @@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) set_target_properties(snappy PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") add_dependencies(snappy build_snappy) +ENDIF()