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

7 files changed, 66 insertions, 93 deletions

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;