16 files changed, 65 insertions, 265 deletions

diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
index c047b2bda322..015bbc3ce1f4 100644
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -19,9 +19,11 @@ CONFLICTS_INSTALL=	mariadb5[0-46-9]-client-* \
 			percona*-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
-USE_LDCONFIG=	${PREFIX}/lib/mysql
 CLIENT_ONLY=	yes
 
+USES+=		ncurses readline
+
+
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper
 	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt
index ded5ff508152..5135eaf3f489 100644
--- a/databases/mariadb55-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2017-04-11 22:03:13.000000000 +0200
-+++ CMakeLists.txt	2017-04-18 10:11:38.582817000 +0200
+--- CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
++++ CMakeLists.txt
 @@ -393,28 +393,8 @@ ADD_SUBDIRECTORY(client)
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
diff --git a/databases/mariadb55-client/files/patch-MDEV-12230 b/databases/mariadb55-client/files/patch-MDEV-12230
deleted file mode 100644
index 1a7b2b48347f..000000000000
--- a/databases/mariadb55-client/files/patch-MDEV-12230
+++ /dev/null
@@ -1,205 +0,0 @@
-From 4fe65ca33a6012ec60c665f6eeb5ff08969fb267 Mon Sep 17 00:00:00 2001
-From: Sergei Golubchik <serg@mariadb.org>
-Date: Tue, 18 Apr 2017 12:35:05 +0200
-Subject: [PATCH] =?UTF-8?q?MDEV-12230=20include/my=5Fsys.h:600:43:=20error?=
- =?UTF-8?q?:=20unknown=20type=20name=20=E2=80=98PSI=5Ffile=5Fkey=E2=80=99"?=
- =?UTF-8?q?=20when=20-DWITHOUT=5FSERVER=3D1?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cherry-pick 2c2bd8c155 (MDEV-12261 build failure without P_S) from 10.0
----
- include/my_sys.h                 |  3 +--
- include/mysql/psi/mysql_file.h   | 47 ++++++++++++++++++++++++++++++++++++++++
- mysys/my_symlink2.c              | 14 +++++-------
- sql/handler.cc                   |  2 +-
- sql/sql_db.cc                    |  4 ++--
- storage/maria/ma_delete_table.c  |  4 ++--
- storage/myisam/mi_delete_table.c |  4 ++--
- 7 files changed, 61 insertions(+), 17 deletions(-)
-
-diff --git a/include/my_sys.h b/include/my_sys.h
-index 10551e1..2794068 100644
---- include/my_sys.h.orig
-+++ include/my_sys.h
-@@ -580,8 +580,7 @@ extern File my_create_with_symlink(const char *linkname, const char *filename,
- 				   myf MyFlags);
- extern int my_rename_with_symlink(const char *from,const char *to,myf MyFlags);
- extern int my_symlink(const char *content, const char *linkname, myf MyFlags);
--extern int my_handler_delete_with_symlink(PSI_file_key key, const char *name,
--                                          const char *ext, myf sync_dir);
-+extern int my_handler_delete_with_symlink(const char *filename, myf sync_dir);
- 
- extern size_t my_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags);
- extern size_t my_pread(File Filedes,uchar *Buffer,size_t Count,my_off_t offset,
-diff --git a/include/mysql/psi/mysql_file.h b/include/mysql/psi/mysql_file.h
-index 4a0f3fd..aa3ed7e 100644
---- include/mysql/psi/mysql_file.h.orig
-+++ include/mysql/psi/mysql_file.h
-@@ -435,6 +435,20 @@
- #endif
- 
- /**
-+  @def mysql_file_delete_with_symlink(K, P1, P2, P3)
-+  Instrumented delete with symbolic link.
-+  @c mysql_file_delete_with_symlink is a replacement
-+  for @c my_handler_delete_with_symlink.
-+*/
-+#ifdef HAVE_PSI_INTERFACE
-+  #define mysql_file_delete_with_symlink(K, P1, P2, P3) \
-+  inline_mysql_file_delete_with_symlink(K, __FILE__, __LINE__, P1, P2, P3)
-+#else
-+  #define mysql_file_delete_with_symlink(K, P1, P2, P3) \
-+  inline_mysql_file_delete_with_symlink(P1, P2, P3)
-+#endif
-+
-+/**
-   @def mysql_file_rename_with_symlink(K, P1, P2, P3)
-   Instrumented rename with symbolic link.
-   @c mysql_file_rename_with_symlink is a replacement
-@@ -1305,6 +1319,7 @@ inline_mysql_file_rename(
-   return result;
- }
- 
-+
- static inline File
- inline_mysql_file_create_with_symlink(
- #ifdef HAVE_PSI_INTERFACE
-@@ -1335,6 +1350,38 @@ inline_mysql_file_create_with_symlink(
- }
- 
- static inline int
-+inline_mysql_file_delete_with_symlink(
-+#ifdef HAVE_PSI_INTERFACE
-+  PSI_file_key key, const char *src_file, uint src_line,
-+#endif
-+  const char *name, const char *ext, myf flags)
-+{
-+  int result;
-+  char fullname[FN_REFLEN];
-+#ifdef HAVE_PSI_INTERFACE
-+  struct PSI_file_locker *locker= NULL;
-+  PSI_file_locker_state state;
-+#endif
-+  fn_format(fullname, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT);
-+#ifdef HAVE_PSI_INTERFACE
-+  if (likely(PSI_server != NULL))
-+  {
-+    locker= PSI_server->get_thread_file_name_locker(&state, key, PSI_FILE_DELETE,
-+                                                    fullname, &locker);
-+    if (likely(locker != NULL))
-+      PSI_server->start_file_wait(locker, (size_t) 0, src_file, src_line);
-+  }
-+#endif
-+  result= my_handler_delete_with_symlink(fullname, flags);
-+#ifdef HAVE_PSI_INTERFACE
-+  if (likely(locker != NULL))
-+    PSI_server->end_file_wait(locker, (size_t) 0);
-+#endif
-+  return result;
-+}
-+
-+
-+static inline int
- inline_mysql_file_rename_with_symlink(
- #ifdef HAVE_PSI_INTERFACE
-   PSI_file_key key, const char *src_file, uint src_line,
-diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c
-index 5fe7b8f..c851468 100644
---- mysys/my_symlink2.c.orig
-+++ mysys/my_symlink2.c
-@@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags)
-   in this case both the symlink and the symlinked file are deleted,
-   but only if the symlinked file is not in the datadir.
- */
--int my_handler_delete_with_symlink(PSI_file_key key, const char *name,
--                                   const char *ext, myf sync_dir)
-+int my_handler_delete_with_symlink(const char *filename, myf sync_dir)
- {
--  char orig[FN_REFLEN], real[FN_REFLEN];
-+  char real[FN_REFLEN];
-   int res= 0;
-   DBUG_ENTER("my_handler_delete_with_symlink");
- 
--  fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT);
--  if (my_is_symlink(orig))
-+  if (my_is_symlink(filename))
-   {
-     /*
-       Delete the symlinked file only if the symlink is not
-       pointing into datadir.
-     */
--    if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real)))
--      res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | MY_WME | sync_dir));
-+    if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real)))
-+      res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir));
-   }
--  DBUG_RETURN(mysql_file_delete(key, orig, MYF(MY_WME | sync_dir)) || res);
-+  DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res);
- }
-diff --git a/sql/handler.cc b/sql/handler.cc
-index 2ae144a..dc40e34 100644
---- sql/handler.cc.orig
-+++ sql/handler.cc
-@@ -3381,7 +3381,7 @@ int handler::delete_table(const char *name)
- 
-   for (const char **ext=bas_ext(); *ext ; ext++)
-   {
--    if (my_handler_delete_with_symlink(key_file_misc, name, *ext, 0))
-+    if (mysql_file_delete_with_symlink(key_file_misc, name, *ext, 0))
-     {
-       if (my_errno != ENOENT)
-       {
-diff --git a/sql/sql_db.cc b/sql/sql_db.cc
-index 7bb4f0f..580590b 100644
---- sql/sql_db.cc.orig
-+++ sql/sql_db.cc
-@@ -1085,7 +1085,7 @@ static bool find_db_tables_and_rm_known_files(THD *thd, MY_DIR *dirp,
-         We ignore ENOENT error in order to skip files that was deleted
-         by concurrently running statement like REPAIR TABLE ...
-       */
--      if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) &&
-+      if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(0)) &&
-           my_errno != ENOENT)
-       {
-         my_error(EE_DELETE, MYF(0), filePath, my_errno);
-@@ -1206,7 +1206,7 @@ long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path)
-       continue;
-     }
-     strxmov(filePath, org_path, "/", file->name, NullS);
--    if (my_handler_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME)))
-+    if (mysql_file_delete_with_symlink(key_file_misc, filePath, "", MYF(MY_WME)))
-     {
-       goto err;
-     }
-diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c
-index c4bcd5b..f80ec13 100644
---- storage/maria/ma_delete_table.c.orig
-+++ storage/maria/ma_delete_table.c
-@@ -86,8 +86,8 @@ int maria_delete_table_files(const char *name, myf sync_dir)
- {
-   DBUG_ENTER("maria_delete_table_files");
- 
--  if (my_handler_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) ||
--      my_handler_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir))
-+  if (mysql_file_delete_with_symlink(key_file_kfile, name, MARIA_NAME_IEXT, sync_dir) ||
-+      mysql_file_delete_with_symlink(key_file_dfile, name, MARIA_NAME_DEXT, sync_dir))
-     DBUG_RETURN(my_errno);
-   DBUG_RETURN(0);
- }
-diff --git a/storage/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c
-index ebedfbd..ca395ff 100644
---- storage/myisam/mi_delete_table.c.orig
-+++ storage/myisam/mi_delete_table.c
-@@ -28,8 +28,8 @@ int mi_delete_table(const char *name)
-   check_table_is_closed(name,"delete");
- #endif
- 
--  if (my_handler_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) ||
--      my_handler_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0))
-+  if (mysql_file_delete_with_symlink(mi_key_file_kfile, name, MI_NAME_IEXT, 0) ||
-+      mysql_file_delete_with_symlink(mi_key_file_dfile, name, MI_NAME_DEXT, 0))
-     DBUG_RETURN(my_errno);
-   DBUG_RETURN(0);
- }
diff --git a/databases/mariadb55-client/files/patch-client_CMakeLists.txt b/databases/mariadb55-client/files/patch-client_CMakeLists.txt
index 2a96c82473a8..25484091f9ba 100644
--- a/databases/mariadb55-client/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-client_CMakeLists.txt
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
-+++ client/CMakeLists.txt	2013-01-05 01:49:16.000000000 +0200
-@@ -34,11 +34,12 @@
+--- client/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
++++ client/CMakeLists.txt
+@@ -34,11 +34,12 @@ IF(UNIX)
    SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
  ENDIF(UNIX)
  
@@ -14,8 +14,8 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-@@ -49,15 +50,19 @@
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
+@@ -50,15 +51,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
+ SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
  
 +IF(FALSE)
@@ -34,7 +34,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -75,10 +80,12 @@
+@@ -76,10 +81,12 @@ IF(WIN32)
  ENDIF(WIN32)
  
  # async_example is just a code example, do not install it.
diff --git a/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake b/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake
index 2b32419de733..f075ff3b7990 100644
--- a/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake
+++ b/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake
@@ -1,6 +1,6 @@
---- cmake/jemalloc.cmake.orig	2014-10-08 15:19:51.000000000 +0200
-+++ cmake/jemalloc.cmake	2014-11-16 20:27:50.032638191 +0100
-@@ -22,11 +22,11 @@
+--- cmake/jemalloc.cmake.orig	2017-04-30 11:09:29 UTC
++++ cmake/jemalloc.cmake
+@@ -22,11 +22,11 @@ MACRO (CHECK_JEMALLOC)
        SET(libname jemalloc)
      ENDIF()
  
diff --git a/databases/mariadb55-client/files/patch-extra_CMakeLists.txt b/databases/mariadb55-client/files/patch-extra_CMakeLists.txt
index f08649d6ed04..ff7938f19948 100644
--- a/databases/mariadb55-client/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-extra_CMakeLists.txt
@@ -1,6 +1,6 @@
---- extra/CMakeLists.txt.orig	2012-12-17 03:38:29.000000000 +0200
-+++ extra/CMakeLists.txt	2012-12-17 03:40:12.000000000 +0200
-@@ -54,6 +54,7 @@
+--- extra/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
++++ extra/CMakeLists.txt
+@@ -54,6 +54,7 @@ ADD_CUSTOM_TARGET(GenError
                    DEPENDS 
                    ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
  
@@ -8,7 +8,7 @@
  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
  TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
  
-@@ -74,11 +75,14 @@
+@@ -74,11 +75,14 @@ ENDIF()
  
  MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
  TARGET_LINK_LIBRARIES(replace mysys)
diff --git a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
index 214edfd8834a..67c12b4e8112 100644
--- a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
+++ b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
@@ -1,6 +1,6 @@
---- extra/yassl/taocrypt/src/integer.cpp.orig	2014-04-15 14:02:39.000000000 +0300
-+++ extra/yassl/taocrypt/src/integer.cpp	2014-05-16 17:00:15.000000000 +0300
-@@ -75,7 +75,7 @@
+--- extra/yassl/taocrypt/src/integer.cpp.orig	2017-04-30 11:09:29 UTC
++++ extra/yassl/taocrypt/src/integer.cpp
+@@ -74,7 +74,7 @@ template <class T>
  CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
                                             size_type n, const void *)
  {
diff --git a/databases/mariadb55-client/files/patch-include_CMakeLists.txt b/databases/mariadb55-client/files/patch-include_CMakeLists.txt
index e4c1761275ca..57c37be4426c 100644
--- a/databases/mariadb55-client/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-include_CMakeLists.txt
@@ -1,6 +1,6 @@
---- include/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
-+++ include/CMakeLists.txt	2012-12-23 00:48:29.000000000 +0200
-@@ -58,13 +58,18 @@
+--- include/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
++++ include/CMakeLists.txt
+@@ -59,16 +59,21 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I
  FOREACH(f ${HEADERS_GEN_CONFIGURE})
    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
  ENDFOREACH(f)
@@ -20,3 +20,6 @@
    PATTERN mysql EXCLUDE
    REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
 +ENDIF()
+ 
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+   FILES_MATCHING PATTERN "*.h"
diff --git a/databases/mariadb55-client/files/patch-include_my_compare.h b/databases/mariadb55-client/files/patch-include_my__compare.h
index ad948aa1b5db..0d9945b156c2 100644
--- a/databases/mariadb55-client/files/patch-include_my_compare.h
+++ b/databases/mariadb55-client/files/patch-include_my__compare.h
@@ -1,6 +1,6 @@
---- include/my_compare.h.orig	2012-12-17 03:52:37.000000000 +0200
-+++ include/my_compare.h	2012-12-17 03:53:40.000000000 +0200
-@@ -40,7 +40,7 @@
+--- include/my_compare.h.orig	2017-04-30 11:09:29 UTC
++++ include/my_compare.h
+@@ -40,7 +40,7 @@ extern "C" {
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
  */
  
diff --git a/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
index c80c4c6e12f9..415787052dfa 100644
--- a/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libservices/CMakeLists.txt.orig	2014-10-08 15:19:52.000000000 +0200
-+++ libservices/CMakeLists.txt	2014-10-17 21:47:48.000000000 +0200
-@@ -26,4 +26,6 @@
+--- libservices/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
++++ libservices/CMakeLists.txt
+@@ -26,4 +26,6 @@ SET(MYSQLSERVICES_SOURCES
    logger_service.c)
  
  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
diff --git a/databases/mariadb55-client/files/patch-man_CMakeLists.txt b/databases/mariadb55-client/files/patch-man_CMakeLists.txt
index 09dd6e3b0f7d..df40cfa389f7 100644
--- a/databases/mariadb55-client/files/patch-man_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-man_CMakeLists.txt
@@ -1,6 +1,6 @@
---- man/CMakeLists.txt.orig	2012-12-22 21:30:12.000000000 +0200
-+++ man/CMakeLists.txt	2012-12-22 21:30:54.000000000 +0200
-@@ -30,9 +30,13 @@
+--- man/CMakeLists.txt.orig	2017-04-30 11:09:29 UTC
++++ man/CMakeLists.txt
+@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1)
  SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
                mysqltest_embedded.1 mysql_client_test_embedded.1)
  
diff --git a/databases/mariadb55-client/files/patch-mysys_default.c b/databases/mariadb55-client/files/patch-mysys_default.c
index d99332492a41..e36841601a62 100644
--- a/databases/mariadb55-client/files/patch-mysys_default.c
+++ b/databases/mariadb55-client/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	2013-10-01 21:15:03.544135869 +0200
-+++ mysys/default.c	2013-10-01 21:15:38.871375504 +0200
-@@ -89,7 +89,7 @@
+--- mysys/default.c.orig	2017-04-30 11:09:31 UTC
++++ mysys/default.c
+@@ -89,7 +89,7 @@ static my_bool defaults_already_read= FA
  
  /* Which directories are searched for options (and in which order) */
  
@@ -9,7 +9,7 @@
  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
  static const char **default_directories = NULL;
  
-@@ -785,7 +785,7 @@
+@@ -786,7 +786,7 @@ static int search_default_file_with_ext(
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -18,7 +18,7 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@
+@@ -804,6 +804,14 @@ static int search_default_file_with_ext(
    if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
      return 1;					/* Ignore wrong files */
  
@@ -33,7 +33,7 @@
    while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
    {
      line++;
-@@ -1067,7 +1067,8 @@
+@@ -1068,7 +1076,8 @@ void my_print_default_files(const char *
            if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
              *end++= '.';
            strxmov(end, conf_file, *ext, " ", NullS);
@@ -43,7 +43,7 @@
          }
        }
      }
-@@ -1226,10 +1226,8 @@
+@@ -1227,10 +1236,8 @@ static const char **init_default_directo
    errors += add_directory(alloc, "/etc/", dirs);
    errors += add_directory(alloc, "/etc/mysql/", dirs);
  
diff --git a/databases/mariadb55-client/files/patch-regex_CMakeLists.txt b/databases/mariadb55-client/files/patch-regex_CMakeLists.txt
index a058662b781b..ab79c3bf56c0 100644
--- a/databases/mariadb55-client/files/patch-regex_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-regex_CMakeLists.txt
@@ -1,6 +1,6 @@
---- regex/CMakeLists.txt.orig	2012-12-23 00:42:41.000000000 +0200
-+++ regex/CMakeLists.txt	2012-12-23 00:42:54.000000000 +0200
-@@ -18,4 +18,6 @@
+--- regex/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
++++ regex/CMakeLists.txt
+@@ -18,4 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
  SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
  ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
  
diff --git a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt
index cf8b85b1b20a..ea769d7f3d2d 100644
--- a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2014-04-15 14:02:28.000000000 +0300
-+++ scripts/CMakeLists.txt	2014-05-16 19:02:48.000000000 +0300
-@@ -72,6 +72,7 @@
+--- scripts/CMakeLists.txt.orig	2017-04-30 11:09:31 UTC
++++ scripts/CMakeLists.txt
+@@ -72,6 +72,7 @@ IF(UNIX)
  )
  ENDIF()
  
@@ -8,7 +8,7 @@
  INSTALL(FILES 
    ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
    ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -81,6 +82,7 @@
+@@ -81,6 +82,7 @@ INSTALL(FILES 
    ${FIX_PRIVILEGES_SQL}
    DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
  )
@@ -16,7 +16,7 @@
  
  # TCMalloc hacks
  IF(MALLOC_LIB)
-@@ -140,6 +142,7 @@
+@@ -133,6 +135,7 @@ ENDIF()
  SET(HOSTNAME "hostname")
  SET(MYSQLD_USER "mysql")
  
@@ -24,7 +24,7 @@
  # Required for mysqlbug until autotools are deprecated, once done remove these
  # and expand default cmake variables
  SET(CC ${CMAKE_C_COMPILER})
-@@ -180,6 +183,7 @@
+@@ -173,6 +176,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
    DESTINATION ${INSTALL_BINDIR}
    COMPONENT Server
    )
@@ -32,7 +32,7 @@
  
  ENDIF(UNIX)
  
-@@ -204,6 +208,7 @@
+@@ -197,6 +201,7 @@ ELSE()
    SET(localstatedir ${MYSQL_DATADIR})
  ENDIF()
  
@@ -40,7 +40,7 @@
  IF(UNIX)
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
    ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-@@ -219,6 +224,7 @@
+@@ -212,6 +217,7 @@ INSTALL_SCRIPT(
    COMPONENT Server
    )
  ENDIF()
@@ -48,7 +48,7 @@
  
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
  SET(sysconfdir ${prefix})
-@@ -276,6 +282,8 @@
+@@ -270,6 +276,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
              STRING(REGEX REPLACE "^lib" "" lib "${lib}")
              SET(${var} "${${var}}-l${lib} " ) 
            ENDIF()
@@ -57,7 +57,7 @@
          ELSE()
            SET(${var} "${${var}}-l${lib} " ) 
          ENDIF()
-@@ -334,18 +342,8 @@
+@@ -328,18 +336,8 @@ ELSE()
    SET(BIN_SCRIPTS
      msql2mysql
      mysql_config
diff --git a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh b/databases/mariadb55-client/files/patch-scripts_mysql__config.sh
index 2cbe2aae424a..8788844b5670 100644
--- a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh
+++ b/databases/mariadb55-client/files/patch-scripts_mysql__config.sh
@@ -1,6 +1,6 @@
---- scripts/mysql_config.sh.orig	2014-10-17 21:44:16.000000000 +0200
-+++ scripts/mysql_config.sh	2014-10-17 21:54:16.000000000 +0200
-@@ -109,8 +109,11 @@
+--- scripts/mysql_config.sh.orig	2017-04-30 11:09:31 UTC
++++ scripts/mysql_config.sh
+@@ -109,8 +109,11 @@ fi
  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
  libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
  libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
diff --git a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
index 08a6556bbbb2..90098d933cbe 100644
--- a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2014-10-08 15:19:53.000000000 +0200
-+++ support-files/CMakeLists.txt	2014-10-17 22:34:28.000000000 +0200
-@@ -41,15 +41,18 @@
+--- support-files/CMakeLists.txt.orig	2017-04-30 11:09:34 UTC
++++ support-files/CMakeLists.txt
+@@ -41,15 +41,18 @@ ELSE()
    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
  ENDIF()
  
@@ -19,9 +19,9 @@
    FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                     ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -69,8 +72,10 @@
+@@ -69,8 +72,10 @@ IF(UNIX)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-     INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
+     ADD_SUBDIRECTORY(SELinux)
    ENDIF()
 +  ENDIF()
  
@@ -30,7 +30,7 @@
    CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
    CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
    
-@@ -94,6 +99,7 @@
+@@ -94,6 +99,7 @@ IF(UNIX)
      DESTINATION ${inst_location} COMPONENT SupportFiles
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)