Date: Tue, 26 Jun 2018 19:06:47 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473405 - in head/databases: mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files Message-ID: <201806261906.w5QJ6lNs003315@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Tue Jun 26 19:06:47 2018 New Revision: 473405 URL: https://svnweb.freebsd.org/changeset/ports/473405 Log: databases/mariadb102-server: Update to 10.2.16 Added: head/databases/mariadb102-server/files/patch-storage_rocksdb_build__rocksdb.cmake (contents, props changed) Modified: head/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt head/databases/mariadb102-client/pkg-plist head/databases/mariadb102-server/Makefile head/databases/mariadb102-server/distinfo head/databases/mariadb102-server/pkg-plist Modified: head/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt Tue Jun 26 18:47:51 2018 (r473404) +++ head/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt Tue Jun 26 19:06:47 2018 (r473405) @@ -1,25 +1,29 @@ ---- support-files/CMakeLists.txt.orig 2017-04-04 19:12:36 UTC +--- support-files/CMakeLists.txt.orig 2018-06-25 11:13:30 UTC +++ support-files/CMakeLists.txt -@@ -41,15 +41,18 @@ ELSE() +@@ -41,12 +41,14 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() +IF(NOT WITHOUT_SERVER) - FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small wsrep) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh + FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} DESTINATION ${inst_location} COMPONENT IniFiles) ENDFOREACH() +ENDIF() + IF(WITH_WSREP) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh +@@ -57,6 +59,7 @@ ENDIF() + IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) + IF(NOT WITHOUT_SERVER) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -79,12 +82,14 @@ IF(UNIX) +@@ -86,12 +89,14 @@ IF(UNIX) ENDFOREACH() ENDIF() ENDIF() @@ -35,7 +39,7 @@ SET(bindir ${INSTALL_BINDIRABS}) SET(sbindir ${INSTALL_SBINDIRABS}) SET(scriptdir ${INSTALL_SCRIPTDIRABS}) -@@ -136,6 +141,7 @@ IF(UNIX) +@@ -158,6 +163,7 @@ IF(UNIX) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server DESTINATION ${INSTALL_SYSCONFDIR}/init.d RENAME mysql COMPONENT SupportFiles) Modified: head/databases/mariadb102-client/pkg-plist ============================================================================== --- head/databases/mariadb102-client/pkg-plist Tue Jun 26 18:47:51 2018 (r473404) +++ head/databases/mariadb102-client/pkg-plist Tue Jun 26 19:06:47 2018 (r473405) @@ -11,6 +11,7 @@ bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysql_config +@comment bin/wsrep_sst_rsync_wan include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h Modified: head/databases/mariadb102-server/Makefile ============================================================================== --- head/databases/mariadb102-server/Makefile Tue Jun 26 18:47:51 2018 (r473404) +++ head/databases/mariadb102-server/Makefile Tue Jun 26 19:06:47 2018 (r473405) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.15 +PORTVERSION= 10.2.16 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ Modified: head/databases/mariadb102-server/distinfo ============================================================================== --- head/databases/mariadb102-server/distinfo Tue Jun 26 18:47:51 2018 (r473404) +++ head/databases/mariadb102-server/distinfo Tue Jun 26 19:06:47 2018 (r473405) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526556031 -SHA256 (mariadb-10.2.15.tar.gz) = 33de205158fc22fd8eb4e5770cc5ffa1cb4029f9c398dfd8c554ccb3e636ba11 -SIZE (mariadb-10.2.15.tar.gz) = 73329750 +TIMESTAMP = 1530034863 +SHA256 (mariadb-10.2.16.tar.gz) = c182ee93bacee9c1395a4cece56acfc433bc5153ec627c4898927b93eee54dc4 +SIZE (mariadb-10.2.16.tar.gz) = 73363798 Added: head/databases/mariadb102-server/files/patch-storage_rocksdb_build__rocksdb.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb102-server/files/patch-storage_rocksdb_build__rocksdb.cmake Tue Jun 26 19:06:47 2018 (r473405) @@ -0,0 +1,18 @@ +--- storage/rocksdb/build_rocksdb.cmake.orig 2018-06-25 11:13:28 UTC ++++ storage/rocksdb/build_rocksdb.cmake +@@ -69,15 +69,9 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD + SET(CMAKE_REQUIRED_LIBRARIES zstd) + CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID) + UNSET(CMAKE_REQUIRED_LIBRARIES) +- if (WITH_ROCKSDB_ZSTD STREQUAL "ON" AND NOT ZSTD_VALID) +- MESSAGE(FATAL_ERROR +- "WITH_ROCKSDB_ZSTD is ON and ZSTD library was found, but the version needs to be >= 1.1.3") +- endif() +- if (ZSTD_VALID) + add_definitions(-DZSTD) + include_directories(${ZSTD_INCLUDE_DIR}) + list(APPEND THIRDPARTY_LIBS ${ZSTD_LIBRARY}) +- endif() + endif() + + add_definitions(-DZLIB) Modified: head/databases/mariadb102-server/pkg-plist ============================================================================== --- head/databases/mariadb102-server/pkg-plist Tue Jun 26 18:47:51 2018 (r473404) +++ head/databases/mariadb102-server/pkg-plist Tue Jun 26 19:06:47 2018 (r473405) @@ -43,6 +43,7 @@ bin/wsrep_sst_common bin/wsrep_sst_mariabackup bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync +bin/wsrep_sst_rsync_wan bin/wsrep_sst_xtrabackup bin/wsrep_sst_xtrabackup-v2 include/mysql/server/private/embedded_priv.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806261906.w5QJ6lNs003315>