Update mariadb55-* to 5.5.43.

pkgsrc changes:
* Fix PLIST for dtrace and embedded-server options on and off.
* Patch for when readline>6 is used where some deprecated symbols were
  removed. Fixes build with devel/readline.
* DTrace support still not fixes for recent SunOS platforms.

upstream changes:
* XtraDB updated to 5.5.42-37.1
* TokuDB updated to version 7.5.6
* Fix for CVE-2015-0501
* Fix for CVE-2015-2571
* Fix for CVE-2015-0505
* Fix for CVE-2015-0499

See full changelog:

  https://mariadb.com/kb/en/mariadb/mariadb-5543-changelog/

6 files changed, 98 insertions, 8 deletions

diff --git a/databases/mariadb55-client/patches/patch-CMakeLists.txt b/databases/mariadb55-client/patches/patch-CMakeLists.txt
index ce0d5edf249..9d60f78e712 100644
--- a/databases/mariadb55-client/patches/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/patches/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2015/05/07 12:45:29 fhajny Exp $
 
 Split configuration between mysql-client and mysql-server.
 Build with newer DTrace.
@@ -9,7 +9,7 @@ Build with newer DTrace.
    SET(WITHOUT_DYNAMIC_PLUGINS 1)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
-+OPTION(ENABLED_DTRACE "Include support for DTrace probes" OFF)
++OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF)
  OPTION(CYBOZU "" OFF)
  OPTION(BACKUP_TEST "" OFF)
  OPTION(WITHOUT_SERVER OFF)
diff --git a/databases/mariadb55-client/patches/patch-client_mysql.cc b/databases/mariadb55-client/patches/patch-client_mysql.cc
index 0f929e87dfd..71c4552a74d 100644
--- a/databases/mariadb55-client/patches/patch-client_mysql.cc
+++ b/databases/mariadb55-client/patches/patch-client_mysql.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-client_mysql.cc,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+$NetBSD: patch-client_mysql.cc,v 1.2 2015/05/07 12:45:29 fhajny Exp $
 
 --- client/mysql.cc.orig	2015-02-13 12:07:00.000000000 +0000
 +++ client/mysql.cc
@@ -11,3 +11,24 @@ $NetBSD: patch-client_mysql.cc,v 1.1 2015/04/16 20:20:15 ryoon Exp $
  #define HAVE_READLINE
  #define USE_POPEN
  #endif
+@@ -2640,7 +2640,11 @@ static void initialize_readline (char *n
+   rl_completion_entry_function= &no_completion;
+   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
+ #else
++# if defined(USE_READLINE_V6)
++  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
++# else
+   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
++# endif
+   rl_completion_entry_function= &no_completion;
+ #endif
+ }
+@@ -2657,7 +2661,7 @@ static char **new_mysql_completion(const
+                                    int end __attribute__((unused)))
+ {
+   if (!status.batch && !quick)
+-#if defined(USE_NEW_READLINE_INTERFACE)
++#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_READLINE_V6)
+     return rl_completion_matches(text, new_command_generator);
+ #else
+     return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/mariadb55-client/patches/patch-cmake_dtrace.cmake b/databases/mariadb55-client/patches/patch-cmake_dtrace.cmake
new file mode 100644
index 00000000000..23772af2947
--- /dev/null
+++ b/databases/mariadb55-client/patches/patch-cmake_dtrace.cmake
@@ -0,0 +1,21 @@
+$NetBSD: patch-cmake_dtrace.cmake,v 1.1 2015/05/07 12:45:29 fhajny Exp $
+
+Build with newer DTrace.
+
+--- cmake/dtrace.cmake.orig	2014-05-10 22:36:23.000000000 +0000
++++ cmake/dtrace.cmake
+@@ -40,10 +40,10 @@ MACRO(CHECK_DTRACE)
+  ENDIF()
+ 
+  # On FreeBSD, dtrace does not handle userland tracing yet
+- IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
+-     AND NOT BUGGY_GCC_NO_DTRACE_MODULES
+-     AND NOT BUGGY_LINUX_DTRACE) 
+-   SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
++ IF(ENABLE_DTRACE AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
++    OR BUGGY_GCC_NO_DTRACE_MODULES
++    OR BUGGY_LINUX_DTRACE OR NOT DTRACE))
++  MESSAGE(FATAL_ERROR "dtrace is not supported on this system")
+  ENDIF()
+  SET(HAVE_DTRACE ${ENABLE_DTRACE})
+  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
diff --git a/databases/mariadb55-client/patches/patch-cmake_readline.cmake b/databases/mariadb55-client/patches/patch-cmake_readline.cmake
index d549bc39986..d867e5f624b 100644
--- a/databases/mariadb55-client/patches/patch-cmake_readline.cmake
+++ b/databases/mariadb55-client/patches/patch-cmake_readline.cmake
@@ -1,7 +1,7 @@
-$NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $
-
-* Fix cmake's check build error. Borrowed from mysql56's readline.cmake.
+$NetBSD: patch-cmake_readline.cmake,v 1.2 2015/05/07 12:45:29 fhajny Exp $
 
+Fix cmake's check build error. Borrowed from mysql56's readline.cmake.
+Fi build with pkgsrc readline>=6 that removed some deprecated symbols.
 --- cmake/readline.cmake.orig	2015-02-13 12:07:00.000000000 +0000
 +++ cmake/readline.cmake
 @@ -132,7 +132,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
@@ -22,7 +22,27 @@ $NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $
      #if RL_VERSION_MAJOR > 5
      #error
      #endif
-@@ -180,8 +180,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
+@@ -152,6 +152,19 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
+     }"
+     READLINE_V5)
+ 
++    CHECK_C_SOURCE_COMPILES("
++    #include <stdio.h>
++    #include <readline/readline.h>
++    #if RL_VERSION_MAJOR < 6
++    #error
++    #endif
++    int main(int argc, char **argv)
++    {
++      return 0;
++    }"
++    READLINE_V6)
++    SET(USE_READLINE_V6 ${READLINE_V6})
++
+     IF(NEW_READLINE_INTERFACE)
+       IF (READLINE_V5)
+         SET(USE_NEW_READLINE_INTERFACE 1)
+@@ -180,8 +193,11 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
      #include <readline.h>
      int main(int argc, char **argv)
      {
@@ -35,7 +55,7 @@ $NetBSD: patch-cmake_readline.cmake,v 1.1 2015/04/16 20:20:15 ryoon Exp $
      }"
      LIBEDIT_INTERFACE)
      SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE})
-@@ -195,32 +198,13 @@ MACRO (MYSQL_CHECK_READLINE)
+@@ -195,32 +211,13 @@ MACRO (MYSQL_CHECK_READLINE)
      SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline")
      FIND_CURSES()
  
diff --git a/databases/mariadb55-client/patches/patch-config.h.cmake b/databases/mariadb55-client/patches/patch-config.h.cmake
new file mode 100644
index 00000000000..5fe995b1bc6
--- /dev/null
+++ b/databases/mariadb55-client/patches/patch-config.h.cmake
@@ -0,0 +1,12 @@
+$NetBSD: patch-config.h.cmake,v 1.1 2015/05/07 12:45:29 fhajny Exp $
+
+--- config.h.cmake.orig	2015-02-13 12:07:00.000000000 +0000
++++ config.h.cmake
+@@ -126,6 +126,7 @@
+ #cmakedefine HAVE_HIST_ENTRY 1
+ #cmakedefine USE_LIBEDIT_INTERFACE 1
+ #cmakedefine USE_NEW_READLINE_INTERFACE 1
++#cmakedefine USE_READLINE_V6 1
+ 
+ #cmakedefine FIONREAD_IN_SYS_IOCTL 1
+ #cmakedefine GWINSZ_IN_SYS_IOCTL 1
diff --git a/databases/mariadb55-client/patches/patch-include_my__context.h b/databases/mariadb55-client/patches/patch-include_my__context.h
new file mode 100644
index 00000000000..00229152742
--- /dev/null
+++ b/databases/mariadb55-client/patches/patch-include_my__context.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_my__context.h,v 1.1 2015/05/07 12:45:29 fhajny Exp $
+
+--- include/my_context.h.orig	2015-02-13 12:07:01.000000000 +0000
++++ include/my_context.h
+@@ -27,9 +27,9 @@
+ 
+ #ifdef __WIN__
+ #define MY_CONTEXT_USE_WIN32_FIBERS 1
+-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__)
++#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__) && !defined(__sun)
+ #define MY_CONTEXT_USE_X86_64_GCC_ASM
+-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
++#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) && !defined(__sun)
+ #define MY_CONTEXT_USE_I386_GCC_ASM
+ #elif defined(HAVE_UCONTEXT)
+ #define MY_CONTEXT_USE_UCONTEXT