svn commit: r518793 - in head/databases/mariadb102-server: . files
Bernard Spil
brnrd at FreeBSD.org
Sun Dec 1 18:47:26 UTC 2019
Author: brnrd
Date: Sun Dec 1 18:47:24 2019
New Revision: 518793
URL: https://svnweb.freebsd.org/changeset/ports/518793
Log:
databases/mariadb102-server: Security update to 10.2.29
MFH: 2019Q4
Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf
Added:
head/databases/mariadb102-server/files/patch-storage_mroonga_CMakeLists.txt
- copied unchanged from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt
Modified:
head/databases/mariadb102-server/Makefile
head/databases/mariadb102-server/distinfo
head/databases/mariadb102-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
head/databases/mariadb102-server/pkg-plist
Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile Sun Dec 1 18:36:53 2019 (r518792)
+++ head/databases/mariadb102-server/Makefile Sun Dec 1 18:47:24 2019 (r518793)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.2.26
+PORTVERSION= 10.2.29
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
@@ -24,7 +24,6 @@ LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mir
SUB_FILES= pkg-message
-SLAVEDIRS= databases/mariadb102-client
USES= bison:build cmake compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES= scripts/*.sh
@@ -92,7 +91,6 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
-DOPENSSL_ROOT_DIR="${OPENSSLBASE}" \
-DOPENSSL_CRYPTO_LIBRARY="${OPENSSLBASE}/lib/libcrypto.so" \
-DOPENSSL_SSL_LIBRARY="${OPENSSLBASE}/lib/libssl.so" \
- -DREMOTEIO_PLUGIN_TYPE="NO" \
-DCOMPILATION_COMMENT="FreeBSD Ports" \
-DCMAKE_PREFIX_PATH=${PREFIX}
CMAKE_ON+= WITH_LIBWRAP WITH_JEMALLOC WITHOUT_DOCS
@@ -182,6 +180,7 @@ post-patch:
${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
+ ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
.if ${OPSYS} == DragonFly
${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
${WRKSRC}/cmake/os/DragonFly.cmake
Modified: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb102-server/distinfo Sun Dec 1 18:36:53 2019 (r518792)
+++ head/databases/mariadb102-server/distinfo Sun Dec 1 18:47:24 2019 (r518793)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564593111
-SHA256 (mariadb-10.2.26.tar.gz) = 152fe941c4f2a352b2b3a4db1ef64e70235fd9ff055af62ad7bda9f2b2191528
-SIZE (mariadb-10.2.26.tar.gz) = 73037655
+TIMESTAMP = 1575211421
+SHA256 (mariadb-10.2.29.tar.gz) = 1470032821a163136d2013e58fc788e5c234777093cbd2ce9c27280a33c10202
+SIZE (mariadb-10.2.29.tar.gz) = 73087972
Copied: head/databases/mariadb102-server/files/patch-storage_mroonga_CMakeLists.txt (from r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb102-server/files/patch-storage_mroonga_CMakeLists.txt Sun Dec 1 18:47:24 2019 (r518793, copy of r518787, head/databases/mariadb103-server/files/patch-storage_mroonga_CMakeLists.txt)
@@ -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)
Modified: head/databases/mariadb102-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
==============================================================================
--- head/databases/mariadb102-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Sun Dec 1 18:36:53 2019 (r518792)
+++ head/databases/mariadb102-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Sun Dec 1 18:47:24 2019 (r518793)
@@ -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 11:18:19 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 @@ Do NOT use bundled libs, use xz/lzma from base and arc
## 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 @@ Do NOT use bundled libs, use xz/lzma from base and arc
## 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)
Modified: head/databases/mariadb102-server/pkg-plist
==============================================================================
--- head/databases/mariadb102-server/pkg-plist Sun Dec 1 18:36:53 2019 (r518792)
+++ head/databases/mariadb102-server/pkg-plist Sun Dec 1 18:47:24 2019 (r518793)
@@ -175,6 +175,7 @@ man/man8/mysqld.8.gz
%%DATADIR%%/mysql_system_tables.sql
%%DATADIR%%/mysql_system_tables_data.sql
%%DATADIR%%/mysql_test_data_timezone.sql
+%%DATADIR%%/mysql_test_db.sql
%%DATADIR%%/mysql_to_mariadb.sql
%%DATADIR%%/mysqld_multi.server
%%DATADIR%%/norwegian-ny/errmsg.sys
More information about the svn-ports-all
mailing list