databases/mariadb103-server: Update to 10.3.10

 - Fix build on aarch64 [1]
 - Not broken in i386 [2]
 - WSREP only on amd64

PR:		230682 [1], 230027 [2]
Submitted by:	Naram Qashat <cyberbotx cyberbotx com> [1]
Reported by:	<dewayne heuristicsystems com.au> [2]
Security:	909be51b-9b3b-11e8-add2-b499baebfeaf
MFH:		2018Q4

13 files changed, 184 insertions, 142 deletions

diff --git a/databases/mariadb103-client/Makefile b/databases/mariadb103-client/Makefile
index ab24c29926b1..375a90348d1b 100644
--- a/databases/mariadb103-client/Makefile
+++ b/databases/mariadb103-client/Makefile
@@ -7,8 +7,6 @@ PKGNAMESUFFIX=	103-client
 
 COMMENT=	Multithreaded SQL database (client)
 
-BROKEN_aarch64=		fails to link: missing sbrk
-
 MASTERDIR=	${.CURDIR}/../mariadb103-server
 
 FILESDIR=	${.CURDIR}/files
diff --git a/databases/mariadb103-client/files/patch-MDEV-15961 b/databases/mariadb103-client/files/patch-MDEV-15961
new file mode 100644
index 000000000000..65fb24a2f46d
--- /dev/null
+++ b/databases/mariadb103-client/files/patch-MDEV-15961
@@ -0,0 +1,50 @@
+MDEV-15961: Fix stacktraces under FreeBSD
+
+https://jira.mariadb.org/browse/MDEV-15961
+--- mysys/stacktrace.c.orig	2018-07-02 07:34:11 UTC
++++ mysys/stacktrace.c
+@@ -34,19 +34,19 @@
+ #include <execinfo.h>
+ #endif
+ 
++#ifdef __linux__
+ #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
+-
+ static char *heap_start;
+-
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
+ extern char *__bss_start;
+-#endif
++#else
++#define PTR_SANE(p) (p)
++#endif /* __linux */
+ 
+ void my_init_stacktrace()
+ {
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
++#ifdef __linux__
+   heap_start = (char*) &__bss_start;
+-#endif
++#endif /* __linux__ */
+ }
+ 
+ #ifdef __linux__
+@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
+ 
+ int my_safe_print_str(const char* val, size_t max_len)
+ {
++#ifdef __linux__
++/* Only needed by the linux version of PTR_SANE */
+   char *heap_end;
+ 
+-#ifdef __linux__
+   // Try and make use of /proc filesystem to safely print memory contents.
+   if (!safe_print_str(val, max_len))
+     return 0;
+-#endif
+ 
+   heap_end= (char*) sbrk(0);
++#endif
+ 
+   if (!PTR_SANE(val))
+   {
diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist
index 9584315a487f..74a2455a84b1 100644
--- a/databases/mariadb103-client/pkg-plist
+++ b/databases/mariadb103-client/pkg-plist
@@ -2,13 +2,10 @@ bin/mariadb_config
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
-bin/mysql_convert_table_format
 bin/mysql_find_rows
 @comment bin/mysql_install_db
 @comment bin/mysql_plugin
 @comment bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_upgrade
 bin/mysql_waitpid
 @comment bin/mysqld_safe_helper
 bin/mysqlaccess
@@ -16,17 +13,15 @@ bin/mysqladmin
 bin/mysqlbinlog
 bin/mysqlcheck
 bin/mysqldump
-bin/mysqlhotcopy
 bin/mysqlimport
 bin/mysqlshow
 bin/mysqlslap
 bin/mysqltest
-bin/my_print_defaults
 @comment bin/mytop
 @comment bin/perror
-bin/replace
 @comment bin/resolve_stack_dump
 @comment bin/resolveip
+@comment bin/wsrep_sst_rsync_wan
 include/mysql/errmsg.h
 include/mysql/ma_list.h
 include/mysql/ma_pvio.h
@@ -70,8 +65,10 @@ lib/mysql/plugin/sha256_password.so
 @comment man/man1/galera_recovery.1.gz
 @comment man/man1/innochecksum.1.gz
 @comment man/man1/mariadb-service-convert.1.gz
+@comment man/man1/mariabackup.1.gz
 man/man1/msql2mysql.1.gz
-man/man1/my_print_defaults.1.gz
+@comment man/man1/mbstream.1.gz
+@comment man/man1/my_print_defaults.1.gz
 man/man1/my_safe_process.1.gz
 @comment man/man1/myisam_ftdump.1.gz
 @comment man/man1/myisamchk.1.gz
@@ -85,9 +82,11 @@ man/man1/mysql_client_test.1.gz
 man/man1/mysql_client_test_embedded.1.gz
 man/man1/mysql_config.1.gz
 man/man1/mysql_convert_table_format.1.gz
+@comment man/man1/mysql_embedded.1.gz
 man/man1/mysql_find_rows.1.gz
 @comment man/man1/mysql_fix_extensions.1.gz
 @comment man/man1/mysql_install_db.1.gz
+@comment man/man1/mysql_ldb.1.gz
 man/man1/mysql_plugin.1.gz
 @comment man/man1/mysql_secure_installation.1.gz
 man/man1/mysql_setpermission.1.gz
@@ -114,10 +113,13 @@ man/man1/replace.1.gz
 @comment man/man1/resolve_stack_dump.1.gz
 @comment man/man1/resolveip.1.gz
 @comment man/man1/tokuft_logdump.1.gz
+man/man1/tokuft_logprint.1.gz
 @comment man/man1/tokuftdump.1.gz
 @comment man/man1/wsrep_sst_common.1.gz
+@comment man/man1/wsrep_sst_mariabackup.1.gz
 @comment man/man1/wsrep_sst_mysqldump.1.gz
 @comment man/man1/wsrep_sst_rsync.1.gz
+@comment man/man1/wsrep_sst_rsync_wan.1.gz
 @comment man/man1/wsrep_sst_xtrabackup-v2.1.gz
 @comment man/man1/wsrep_sst_xtrabackup.1.gz
 @comment man/man8/mysqld.8.gz
@@ -148,31 +150,6 @@ man/man1/replace.1.gz
 %%DATADIR%%/charsets/macce.xml
 %%DATADIR%%/charsets/macroman.xml
 %%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hindi/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
 @comment %%DATADIR%%/binary-configure
 @comment %%DATADIR%%/fill_help_tables.sql
 @comment %%DATADIR%%/magic
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index 31a491f66341..9acd017e8d58 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.3.8
-PORTREVISION?=	2
+PORTVERSION=	10.3.10
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -41,7 +41,8 @@ OPTIONS_DEFAULT=	GSSAPI_BASE
 # MySQL-Server options
 OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
 OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
-OPTIONS_DEFINE=		CONNECT_EXTRA WSREP DOCS
+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 XTRADB
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
@@ -120,9 +121,6 @@ USES+=		readline
 GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
 .else
 # MySQL-Server part
-NOT_FOR_ARCHS=		i386
-NOT_FOR_ARCHS_REASON=	currently does not compile on i386, see \
-			https://jira.mariadb.org/browse/MDEV-9627
 USES+=		mysql:103m
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 USE_RC_SUBR=	mysql-server
@@ -135,8 +133,7 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
 		-DWITHOUT_CLIENT=1
 
 .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
-${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO \
-			-DWITHOUT_${ENGINE}=1
+${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
 ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
 INNOBASE_CMAKE_OFF=	-DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1
@@ -162,14 +159,23 @@ TOKUDB_IMPLIES=		SNAPPY
 TOKUDB_PORTDOCS=	README.md
 TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 WSREP_CMAKE_OFF=	-DWITH_WSREP=OFF
+WSREP_LIB_DEPENDS=	libgalera.so:databases/galera
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_ZSTD=ON
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
+SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.else
+SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+.endif
+
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy
 	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private
-	${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -type d -mindepth 1`
+	${RM} -r ${STAGEDIR}${DATADIR}/charsets
 .endif # defined(CLIENT_ONLY)
 
 .if defined(WITH_OPENSSL_PORT)
@@ -178,6 +184,10 @@ GSSAPI_BASE_IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use o
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} != amd64
+PLIST_SUB+=	WSREP="@comment "
+.endif
+
 .if ${OPSYS} == DragonFly
 CMAKE_ARGS+=	-DWITHOUT_TOKUDB
 .endif
diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo
index 55625b1bf037..1c760d6667d8 100644
--- a/databases/mariadb103-server/distinfo
+++ b/databases/mariadb103-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531382110
-SHA256 (mariadb-10.3.8.tar.gz) = 30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8
-SIZE (mariadb-10.3.8.tar.gz) = 72152953
+TIMESTAMP = 1538732181
+SHA256 (mariadb-10.3.10.tar.gz) = 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda
+SIZE (mariadb-10.3.10.tar.gz) = 70493771
diff --git a/databases/mariadb103-server/files/mysql-server.in b/databases/mariadb103-server/files/mysql-server.in
index 5f5603f2f575..8c01fa0bd333 100644
--- a/databases/mariadb103-server/files/mysql-server.in
+++ b/databases/mariadb103-server/files/mysql-server.in
@@ -9,9 +9,9 @@
 # Add the following line to /etc/rc.conf to enable mysql:
 # mysql_(instance_)?enable (bool):	Set to "NO" by default.
 #			Set it to "YES" to enable MySQL.
-# mysql_(instance_)?limits (bool):	Set to "NO" by default.
-#			Set it to yes to run `limits -e -U mysql`
-#			just before mysql starts.
+%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
+%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%#			just before mysql starts.
 # mysql_(instance_)?dbdir (str):	Default to "/var/db/mysql"
 #			Base database directory.
 # mysql_(instance_)?args (str):	Custom additional arguments to be passed
@@ -33,9 +33,9 @@ rcvar=mysql_enable
 load_rc_config $name
 
 : ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
 : ${mysql_user="mysql"}
-: ${mysql_limits_args="-e -U $mysql_user"}
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
 : ${mysql_dbdir="/var/db/mysql"}
 : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
 
@@ -51,9 +51,9 @@ if [ -n "$2" ]; then
 	"$2 "*|*" $2 "*|*" $2"|"$2")
 		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
 		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
-		eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
+		%%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
 		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
-		eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
+		%%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
 		eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
 		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
 	;;
@@ -119,11 +119,12 @@ mysql_prestart()
 	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
 		mysql_create_auth_tables || return 1
 	fi
-	if checkyesno mysql_limits; then
-		eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null
-	else
-		return 0
-	fi
+%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
+%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%%	else
+%%LEGACY_LIMITS%%		return 0
+%%LEGACY_LIMITS%%	fi
+%%MODERN_LIMITS%%	return 0
 }
 
 mysql_poststart()
diff --git a/databases/mariadb103-server/files/patch-MDEV-15961 b/databases/mariadb103-server/files/patch-MDEV-15961
new file mode 100644
index 000000000000..65fb24a2f46d
--- /dev/null
+++ b/databases/mariadb103-server/files/patch-MDEV-15961
@@ -0,0 +1,50 @@
+MDEV-15961: Fix stacktraces under FreeBSD
+
+https://jira.mariadb.org/browse/MDEV-15961
+--- mysys/stacktrace.c.orig	2018-07-02 07:34:11 UTC
++++ mysys/stacktrace.c
+@@ -34,19 +34,19 @@
+ #include <execinfo.h>
+ #endif
+ 
++#ifdef __linux__
+ #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
+-
+ static char *heap_start;
+-
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
+ extern char *__bss_start;
+-#endif
++#else
++#define PTR_SANE(p) (p)
++#endif /* __linux */
+ 
+ void my_init_stacktrace()
+ {
+-#if(defined HAVE_BSS_START) && !(defined __linux__)
++#ifdef __linux__
+   heap_start = (char*) &__bss_start;
+-#endif
++#endif /* __linux__ */
+ }
+ 
+ #ifdef __linux__
+@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
+ 
+ int my_safe_print_str(const char* val, size_t max_len)
+ {
++#ifdef __linux__
++/* Only needed by the linux version of PTR_SANE */
+   char *heap_end;
+ 
+-#ifdef __linux__
+   // Try and make use of /proc filesystem to safely print memory contents.
+   if (!safe_print_str(val, max_len))
+     return 0;
+-#endif
+ 
+   heap_end= (char*) sbrk(0);
++#endif
+ 
+   if (!PTR_SANE(val))
+   {
diff --git a/databases/mariadb103-server/files/patch-sql_CMakeLists.txt b/databases/mariadb103-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 7e20f9fabea2..000000000000
--- a/databases/mariadb103-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
---- sql/CMakeLists.txt.orig	2017-08-17 10:05:40 UTC
-+++ sql/CMakeLists.txt
-@@ -386,6 +386,7 @@ ADD_CUSTOM_TARGET(distclean
-   VERBATIM
-   )
- 
-+IF(FALSE)
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
- # Copy db.opt into data/test/
-@@ -429,6 +430,7 @@ ELSE()
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
- ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
-+ENDIF()
- 
- IF(WIN32)
-   SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
-@@ -472,7 +474,9 @@ IF(WIN32)
-   TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
- ENDIF(WIN32)
- 
-+IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN share EXCLUDE
-   PATTERN CMakeFiles EXCLUDE)
-+ENDIF()
diff --git a/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc b/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc
deleted file mode 100644
index 161aa9125480..000000000000
--- a/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sql/semisync_master_ack_receiver.cc b/sql/semisync_master_ack_rece>
-index ac17c7de40b..fc36ee35d5d 100644
---- sql/semisync_master_ack_receiver.cc.orig
-+++ sql/semisync_master_ack_receiver.cc
-@@ -43,8 +43,7 @@ Ack_receiver::Ack_receiver()
-   DBUG_ENTER("Ack_receiver::Ack_receiver");
- 
-   m_status= ST_DOWN;
--  mysql_mutex_init(key_LOCK_ack_receiver, &m_mutex,
--                   MY_MUTEX_INIT_FAST);
-+  mysql_mutex_init(key_LOCK_ack_receiver, &m_mutex, NULL);
-   mysql_cond_init(key_COND_ack_receiver, &m_cond, NULL);
-   m_pid= 0;
diff --git a/databases/mariadb103-server/files/patch-sql_share_CMakeLists.txt b/databases/mariadb103-server/files/patch-sql_share_CMakeLists.txt
deleted file mode 100644
index 3d0dab9820c2..000000000000
--- a/databases/mariadb103-server/files/patch-sql_share_CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- sql/share/CMakeLists.txt.orig	2017-05-14 23:13:18 UTC
-+++ sql/share/CMakeLists.txt
-@@ -14,6 +14,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
-+IF(FALSE)
-+
- SET (dirs 
- danish
- german 
-@@ -53,3 +55,5 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE
- )
- 
- INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server)
-+
-+ENDIF()
diff --git a/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake b/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
index 4b7d3c35e4d7..be036e0a597f 100644
--- a/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
+++ b/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
@@ -1,6 +1,6 @@
---- storage/rocksdb/build_rocksdb.cmake.orig	2018-06-25 11:13:28 UTC
+--- storage/rocksdb/build_rocksdb.cmake.orig	2018-10-02 09:45:43 UTC
 +++ storage/rocksdb/build_rocksdb.cmake
-@@ -69,15 +69,9 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD
+@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD
    SET(CMAKE_REQUIRED_LIBRARIES zstd)
    CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID)
    UNSET(CMAKE_REQUIRED_LIBRARIES)
@@ -8,11 +8,6 @@
 -    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)
+   if (ZSTD_VALID)
      add_definitions(-DZSTD)
      include_directories(${ZSTD_INCLUDE_DIR})
-     list(APPEND THIRDPARTY_LIBS ${ZSTD_LIBRARY})
--  endif()
- endif()
- 
- add_definitions(-DZLIB)
diff --git a/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc b/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc
deleted file mode 100644
index 0114e08d28ef..000000000000
--- a/databases/mariadb103-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- storage/rocksdb/rocksdb/db/malloc_stats.cc.orig	2017-08-17 10:05:38 UTC
-+++ storage/rocksdb/rocksdb/db/malloc_stats.cc
-@@ -16,7 +16,12 @@
- namespace rocksdb {
- 
- #ifdef ROCKSDB_JEMALLOC
-+#ifdef __FreeBSD__
-+#include <malloc_np.h>
-+#define je_malloc_stats_print malloc_stats_print
-+#else
- #include "jemalloc/jemalloc.h"
-+#endif
- 
- typedef struct {
-   char* cur;
diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist
index 9c40240342d7..c88781dc7cd2 100644
--- a/databases/mariadb103-server/pkg-plist
+++ b/databases/mariadb103-server/pkg-plist
@@ -7,7 +7,7 @@ bin/innochecksum
 bin/mariabackup
 bin/mbstream
 @comment bin/msql2mysql
-@comment bin/my_print_defaults
+bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
@@ -51,6 +51,7 @@ bin/resolveip
 %%WSREP%%bin/wsrep_sst_rsync_wan
 %%WSREP%%bin/wsrep_sst_xtrabackup
 %%WSREP%%bin/wsrep_sst_xtrabackup-v2
+@comment data/test/db.opt
 @comment include/mysql/my_config.h
 @comment include/mysql/my_global.h
 @comment include/mysql/my_sys.h
@@ -206,7 +207,9 @@ man/man1/galera_new_cluster.1.gz
 man/man1/galera_recovery.1.gz
 man/man1/innochecksum.1.gz
 @comment man/man1/mariadb-service-convert.1.gz
-@comment man/man1/my_print_defaults.1.gz
+man/man1/mariabackup.1.gz
+man/man1/mbstream.1.gz
+man/man1/my_print_defaults.1.gz
 man/man1/myisam_ftdump.1.gz
 man/man1/myisamchk.1.gz
 man/man1/myisamlog.1.gz
@@ -214,6 +217,7 @@ man/man1/myisampack.1.gz
 man/man1/mysql.server.1.gz
 @comment man/man1/mysql_convert_table_format.1.gz
 man/man1/mysql_fix_extensions.1.gz
+%%ROCKSDB%%man/man1/mysql_ldb.1.gz
 man/man1/mysql_install_db.1.gz
 man/man1/mysql_secure_installation.1.gz
 @comment man/man1/mysql_setpermission.1.gz
@@ -229,11 +233,13 @@ man/man1/mysqldumpslow.1.gz
 @comment man/man1/replace.1.gz
 man/man1/resolve_stack_dump.1.gz
 man/man1/resolveip.1.gz
-%%TOKUDB%%man/man1/tokuft_logdump.1.gz
+%%TOKUDB%%man/man1/tokuft_logprint.1.gz
 %%TOKUDB%%man/man1/tokuftdump.1.gz
 %%WSREP%%man/man1/wsrep_sst_common.1.gz
+%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz
 %%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz
 %%WSREP%%man/man1/wsrep_sst_rsync.1.gz
+%%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz
 %%WSREP%%man/man1/wsrep_sst_xtrabackup-v2.1.gz
 %%WSREP%%man/man1/wsrep_sst_xtrabackup.1.gz
 man/man8/mysqld.8.gz
@@ -243,6 +249,9 @@ man/man8/mysqld.8.gz
 %%SPIDER%%%%DATADIR%%/install_spider.sql
 %%DATADIR%%/maria_add_gis_sp.sql
 %%DATADIR%%/maria_add_gis_sp_bootstrap.sql
+%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
+%%MROONGA%%%%DATADIR%%/mroonga/install.sql
+%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/mysql_performance_tables.sql
@@ -252,6 +261,31 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysql_test_db.sql
 %%DATADIR%%/mysql_to_mariadb.sql
 %%DATADIR%%/mysqld_multi.server
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/errmsg-utf8.txt
+%%DATADIR%%/estonian/errmsg.sys
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hindi/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.sys
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/serbian/errmsg.sys
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.sys
 %%WSREP%%%%DATADIR%%/wsrep.cnf
 %%WSREP%%%%DATADIR%%/wsrep_notify
 @comment %%DOCSDIR%%/COPYING