databases/mariadb103-server: Fix segfault

 - Add segfault fix from upstream [1]
 - Add WSREP option (default on)
 - Rework some of the -client conflicts
 - Fix LOCALBASE and PREFIX in patches
 - Remove unneeded patches

PR:		229219 [1]
Reported by:	Ralf van der Enden <tremere cainites net>
MFH:		2018Q3

15 files changed, 156 insertions, 264 deletions

diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index ef0879f3ff5e..8026459b2740 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -23,8 +23,6 @@ LICENSE_NAME_PerconaFT=	PerconaFT patents license
 LICENSE_FILE_PerconaFT=	${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
 LICENSE_PERMS_PerconaFT=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN=		Segfaults on start, see https://jira.mariadb.org/browse/MDEV-16495
-
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -41,9 +39,9 @@ OPTIONS_DEFAULT=	GSSAPI_BASE
 
 .if !defined(CLIENT_ONLY)
 # MySQL-Server options
-OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER
+OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
 OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
-OPTIONS_DEFINE=		CONNECT_EXTRA
+OPTIONS_DEFINE=		CONNECT_EXTRA WSREP
 OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
 OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
@@ -61,6 +59,7 @@ ROCKSDB_DESC=	RocksDB LSM engine (Alpha)
 SPHINX_DESC=	SphinxSE engine
 SPIDER_DESC=	Partitioning and XA-transactions engine
 TOKUDB_DESC=	Fractal tree index tree data structure engine
+WSREP_DESC=	Build wsrep clustering
 XTRADB_DESC=	Build XtraDB engine next to InnoDB
 ZMQ_DESC=	ZeroMQ support
 ZSTD_DESC+=	Zstandard compression support (RocksDB only)
@@ -162,12 +161,15 @@ SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 TOKUDB_IMPLIES=		SNAPPY
 TOKUDB_PORTDOCS=	README.md
 TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
+WSREP_CMAKE_OFF=	-DWITH_WSREP=OFF
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_ZSTD=ON
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-install:
-	${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy
+	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private
+	${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -type d -mindepth 1`
 .endif # defined(CLIENT_ONLY)
 
 .if defined(WITH_OPENSSL_PORT)
@@ -181,9 +183,9 @@ CMAKE_ARGS+=	-DWITHOUT_TOKUDB
 .endif
 
 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
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \
+		${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
 .if ${OPSYS} == DragonFly
 	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
 		${WRKSRC}/cmake/os/DragonFly.cmake
diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo
index 5dcc6fb71303..55625b1bf037 100644
--- a/databases/mariadb103-server/distinfo
+++ b/databases/mariadb103-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530523784
-SHA256 (mariadb-10.3.8.tar.gz) = 44b409bc22775261b96f373bc01591065a680f46d295617b304cdf9ffb503ccf
-SIZE (mariadb-10.3.8.tar.gz) = 72147179
+TIMESTAMP = 1531382110
+SHA256 (mariadb-10.3.8.tar.gz) = 30bec17514d12d811a05757be46bd41724df28002cdec550d5c757b0b3f31ab8
+SIZE (mariadb-10.3.8.tar.gz) = 72152953
diff --git a/databases/mariadb103-server/files/extra-patch-include_my__compare.h b/databases/mariadb103-server/files/extra-patch-include_my__compare.h
deleted file mode 100644
index 5fc447b98cd7..000000000000
--- a/databases/mariadb103-server/files/extra-patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2012-11-28 17:49:43.000000000 +0200
-+++ include/my_compare.h	2012-12-23 02:45:51.000000000 +0200
-@@ -40,7 +40,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              32          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mariadb103-server/files/patch-extra_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_CMakeLists.txt
index 35960bb6a0ab..e083792cd77c 100644
--- a/databases/mariadb103-server/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb103-server/files/patch-extra_CMakeLists.txt
@@ -9,8 +9,8 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
 +IF(FALSE)
    MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
    TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
- 
 +ENDIF()
+
    MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
    TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)
  ENDIF()
diff --git a/databases/mariadb103-server/files/patch-include_CMakeLists.txt b/databases/mariadb103-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index aaa3ab9b47d0..000000000000
--- a/databases/mariadb103-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---- include/CMakeLists.txt.orig	2017-08-17 10:05:38 UTC
-+++ include/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
--# 
-+#
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; version 2 of the License.
-@@ -68,6 +68,7 @@ SET(HEADERS 
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
-   DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS}
-   DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development)
- FOREACH(f ${HEADERS_GEN_CONFIGURE})
-@@ -75,17 +76,20 @@ FOREACH(f ${HEADERS_GEN_CONFIGURE})
-     DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development)
- ENDFOREACH(f)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
-+ENDIF()
- 
- STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
- STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
- 
- MACRO(INSTALL_PRIVATE DIR)
-+IF(FALSE)
-   INSTALL(DIRECTORY ${DIR}/.
-     DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
-     FILES_MATCHING PATTERN "*.h"
-     PATTERN CMakeFiles EXCLUDE
-     PATTERN mysql EXCLUDE
-     REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
-+ENDIF()
- ENDMACRO()
- 
- INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/databases/mariadb103-server/files/patch-mysys_my__default.c b/databases/mariadb103-server/files/patch-mysys_my__default.c
index d4a4f3c3bc09..ef8d9b5ca53e 100644
--- a/databases/mariadb103-server/files/patch-mysys_my__default.c
+++ b/databases/mariadb103-server/files/patch-mysys_my__default.c
@@ -16,7 +16,7 @@
 +  if (strstr(name, "/etc") == name)
 +  {
 +    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++             "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
 +             name,name);
 +      goto err;
 +  }
@@ -45,8 +45,8 @@
    errors += add_directory(alloc, "/etc/", dirs);
    errors += add_directory(alloc, "/etc/mysql/", dirs);
 -#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
++  errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
++  errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
  
  #endif
  
diff --git a/databases/mariadb103-server/files/patch-scripts_mysql__config.sh b/databases/mariadb103-server/files/patch-scripts_mysql__config.sh
index 00ee7218322a..13f25ca9fb74 100644
--- a/databases/mariadb103-server/files/patch-scripts_mysql__config.sh
+++ b/databases/mariadb103-server/files/patch-scripts_mysql__config.sh
@@ -4,9 +4,9 @@
  
  # Create options 
  libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L/usr/local/lib "
++libs="$libs -L%%LOCALBASE%%/lib "
  embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L/usr/local/lib "
++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
  
  include="-I$pkgincludedir"
  if [ "$basedir" != "/usr" ]; then
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
new file mode 100644
index 000000000000..161aa9125480
--- /dev/null
+++ b/databases/mariadb103-server/files/patch-sql_semisync__master__ack__receiver.cc
@@ -0,0 +1,13 @@
+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_slave.cc b/databases/mariadb103-server/files/patch-sql_slave.cc
deleted file mode 100644
index a5c8d6649650..000000000000
--- a/databases/mariadb103-server/files/patch-sql_slave.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- sql/slave.cc.orig	2017-05-14 23:13:18 UTC
-+++ sql/slave.cc
-@@ -14,6 +14,11 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#define ERR_remove_state(X)
-+#elif defined(HAVE_ERR_remove_thread_state)
-+#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
-+#endif
- 
- /**
-   @addtogroup Replication
diff --git a/databases/mariadb103-server/files/patch-sql_sql__trigger.cc b/databases/mariadb103-server/files/patch-sql_sql__trigger.cc
deleted file mode 100644
index e13b51ff6875..000000000000
--- a/databases/mariadb103-server/files/patch-sql_sql__trigger.cc
+++ /dev/null
@@ -1,56 +0,0 @@
---- sql/sql_trigger.cc.orig	2018-02-26 04:27:17.000000000 +0100
-+++ sql/sql_trigger.cc	2018-02-27 20:54:20.250859000 +0100
-@@ -178,37 +178,37 @@ static File_option triggers_file_paramet
- {
-   {
-     { STRING_WITH_LEN("triggers") },
--    my_offsetof(class Table_triggers_list, definitions_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { STRING_WITH_LEN("sql_modes") },
--    my_offsetof(class Table_triggers_list, definition_modes_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-     FILE_OPTIONS_ULLLIST
-   },
-   {
-     { STRING_WITH_LEN("definers") },
--    my_offsetof(class Table_triggers_list, definers_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { STRING_WITH_LEN("client_cs_names") },
--    my_offsetof(class Table_triggers_list, client_cs_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { STRING_WITH_LEN("connection_cl_names") },
--    my_offsetof(class Table_triggers_list, connection_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { STRING_WITH_LEN("db_cl_names") },
--    my_offsetof(class Table_triggers_list, db_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { STRING_WITH_LEN("created") },
--    my_offsetof(class Table_triggers_list, create_times),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, create_times)),
-     FILE_OPTIONS_ULLLIST
-   },
-   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
-@@ -217,7 +217,7 @@ static File_option triggers_file_paramet
- File_option sql_modes_parameters=
- {
-   { STRING_WITH_LEN("sql_modes") },
--  my_offsetof(class Table_triggers_list, definition_modes_list),
-+  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-   FILE_OPTIONS_ULLLIST
- };
- 
diff --git a/databases/mariadb103-server/files/patch-sql_sql__view.cc b/databases/mariadb103-server/files/patch-sql_sql__view.cc
deleted file mode 100644
index e510745b0f3e..000000000000
--- a/databases/mariadb103-server/files/patch-sql_sql__view.cc
+++ /dev/null
@@ -1,67 +0,0 @@
---- sql/sql_view.cc.orig	2018-02-26 04:27:17.000000000 +0100
-+++ sql/sql_view.cc	2018-02-27 20:56:59.769528000 +0100
-@@ -753,49 +753,49 @@ static const int required_view_parameter
- */
- static File_option view_parameters[]=
- {{{ STRING_WITH_LEN("query")},
--  my_offsetof(TABLE_LIST, select_stmt),
-+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
-   FILE_OPTIONS_ESTRING},
-  {{ STRING_WITH_LEN("md5")},
--  my_offsetof(TABLE_LIST, md5),
-+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
-   FILE_OPTIONS_STRING},
-  {{ STRING_WITH_LEN("updatable")},
--  my_offsetof(TABLE_LIST, updatable_view),
-+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ STRING_WITH_LEN("algorithm")},
--  my_offsetof(TABLE_LIST, algorithm),
-+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
-   FILE_OPTIONS_VIEW_ALGO},
-  {{ STRING_WITH_LEN("definer_user")},
--  my_offsetof(TABLE_LIST, definer.user),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
-   FILE_OPTIONS_STRING},
-  {{ STRING_WITH_LEN("definer_host")},
--  my_offsetof(TABLE_LIST, definer.host),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
-   FILE_OPTIONS_STRING},
-  {{ STRING_WITH_LEN("suid")},
--  my_offsetof(TABLE_LIST, view_suid),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ STRING_WITH_LEN("with_check_option")},
--  my_offsetof(TABLE_LIST, with_check),
-+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ STRING_WITH_LEN("timestamp")},
--  my_offsetof(TABLE_LIST, timestamp),
-+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
-   FILE_OPTIONS_TIMESTAMP},
-  {{ STRING_WITH_LEN("create-version")},
--  my_offsetof(TABLE_LIST, file_version),
-+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ STRING_WITH_LEN("source")},
--  my_offsetof(TABLE_LIST, source),
-+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
-   FILE_OPTIONS_ESTRING},
-  {{(char*) STRING_WITH_LEN("client_cs_name")},
--  my_offsetof(TABLE_LIST, view_client_cs_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("connection_cl_name")},
--  my_offsetof(TABLE_LIST, view_connection_cl_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("view_body_utf8")},
--  my_offsetof(TABLE_LIST, view_body_utf8),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
-   FILE_OPTIONS_ESTRING},
-  {{ STRING_WITH_LEN("mariadb-version")},
--  my_offsetof(TABLE_LIST, mariadb_version),
-+  static_cast<int>(my_offsetof(TABLE_LIST, mariadb_version)),
-   FILE_OPTIONS_ULONGLONG},
-  {{NullS, 0},			0,
-   FILE_OPTIONS_STRING}
diff --git a/databases/mariadb103-server/files/patch-sql_sys__vars.cc b/databases/mariadb103-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index 5d9f14d03828..000000000000
--- a/databases/mariadb103-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-Fix clang build error
-
---- sql/sys_vars.cc.orig	2017-05-14 23:13:18 UTC
-+++ sql/sys_vars.cc
-@@ -1067,7 +1067,7 @@ static Sys_var_ulong Sys_interactive_tim
-        "connection before closing it",
-        NO_SET_STMT SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulonglong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -2242,7 +2242,7 @@ static Sys_var_ulong Sys_net_read_timeou
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -2257,7 +2257,7 @@ static Sys_var_ulong Sys_net_write_timeo
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -3505,7 +3505,7 @@ static Sys_var_ulong Sys_net_wait_timeou
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_plugin Sys_default_storage_engine(
diff --git a/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake b/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
new file mode 100644
index 000000000000..4b7d3c35e4d7
--- /dev/null
+++ b/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake
@@ -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)
diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
index b4235b8fe8e7..1ba52dbe8853 100644
--- a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
+++ b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
@@ -23,11 +23,11 @@ Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
 +ENDIF()
  
 +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  include_directories("/usr/local/include")
++  include_directories("%%LOCALBASE%%/include")
  
 +  add_library(snappy SHARED IMPORTED)
 +  set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-+    "/usr/local/lib/libsnappy.so")
++    "%%LOCALBASE%%/lib/libsnappy.so")
 +ELSE()
  ## 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.")
diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist
index a4391e40935c..9c40240342d7 100644
--- a/databases/mariadb103-server/pkg-plist
+++ b/databases/mariadb103-server/pkg-plist
@@ -41,23 +41,111 @@ bin/mysqldumpslow
 bin/resolve_stack_dump
 bin/resolveip
 %%ROCKSDB%%bin/sst_dump
+@comment bin/test-connect-t
 %%TOKUDB%%bin/tokuft_logprint
 %%TOKUDB%%bin/tokuftdump
-bin/wsrep_sst_common
-bin/wsrep_sst_mariabackup
-bin/wsrep_sst_mysqldump
-bin/wsrep_sst_rsync
-bin/wsrep_sst_xtrabackup
-bin/wsrep_sst_xtrabackup-v2
+%%WSREP%%bin/wsrep_sst_common
+%%WSREP%%bin/wsrep_sst_mariabackup
+%%WSREP%%bin/wsrep_sst_mysqldump
+%%WSREP%%bin/wsrep_sst_rsync
+%%WSREP%%bin/wsrep_sst_rsync_wan
+%%WSREP%%bin/wsrep_sst_xtrabackup
+%%WSREP%%bin/wsrep_sst_xtrabackup-v2
 @comment include/mysql/my_config.h
 @comment include/mysql/my_global.h
 @comment include/mysql/my_sys.h
 @comment include/mysql/mysql_com.h
 @comment include/mysql/mysql_version.h
 @comment include/mysql/mysqld_error.h
-include/mysql/server/private/embedded_priv.h
-@comment lib/mysql/libmariadb.so
-@comment lib/mysql/libmariadb.so.3
+include/mysql/server/big_endian.h
+include/mysql/server/byte_order_generic.h
+include/mysql/server/byte_order_generic_x86.h
+include/mysql/server/byte_order_generic_x86_64.h
+include/mysql/server/decimal.h
+include/mysql/server/errmsg.h
+include/mysql/server/handler_ername.h
+include/mysql/server/handler_state.h
+include/mysql/server/json_lib.h
+include/mysql/server/keycache.h
+include/mysql/server/little_endian.h
+include/mysql/server/m_ctype.h
+include/mysql/server/m_string.h
+include/mysql/server/ma_dyncol.h
+include/mysql/server/my_alloc.h
+include/mysql/server/my_attribute.h
+include/mysql/server/my_byteorder.h
+include/mysql/server/my_compiler.h
+include/mysql/server/my_config.h
+include/mysql/server/my_dbug.h
+include/mysql/server/my_decimal_limits.h
+include/mysql/server/my_dir.h
+include/mysql/server/my_getopt.h
+include/mysql/server/my_global.h
+include/mysql/server/my_list.h
+include/mysql/server/my_net.h
+include/mysql/server/my_pthread.h
+include/mysql/server/my_sys.h
+include/mysql/server/my_valgrind.h
+include/mysql/server/my_xml.h
+include/mysql/server/mysql.h
+include/mysql/server/mysql/auth_dialog_client.h
+include/mysql/server/mysql/client_plugin.h
+include/mysql/server/mysql/plugin.h
+include/mysql/server/mysql/plugin_audit.h
+include/mysql/server/mysql/plugin_auth.h
+include/mysql/server/mysql/plugin_auth_common.h
+include/mysql/server/mysql/plugin_encryption.h
+include/mysql/server/mysql/plugin_ftparser.h
+include/mysql/server/mysql/plugin_password_validation.h
+include/mysql/server/mysql/psi/mysql_file.h
+include/mysql/server/mysql/psi/mysql_idle.h
+include/mysql/server/mysql/psi/mysql_socket.h
+include/mysql/server/mysql/psi/mysql_stage.h
+include/mysql/server/mysql/psi/mysql_statement.h
+include/mysql/server/mysql/psi/mysql_table.h
+include/mysql/server/mysql/psi/mysql_thread.h
+include/mysql/server/mysql/psi/psi.h
+include/mysql/server/mysql/psi/psi_abi_v0.h
+include/mysql/server/mysql/psi/psi_abi_v1.h
+include/mysql/server/mysql/psi/psi_abi_v2.h
+include/mysql/server/mysql/psi/psi_base.h
+include/mysql/server/mysql/psi/psi_memory.h
+include/mysql/server/mysql/service_base64.h
+include/mysql/server/mysql/service_debug_sync.h
+include/mysql/server/mysql/service_encryption.h
+include/mysql/server/mysql/service_encryption_scheme.h
+include/mysql/server/mysql/service_kill_statement.h
+include/mysql/server/mysql/service_logger.h
+include/mysql/server/mysql/service_md5.h
+include/mysql/server/mysql/service_my_crypt.h
+include/mysql/server/mysql/service_my_print_error.h
+include/mysql/server/mysql/service_my_snprintf.h
+include/mysql/server/mysql/service_progress_report.h
+include/mysql/server/mysql/service_sha1.h
+include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_thd_alloc.h
+include/mysql/server/mysql/service_thd_autoinc.h
+include/mysql/server/mysql/service_thd_error_context.h
+include/mysql/server/mysql/service_thd_rnd.h
+include/mysql/server/mysql/service_thd_specifics.h
+include/mysql/server/mysql/service_thd_timezone.h
+include/mysql/server/mysql/service_thd_wait.h
+include/mysql/server/mysql/service_wsrep.h
+include/mysql/server/mysql/services.h
+include/mysql/server/mysql_com.h
+include/mysql/server/mysql_com_server.h
+include/mysql/server/mysql_embed.h
+include/mysql/server/mysql_time.h
+include/mysql/server/mysql_version.h
+include/mysql/server/mysqld_ername.h
+include/mysql/server/mysqld_error.h
+include/mysql/server/pack.h
+include/mysql/server/sql_common.h
+include/mysql/server/sql_state.h
+include/mysql/server/sslopt-case.h
+include/mysql/server/sslopt-longopts.h
+include/mysql/server/sslopt-vars.h
+include/mysql/server/typelib.h
 @comment lib/mysql/libmariadbclient.a
 lib/mysql/libmariadbd.a
 lib/mysql/libmariadbd.so
@@ -107,7 +195,7 @@ lib/mysql/plugin/server_audit.so
 lib/mysql/plugin/simple_password_check.so
 lib/mysql/plugin/sql_errlog.so
 lib/mysql/plugin/test_versioning.so
-lib/mysql/plugin/wsrep_info.so
+%%WSREP%%lib/mysql/plugin/wsrep_info.so
 libexec/mysqld
 man/man1/aria_chk.1.gz
 man/man1/aria_dump_log.1.gz
@@ -143,11 +231,11 @@ man/man1/resolve_stack_dump.1.gz
 man/man1/resolveip.1.gz
 %%TOKUDB%%man/man1/tokuft_logdump.1.gz
 %%TOKUDB%%man/man1/tokuftdump.1.gz
-man/man1/wsrep_sst_common.1.gz
-man/man1/wsrep_sst_mysqldump.1.gz
-man/man1/wsrep_sst_rsync.1.gz
-man/man1/wsrep_sst_xtrabackup-v2.1.gz
-man/man1/wsrep_sst_xtrabackup.1.gz
+%%WSREP%%man/man1/wsrep_sst_common.1.gz
+%%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz
+%%WSREP%%man/man1/wsrep_sst_rsync.1.gz
+%%WSREP%%man/man1/wsrep_sst_xtrabackup-v2.1.gz
+%%WSREP%%man/man1/wsrep_sst_xtrabackup.1.gz
 man/man8/mysqld.8.gz
 %%DATADIR%%/binary-configure
 %%DATADIR%%/fill_help_tables.sql
@@ -155,9 +243,6 @@ 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/install.sql
-%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
-%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/mysql_performance_tables.sql
@@ -167,8 +252,8 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysql_test_db.sql
 %%DATADIR%%/mysql_to_mariadb.sql
 %%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/wsrep.cnf
-%%DATADIR%%/wsrep_notify
+%%WSREP%%%%DATADIR%%/wsrep.cnf
+%%WSREP%%%%DATADIR%%/wsrep_notify
 @comment %%DOCSDIR%%/COPYING
 @comment %%DOCSDIR%%/COPYING.thirdparty
 @comment share/groonga-normalizer-mysql/lgpl-2.0.txt