2 files changed, 46 insertions, 12 deletions
diff --git a/databases/mariadb101-server/files/patch-MDEV-15961 b/databases/mariadb101-server/files/patch-MDEV-15961
new file mode 100644
index 000000000000..5e765675c815
--- /dev/null
+++ b/databases/mariadb101-server/files/patch-MDEV-15961
@@ -0,0 +1,46 @@
+--- mysys/stacktrace.c.orig	2018-03-26 14:18:03 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))
+   {
diff --git a/databases/mariadb101-server/files/patch-sql-common_client.c b/databases/mariadb101-server/files/patch-sql-common_client.c
deleted file mode 100644
index 85e857c65dc8..000000000000
--- a/databases/mariadb101-server/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql-common/client.c.orig	2018-01-24 00:36:45.520273000 +0100
-+++ sql-common/client.c	2018-01-24 00:37:57.536367000 +0100
-@@ -1821,7 +1821,8 @@
-   */
- 
- #ifdef HAVE_X509_check_host
--  ret_validation= X509_check_host(server_cert, server_hostname, 0, 0, 0) != 1;
-+  ret_validation= X509_check_host(server_cert, server_hostname,
-+                                  strlen(server_hostname), 0, 0) != 1;
- #else
-   subject= X509_get_subject_name(server_cert);
-   cn_loc= X509_NAME_get_index_by_NID(subject, NID_commonName, -1);