databases/mariadb100-server: Security update to 10.0.35

 - Fix build with aarch64 [1]
 - Remove new ${name}_limits behavior from 11-STABLE [2]

PR:             227628 [1], 227434 [2]
Submitted by:   Naram Qashat <cyberbotx cyberbotx com> [1]
Submitted by:   0mp [2]
MFH:            2018Q2
Security:       57aec168-453e-11e8-8777-b499baebfeaf

2 files changed, 46 insertions, 7 deletions

diff --git a/databases/mariadb100-server/files/extra-patch-MDEV-15288 b/databases/mariadb100-server/files/extra-patch-MDEV-15288
deleted file mode 100644
index 895190f6bf5e..000000000000
--- a/databases/mariadb100-server/files/extra-patch-MDEV-15288
+++ /dev/null
@@ -1,7 +0,0 @@
---- storage/innobase/CMakeLists.txt.orig        2018-01-27 18:40:38 UTC
-+++ storage/innobase/CMakeLists.txt
-@@ -489,4 +489,3 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOU
-   MODULE_OUTPUT_NAME ha_innodb
-   LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
-
--ADD_DEPENDENCIES(innobase GenError)
diff --git a/databases/mariadb100-server/files/patch-mysys_stacktrace.c b/databases/mariadb100-server/files/patch-mysys_stacktrace.c
new file mode 100644
index 000000000000..1f3bf5d5bc5a
--- /dev/null
+++ b/databases/mariadb100-server/files/patch-mysys_stacktrace.c
@@ -0,0 +1,46 @@
+--- mysys/stacktrace.c.orig	2018-01-27 18:40:37 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;
+-
+-#ifdef HAVE_BSS_START
+ extern char *__bss_start;
+-#endif
++#else
++#define PTR_SANE(p) (p)
++#endif /* __linux */
+ 
+ void my_init_stacktrace()
+ {
+-#ifdef HAVE_BSS_START
++#ifdef __linux__
+   heap_start = (char*) &__bss_start;
+-#endif
++#endif /* __linux__ */
+ }
+ 
+ #ifdef __linux__
+@@ -149,15 +149,15 @@ static int safe_print_str(const char *ad
+ 
+ int my_safe_print_str(const char* val, int max_len)
+ {
++#ifdef __linux__
+   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))
+   {