--- Makefile (revision 517240) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.17 +PORTVERSION= 10.3.20 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ --- distinfo (revision 517240) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564591845 -SHA256 (mariadb-10.3.17.tar.gz) = 20a1ea4fc59aae89dcc82aff0d4907b036daf9bfbd252f08162399f055097097 -SIZE (mariadb-10.3.17.tar.gz) = 71894997 +TIMESTAMP = 1573444587 +SHA256 (mariadb-10.3.20.tar.gz) = 53818f2d684e060143b4d8293da44c7f09cc676d71959405f84e6dc8affbc492 +SIZE (mariadb-10.3.20.tar.gz) = 71990355 --- files/patch-CMakeLists.txt (revision 517240) +++ files/patch-CMakeLists.txt (working copy) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2019-05-13 18:13:05 UTC +--- CMakeLists.txt.orig 2019-11-06 16:01:56 UTC +++ CMakeLists.txt -@@ -491,14 +491,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -511,8 +511,10 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -11,10 +11,3 @@ # MDEV-6526 these files are not installed anymore #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC - # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) - --IF(UNIX) -+IF(FALSE) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) - ENDIF() - --- files/patch-libmariadb_plugins_auth_CMakeLists.txt (revision 517240) +++ files/patch-libmariadb_plugins_auth_CMakeLists.txt (working copy) @@ -1,25 +1,25 @@ ---- 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 @@ -27,5 +27,4 @@ CONFIGURATIONS DYNAMIC STATIC OFF DEFAULT DYNAMIC SOURCES ${AUTH_DIR}/mariadb_cleartext.c) -- +ENDIF() --- files/patch-storage_rocksdb_build__rocksdb.cmake (revision 517240) +++ files/patch-storage_rocksdb_build__rocksdb.cmake (working copy) @@ -1,6 +1,6 @@ ---- storage/rocksdb/build_rocksdb.cmake.orig 2018-10-02 09:45:43 UTC +--- storage/rocksdb/build_rocksdb.cmake.orig 2019-11-06 16:01:58 UTC +++ storage/rocksdb/build_rocksdb.cmake -@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD +@@ -71,10 +71,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD STREQUAL "OFF SET(CMAKE_REQUIRED_LIBRARIES zstd) CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID) UNSET(CMAKE_REQUIRED_LIBRARIES) --- files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 517240) +++ files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (working copy) @@ -1,10 +1,7 @@ -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") @@ -16,7 +13,7 @@ ## 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) +@@ -71,8 +78,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) @@ -32,7 +29,7 @@ ## 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) +@@ -109,3 +123,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)