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

3 files changed, 59 insertions, 34 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