MFH: r418997

databases/mariadb101-client: Update to 10.1.16

  - -client was missig from the -server commit
  - post-install target to post-stage
  - Delete private headers
  - Add service_encryption.h patch
  - Fix scipts/CMakeLists.txt patch

PR:             211328

Approved by:	ports-secteam (feld)

3 files changed, 25 insertions, 15 deletions

diff --git a/databases/mariadb101-client/Makefile b/databases/mariadb101-client/Makefile
index 57474ba..3930e76 100644
--- a/databases/mariadb101-client/Makefile
+++ b/databases/mariadb101-client/Makefile
@@ -18,9 +18,10 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql
 
 CLIENT_ONLY=	yes
 
-post-install:
+post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
 	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
 .	for b in mysql mysqladmin mysqlbinlog mysqlcheck mysqldump \
 		mysqlimport mysqlshow mysqlslap
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b}
@@ -32,7 +33,7 @@ post-install:
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
 	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config
 
-post-install-GSSAPI_NONE:
+post-stage-GSSAPI_NONE:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h b/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
new file mode 100644
index 0000000..ae94c3c
--- /dev/null
+++ b/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
@@ -0,0 +1,14 @@
+--- 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-scripts_CMakeLists.txt b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
index 5d53de0..83bd07f 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	2016-03-24 09:12:11 UTC
+--- scripts/CMakeLists.txt.orig	2016-07-14 01:10:23 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
-@@ -82,6 +83,7 @@ INSTALL(FILES 
+@@ -83,6 +84,7 @@ INSTALL(FILES 
    ${FIX_PRIVILEGES_SQL}
    DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
  )
@@ -16,7 +16,7 @@
  
  # TCMalloc hacks
  IF(MALLOC_LIB)
-@@ -134,6 +136,7 @@ ENDIF()
+@@ -135,6 +137,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})
-@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
+@@ -169,6 +172,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
    DESTINATION ${INSTALL_BINDIR}
    COMPONENT Server
    )
@@ -32,7 +32,7 @@
  
  ENDIF(UNIX)
  
-@@ -193,6 +197,7 @@ ELSE()
+@@ -194,6 +198,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)
-@@ -206,6 +211,7 @@ INSTALL_SCRIPT(
+@@ -207,6 +212,7 @@ INSTALL_SCRIPT(
    COMPONENT Server
    )
  ENDIF()
@@ -48,22 +48,17 @@
  
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
  IF(INSTALL_SYSCONFDIR)
-@@ -284,18 +290,8 @@ ELSE()
+@@ -294,13 +300,8 @@ ELSE()
    SET(BIN_SCRIPTS
      msql2mysql
      mysql_config
--    mysql_fix_extensions
 -    mysql_setpermission
 -    mysql_secure_installation
--    mysql_zap
      mysqlaccess
 -    mysql_convert_table_format
      mysql_find_rows
 -    mytop
 -    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
+     ${SERVER_SCRIPTS}
      ${WSREP_BINARIES}
      ${SYSTEMD_SCRIPTS}
-   )