databases/percona57-{client,pam-for-mysql,server}: Update to 5.7.20-18

Release notes: https://www.percona.com/doc/percona-server/5.7/release-notes/Percona-Server-5.7.20-18.html

MFH:		2017Q4

4 files changed, 25 insertions, 39 deletions

diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile
index 65b97d41c50b..a2ab5f0c2b2c 100644
--- a/databases/percona57-client/Makefile
+++ b/databases/percona57-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	percona
-PORTREVISION?=	3
+PORTREVISION?=	0
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/percona57-client/files/patch-client__mysql.cc b/databases/percona57-client/files/patch-client__mysql.cc
index d15700aa095f..a3717a4dbf26 100644
--- a/databases/percona57-client/files/patch-client__mysql.cc
+++ b/databases/percona57-client/files/patch-client__mysql.cc
@@ -28,12 +28,3 @@
  #else
    rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
    rl_completion_entry_function= &no_completion;
-@@ -2886,7 +2888,7 @@ static char **new_mysql_completion(const char *text,
-                                    int end MY_ATTRIBUTE((unused)))
- {
-   if (!status.batch && !quick)
--#if defined(USE_NEW_READLINE_INTERFACE)
-+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-     return rl_completion_matches(text, new_command_generator);
- #else
-     return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/percona57-client/files/patch-scripts_CMakeLists.txt b/databases/percona57-client/files/patch-scripts_CMakeLists.txt
index bdb577cf274b..144cbaaf45e3 100644
--- a/databases/percona57-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/percona57-client/files/patch-scripts_CMakeLists.txt
@@ -1,23 +1,24 @@
---- scripts/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ scripts/CMakeLists.txt
-@@ -19,7 +19,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
-  TARGET_LINK_LIBRARIES(comp_sql)
- ENDIF()
+--- scripts/CMakeLists.txt.orig	2017-12-11 07:56:49.000000000 +0000
++++ scripts/CMakeLists.txt	2017-12-31 14:31:35.649012000 +0000
+@@ -23,6 +23,7 @@
+ SET(COMPILER_ID_AND_VERSION
+   "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
  
--
 +IF(FALSE)
  # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts)
  IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
    FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
-@@ -63,6 +63,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
+@@ -65,7 +66,9 @@
+   ALL
    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
    ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
++ENDIF()
  )
 +ENDIF()
  
  # If we do not have performance schema compiled in then sys will not work,
  # so only create an empty sys database with an auto-generated file,
-@@ -143,6 +144,7 @@ IF(NOT WITHOUT_SERVER)
+@@ -146,6 +149,7 @@
    )
  ENDIF()
  
@@ -25,7 +26,7 @@
  IF(UNIX)
   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
     "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
-@@ -150,6 +152,7 @@ IF(UNIX)
+@@ -153,6 +157,7 @@
    COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
  )
  ENDIF()
@@ -33,7 +34,7 @@
  
  IF(NOT WITHOUT_SERVER)
    INSTALL(FILES
-@@ -347,6 +350,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -332,6 +337,8 @@
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
            SET(${var} "${${var}}-l${lib} " ) 
@@ -42,7 +43,7 @@
          ELSE()
            SET(${var} "${${var}}-l${lib} " ) 
          ENDIF()
-@@ -430,21 +435,7 @@ ELSE()
+@@ -417,25 +424,7 @@
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
  
@@ -51,6 +52,8 @@
 -      mysql_config
 -      mysqldumpslow
 -      ps_tokudb_admin
+-      ps_mysqld_helper
+-      ps-admin
 -      )
 -  ELSE()
 -    SET(BIN_SCRIPTS
@@ -59,6 +62,8 @@
 -      mysqld_multi
 -      mysqld_safe
 -      ps_tokudb_admin
+-      ps_mysqld_helper
+-      ps-admin
 -      )
 -  ENDIF()
 +  SET(BIN_SCRIPTS mysql_config)
diff --git a/databases/percona57-client/files/patch-support-files_CMakeLists.txt b/databases/percona57-client/files/patch-support-files_CMakeLists.txt
index 27fc42b9c4ee..9dd13cfbe3b7 100644
--- a/databases/percona57-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/percona57-client/files/patch-support-files_CMakeLists.txt
@@ -1,24 +1,14 @@
---- support-files/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ support-files/CMakeLists.txt
-@@ -44,14 +44,17 @@ ELSE()
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- SET(inifile my-default)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-         DESTINATION ${inst_location} COMPONENT IniFiles)
-+ENDIF()
- 
- IF(UNIX)
+--- support-files/CMakeLists.txt.orig	2017-12-11 07:56:49.000000000 +0000
++++ support-files/CMakeLists.txt	2017-12-31 14:35:25.047786000 +0000
+@@ -47,6 +47,7 @@
+     SET (PIDOF "pgrep -d' ' -f")
+   ENDIF()
    SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
++  IF(FALSE)
    FOREACH(script  mysqld_multi.server mysql-log-rotate)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                     ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -68,9 +71,11 @@ IF(UNIX)
+@@ -59,9 +60,11 @@
    IF(INSTALL_SUPPORTFILESDIR)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()
@@ -30,7 +20,7 @@
    SET(bindir ${prefix}/${INSTALL_BINDIR})
    SET(sbindir ${prefix}/${INSTALL_SBINDIR})
    SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
-@@ -83,3 +88,4 @@ IF(UNIX)
+@@ -74,3 +77,4 @@
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  ENDIF()