Index: mysql57-client/pkg-plist
===================================================================
--- mysql57-client/pkg-plist	(.../ports-dev/databases)	(working copy)
+++ mysql57-client/pkg-plist	(.../ports-dev-copy/databases)	(working copy)
@@ -53,6 +53,8 @@
 include/mysql/mysql/plugin_ftparser.h
 include/mysql/mysql/plugin_ftparser.h.pp
 include/mysql/mysql/plugin_group_replication.h
+include/mysql/mysql/plugin_keyring.h
+include/mysql/mysql/plugin_keyring.h.pp
 include/mysql/mysql/plugin_trace.h
 include/mysql/mysql/plugin_validate_password.h
 include/mysql/mysql/psi/mysql_file.h
@@ -75,6 +77,7 @@
 include/mysql/mysql/service_my_plugin_log.h
 include/mysql/mysql/service_my_snprintf.h
 include/mysql/mysql/service_mysql_alloc.h
+include/mysql/mysql/service_mysql_keyring.h
 include/mysql/mysql/service_mysql_password_policy.h
 include/mysql/mysql/service_mysql_string.h
 include/mysql/mysql/service_parser.h
@@ -103,6 +106,7 @@
 include/mysql/plugin_audit.h
 include/mysql/plugin_ftparser.h
 include/mysql/plugin_group_replication.h
+include/mysql/plugin_keyring.h
 include/mysql/plugin_validate_password.h
 include/mysql/sql_common.h
 include/mysql/sql_state.h
Index: mysql57-server/Makefile
===================================================================
--- mysql57-server/Makefile	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/Makefile	(.../ports-dev-copy/databases)	(working copy)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTVERSION=	5.7.10
-PORTREVISION?=	3
+PORTVERSION=	5.7.11
+PORTREVISION?=	4
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
 PKGNAMESUFFIX?=	57-server
Index: mysql57-server/distinfo
===================================================================
--- mysql57-server/distinfo	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/distinfo	(.../ports-dev-copy/databases)	(working copy)
@@ -1,4 +1,4 @@
-SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74
-SIZE (mysql-5.7.10.tar.gz) = 48919371
+SHA256 (mysql-5.7.11.tar.gz) = 54f8c7af87d3d8084419bde2b9f0d8970b3dada0757b015981b02f35a3681f0e
+SIZE (mysql-5.7.11.tar.gz) = 49195786
 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
 SIZE (boost_1_59_0.tar.gz) = 83709983
Index: mysql57-server/files/patch-CMakeLists.txt
===================================================================
--- mysql57-server/files/patch-CMakeLists.txt	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/files/patch-CMakeLists.txt	(.../ports-dev-copy/databases)	(working copy)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
 +++ CMakeLists.txt
-@@ -577,12 +577,10 @@ IF(UNIX)
+@@ -587,12 +587,10 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -591,8 +589,6 @@ ENDIF()
+@@ -601,8 +599,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -22,7 +22,7 @@
    ADD_SUBDIRECTORY(support-files)
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
-@@ -647,6 +643,7 @@ ENDIF()
+@@ -661,6 +657,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -30,7 +30,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -683,6 +680,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
Index: mysql57-server/files/patch-client_CMakeLists.txt
===================================================================
--- mysql57-server/files/patch-client_CMakeLists.txt	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/files/patch-client_CMakeLists.txt	(.../ports-dev-copy/databases)	(working copy)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- client/CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
 +++ client/CMakeLists.txt
-@@ -38,8 +38,6 @@ ADD_DEFINITIONS(
+@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
@@ -9,8 +9,8 @@
  
  ## We will need libeay32.dll and ssleay32.dll when running client executables.
  COPY_OPENSSL_DLLS(copy_openssl_client)
-@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F
- ENDIF()
+@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
  ADD_DEFINITIONS(${SSL_DEFINES})
 +IF(FALSE)
@@ -23,7 +23,7 @@
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
+@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
  
@@ -31,7 +31,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
  
-@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -44,7 +44,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
    mysqlbinlog.cc
-@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@@ -52,7 +52,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
  TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
    ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
  ENDIF()
  
@@ -64,7 +64,7 @@
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
-@@ -197,11 +203,6 @@ ENDIF(WIN32)
+@@ -123,11 +129,6 @@ ENDIF(WIN32)
  
  SET_TARGET_PROPERTIES (
    mysql_plugin
Index: mysql57-server/files/patch-cmake_plugin.cmake
===================================================================
--- mysql57-server/files/patch-cmake_plugin.cmake	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/files/patch-cmake_plugin.cmake	(.../ports-dev-copy/databases)	(working copy)
@@ -1,4 +1,4 @@
---- cmake/plugin.cmake.orig	2015-11-29 19:16:24 UTC
+--- cmake/plugin.cmake.orig	2016-02-01 23:31:58 UTC
 +++ cmake/plugin.cmake
 @@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN)
      MYSQL_INSTALL_TARGETS(${target}
Index: mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h
===================================================================
--- mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h	(.../ports-dev-copy/databases)	(working copy)
@@ -1,4 +1,4 @@
---- cmd-line-utils/libedit/chartype.h.orig	2015-11-29 19:16:24 UTC
+--- cmd-line-utils/libedit/chartype.h.orig	2016-02-01 23:31:58 UTC
 +++ cmd-line-utils/libedit/chartype.h
 @@ -49,7 +49,7 @@
    TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
Index: mysql57-server/files/patch-cmd-line-utils_libedit_vi.c
===================================================================
--- mysql57-server/files/patch-cmd-line-utils_libedit_vi.c	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/files/patch-cmd-line-utils_libedit_vi.c	(.../ports-dev-copy/databases)	(working copy)
@@ -1,4 +1,4 @@
---- cmd-line-utils/libedit/vi.c.orig	2015-11-29 19:16:24 UTC
+--- cmd-line-utils/libedit/vi.c.orig	2016-02-01 23:31:58 UTC
 +++ cmd-line-utils/libedit/vi.c
 @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
   * NB: posix implies that we should enter insert mode, however
Index: mysql57-server/files/patch-include_CMakeLists.txt
===================================================================
--- mysql57-server/files/patch-include_CMakeLists.txt	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/files/patch-include_CMakeLists.txt	(.../ports-dev-copy/databases)	(working copy)
@@ -1,12 +1,14 @@
---- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- include/CMakeLists.txt.orig	2016-02-01 23:31:58 UTC
 +++ include/CMakeLists.txt
-@@ -69,10 +69,12 @@ SET(HEADERS 
+@@ -69,6 +69,7 @@ SET(HEADERS 
+   ${HEADERS_GEN_CONFIGURE}
  )
-
+ 
 +IF(FALSE) 
- INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
+ INSTALL(FILES
+   ../libbinlogevents/export/binary_log_types.h
+   DESTINATION ${INSTALL_INCLUDEDIR}
+@@ -78,5 +79,6 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
   PATTERN "*.h"
   PATTERN "psi_abi*" EXCLUDE
  )
Index: mysql57-server/pkg-plist
===================================================================
--- mysql57-server/pkg-plist	(.../ports-dev/databases)	(working copy)
+++ mysql57-server/pkg-plist	(.../ports-dev-copy/databases)	(working copy)
@@ -25,6 +25,7 @@
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/daemon_example.ini
 %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
+lib/mysql/plugin/keyring_file.so
 lib/mysql/plugin/libdaemon_example.so
 lib/mysql/plugin/libtest_framework.so
 lib/mysql/plugin/libtest_services.so