databases/mariadb101-{server,client}: Update to 10.1.13

  - Update to version 10.1.13
  - Make GSSAPI plugin optional [2]
  - Remove patches that are merged upstream
  - Re-generate patches that required fuzzing
  - Server
    - Fix OQGraph build failure [1]
    - Install server gssapi plugin only
    - Don't install gssapi libs/files that were moved to -client
    - Add license and readme file for TokuDB
    - Add tokuft_logprint and tokuftdump binaries
  - Client
    - Install client gssapi plugin
    - Enable PLIST_SUB for optional gssapi plugin
    - Add new plugins and ini file
    - Remove taocrypt patch, we don't build bundled SSL

PR:		207675 [1], 207883 [2]
Reviewed by:	feld (mentor)
Approved by:	feld (mentor)
Differential Revision:	D5751

11 files changed, 42 insertions, 60 deletions

diff --git a/databases/mariadb101-client/Makefile b/databases/mariadb101-client/Makefile
index 67b09a818fd7..902f67d403a7 100644
--- a/databases/mariadb101-client/Makefile
+++ b/databases/mariadb101-client/Makefile
@@ -26,7 +26,13 @@ post-install:
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b}
 .	endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18
+.	for b in dialog.so mysql_clear_password.so 
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/${b}
+.	endfor
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
 	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config
 
+post-install-GSSAPI_NONE:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
+
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb101-client/files/patch-CMakeLists.txt b/databases/mariadb101-client/files/patch-CMakeLists.txt
index 4ca8614b0f51..285d6128cd3c 100644
--- a/databases/mariadb101-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-12-23 15:33:29 UTC
+--- CMakeLists.txt.orig	2016-03-24 09:12:10 UTC
 +++ CMakeLists.txt
-@@ -382,7 +382,6 @@ ADD_SUBDIRECTORY(libmysql)
+@@ -380,7 +380,6 @@ ADD_SUBDIRECTORY(libmysql)
  ADD_SUBDIRECTORY(client)
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
@@ -8,7 +8,7 @@
  
  IF(NOT WITHOUT_SERVER)
    ADD_SUBDIRECTORY(tests)
-@@ -461,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -460,6 +459,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
@@ -16,7 +16,7 @@
  INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty
                        EXCEPTIONS-CLIENT COMPONENT Readme)
  # MDEV-6526 these files are not installed anymore
-@@ -471,6 +471,7 @@ IF(UNIX)
+@@ -470,6 +470,7 @@ IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
  ENDIF()
diff --git a/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake b/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake
deleted file mode 100644
index a21f44fe2764..000000000000
--- a/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# Upstreamed https://github.com/MariaDB/server/pull/140
-
---- cmake/jemalloc.cmake.orig	2015-12-23 15:33:29 UTC
-+++ cmake/jemalloc.cmake
-@@ -12,7 +12,12 @@ MACRO(JEMALLOC_TRY_STATIC)
- ENDMACRO()
- 
- MACRO(JEMALLOC_TRY_DYNAMIC)
--  SET(libname jemalloc)
-+  IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND 
-+    CMAKE_SYSTEM_VERSION STRGREATER "10.0")
-+    SET(libname c)
-+  ELSE()
-+    SET(libname jemalloc)
-+  ENDIF()
-   SET(what system)
-   CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC)
- ENDMACRO()
diff --git a/databases/mariadb101-client/files/patch-cmake_ssl.cmake b/databases/mariadb101-client/files/patch-cmake_ssl.cmake
index b1178daef4be..5f8c1c0b6910 100644
--- a/databases/mariadb101-client/files/patch-cmake_ssl.cmake
+++ b/databases/mariadb101-client/files/patch-cmake_ssl.cmake
@@ -1,7 +1,7 @@
 MariaDB prefers static libraries, breaks builds with
 ports' OpenSSL libs
 
---- cmake/ssl.cmake.orig	2015-12-23 15:33:29 UTC
+--- cmake/ssl.cmake.orig	2016-03-24 09:12:10 UTC
 +++ cmake/ssl.cmake
 @@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
  
@@ -16,3 +16,16 @@ ports' OpenSSL libs
      FIND_LIBRARY(OPENSSL_LIBRARIES
                   NAMES ssl ssleay32 ssleay32MD
                   HINTS ${OPENSSL_ROOT_DIR}/lib)
+@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL)
+                  HINTS ${OPENSSL_ROOT_DIR}/lib)
+     MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR
+       OPENSSL_INCLUDE_DIR)
+-    IF (WITH_SSL_PATH)
+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+-    ENDIF()
++#    IF (WITH_SSL_PATH)
++#      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
++#    ENDIF()
+ 
+     INCLUDE(CheckSymbolExists)
+     SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
diff --git a/databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
deleted file mode 100644
index 214edfd8834a..000000000000
--- a/databases/mariadb101-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
- CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
-                                            size_type n, const void *)
- {
--    if (n > this->max_size())
-+    if (n > AlignedAllocator<T>::max_size())
-         return 0;
-     if (n == 0)
-         return 0;
diff --git a/databases/mariadb101-client/files/patch-include_my_compare.h b/databases/mariadb101-client/files/patch-include_my__compare.h
index 6a3f0e052da3..6a3f0e052da3 100644
--- a/databases/mariadb101-client/files/patch-include_my_compare.h
+++ b/databases/mariadb101-client/files/patch-include_my__compare.h
diff --git a/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h b/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
deleted file mode 100644
index ae94c3c0c38d..000000000000
--- a/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/mysql/service_encryption.h.orig	2015-12-23 15:33:29 UTC
-+++ include/mysql/service_encryption.h
-@@ -37,9 +37,11 @@ extern "C" {
- #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #include <stdlib.h>
- #else
-+#ifndef __FreeBSD__
- #include <alloca.h>
- #endif
- #endif
-+#endif
- 
- /* returned from encryption_key_get_latest_version() */
- #define ENCRYPTION_KEY_VERSION_INVALID        (~(unsigned int)0)
diff --git a/databases/mariadb101-client/files/patch-mysys_my_default.c b/databases/mariadb101-client/files/patch-mysys_my__default.c
index 3dc729ebd263..db4081fa5ed3 100644
--- a/databases/mariadb101-client/files/patch-mysys_my_default.c
+++ b/databases/mariadb101-client/files/patch-mysys_my__default.c
@@ -1,4 +1,4 @@
---- mysys/my_default.c.orig	2015-12-23 15:33:31 UTC
+--- mysys/my_default.c.orig	2016-03-24 09:12:11 UTC
 +++ mysys/my_default.c
 @@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA
  
@@ -9,7 +9,7 @@
  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
  static const char **default_directories = NULL;
  
-@@ -784,7 +784,7 @@ static int search_default_file_with_ext(
+@@ -785,7 +785,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
-@@ -802,6 +802,14 @@ static int search_default_file_with_ext(
+@@ -803,6 +803,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++;
-@@ -1066,7 +1074,8 @@ void my_print_default_files(const char *
+@@ -1067,7 +1075,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 @@
          }
        }
      }
-@@ -1222,13 +1231,10 @@ static const char **init_default_directo
+@@ -1223,13 +1232,10 @@ static const char **init_default_directo
  
  #else
  
diff --git a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
index dc385a444ceb..5d53de0b4146 100644
--- a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
@@ -1,4 +1,4 @@
---- scripts/CMakeLists.txt.orig	2015-12-23 15:33:31 UTC
+--- scripts/CMakeLists.txt.orig	2016-03-24 09:12:11 UTC
 +++ scripts/CMakeLists.txt
 @@ -73,6 +73,7 @@ IF(UNIX)
  )
@@ -8,7 +8,7 @@
  INSTALL(FILES 
    ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
    ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -84,6 +85,7 @@ INSTALL(FILES 
+@@ -82,6 +83,7 @@ INSTALL(FILES 
    ${FIX_PRIVILEGES_SQL}
    DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
  )
@@ -16,7 +16,7 @@
  
  # TCMalloc hacks
  IF(MALLOC_LIB)
-@@ -136,6 +138,7 @@ ENDIF()
+@@ -134,6 +136,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})
-@@ -170,6 +173,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
+@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
    DESTINATION ${INSTALL_BINDIR}
    COMPONENT Server
    )
@@ -32,7 +32,7 @@
  
  ENDIF(UNIX)
  
-@@ -195,6 +199,7 @@ ELSE()
+@@ -193,6 +197,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)
-@@ -208,6 +213,7 @@ INSTALL_SCRIPT(
+@@ -206,6 +211,7 @@ INSTALL_SCRIPT(
    COMPONENT Server
    )
  ENDIF()
@@ -48,7 +48,7 @@
  
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
  IF(INSTALL_SYSCONFDIR)
-@@ -286,18 +292,8 @@ ELSE()
+@@ -284,18 +290,8 @@ ELSE()
    SET(BIN_SCRIPTS
      msql2mysql
      mysql_config
diff --git a/databases/mariadb101-client/files/patch-scripts_mysql_config.sh b/databases/mariadb101-client/files/patch-scripts_mysql__config.sh
index 6ce75cd52079..6ce75cd52079 100644
--- a/databases/mariadb101-client/files/patch-scripts_mysql_config.sh
+++ b/databases/mariadb101-client/files/patch-scripts_mysql__config.sh
diff --git a/databases/mariadb101-client/pkg-plist b/databases/mariadb101-client/pkg-plist
index ffe5710426e6..22fc5dd1f44e 100644
--- a/databases/mariadb101-client/pkg-plist
+++ b/databases/mariadb101-client/pkg-plist
@@ -93,6 +93,12 @@ lib/mysql/libmysqlclient.so.18
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.18
+%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
+lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/dialog.so
+lib/mysql/plugin/mysql_clear_password.so
+%%DATADIR%%/maria_add_gis_sp.sql
+%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
 man/man1/msql2mysql.1.gz
 man/man1/mysql.1.gz
 man/man1/mysql_config.1.gz