Update to 5.7.12, fixing 31 partially critical vulnerabilities

List of vulnerabilities is documented on:
http://vuxml.freebsd.org/freebsd/8c2b2f11-0ebe-11e6-b55e-b499baebfeaf.html
CVE IDs see below.

PR:		206998
Submitted by:	mokhi64@gmail.com (maintainer)
Reviewed by:	rootservice@gmail.com
Approved by:	mokhi64@gmail.com (maintainer)
MFH:		2016Q2
Security:	CVE-2016-0705
		CVE-2016-0639
		CVE-2015-3194
		CVE-2016-0640
		CVE-2016-0641
		CVE-2016-3461
		CVE-2016-2047
		CVE-2016-0642
		CVE-2016-0643
		CVE-2016-0644
		CVE-2016-0646
		CVE-2016-0647
		CVE-2016-0648
		CVE-2016-0649
		CVE-2016-0650
		CVE-2016-0652
		CVE-2016-0653
		CVE-2016-0654
		CVE-2016-0655
		CVE-2016-0656
		CVE-2016-0657
		CVE-2016-0658
		CVE-2016-0651
		CVE-2016-0659
		CVE-2016-0661
		CVE-2016-0662
		CVE-2016-0663
		CVE-2016-0665
		CVE-2016-0666
		CVE-2016-0667
		CVE-2016-0668

17 files changed, 40 insertions, 36 deletions

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index ff98e5c183e9..bd5b31a70f3d 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION?=	4
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -17,12 +16,12 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql5[0-68-9]-client-* \
+			mysql[0-46-9][0-9]-client-* \
+			mariadb[0-9][0-9]-client-* \
+			percona[0-9][0-9]-client-*
 
-CMAKE_ARGS+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
-		-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \
-		-DWITHOUT_SERVER=1 \
-		-DWITH_SYSTEMD=0
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
@@ -32,7 +31,7 @@ MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mys
 
 CLIENT_ONLY=	yes
 
-# issue 166367: adding symlinks for back-compatibility with $(lib)_r
+# issue 166367: adding symlinks for back-compatibility with ${lib}_r
 post-install:
 	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
 	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt
index 4e9091fae53e..4d202eb72f10 100644
--- a/databases/mysql57-client/files/patch-CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ CMakeLists.txt
-@@ -569,8 +569,8 @@ ENDIF()
+@@ -606,8 +606,8 @@ ENDIF()
  
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(client)
@@ -10,7 +10,7 @@
  
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
-@@ -639,14 +639,13 @@ ELSE()
+@@ -676,14 +676,13 @@ ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
@@ -26,7 +26,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt
index 5b0e752138e7..66073f5d3ab1 100644
--- a/databases/mysql57-client/files/patch-client_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-client_CMakeLists.txt
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ client/CMakeLists.txt
-@@ -121,6 +121,7 @@ IF(UNIX)
+@@ -47,6 +47,7 @@ IF(UNIX)
    TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
  ENDIF(UNIX)
  
@@ -8,7 +8,7 @@
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
      upgrade/program.cc
-@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS(
+@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
  TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
  ENDIF()
@@ -22,7 +22,7 @@
  
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
-@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
  
@@ -33,7 +33,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
-@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
  
@@ -44,7 +44,7 @@
  
  IF(UNIX AND NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -196,7 +204,6 @@ IF(WIN32)
+@@ -122,7 +130,6 @@ IF(WIN32)
  ENDIF(WIN32)
  
  SET_TARGET_PROPERTIES (
diff --git a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
index bf275e9893cb..2fcf5754c44e 100644
--- a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
+++ b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
@@ -1,4 +1,4 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2015-11-29 19:16:24 UTC
+--- cmake/build_configurations/compiler_options.cmake.orig	2016-03-28 18:06:12 UTC
 +++ cmake/build_configurations/compiler_options.cmake
 @@ -28,7 +28,7 @@ IF(UNIX)  
  
diff --git a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake b/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
index 7e94978023f1..83c154ee3bcf 100644
--- a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
+++ b/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
@@ -1,4 +1,4 @@
---- cmake/os/DragonFly.cmake.orig	2015-12-17 10:53:10 UTC
+--- cmake/os/DragonFly.cmake.orig	2016-04-14 10:16:17 UTC
 +++ cmake/os/DragonFly.cmake
 @@ -0,0 +1,24 @@
 +INCLUDE(CheckCSourceRuns)
diff --git a/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h b/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
index 6aaba5c733f7..34fbf5a45509 100644
--- a/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
+++ b/databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
@@ -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-03-28 18:06:12 UTC
 +++ cmd-line-utils/libedit/chartype.h
 @@ -49,7 +49,7 @@
    TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
diff --git a/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c b/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
index 0847a07c84d4..cb3e255991ab 100644
--- a/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
+++ b/databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
@@ -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-03-28 18:06:12 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
diff --git a/databases/mysql57-client/files/patch-extra_CMakeLists.txt b/databases/mysql57-client/files/patch-extra_CMakeLists.txt
index 185a6f785e69..045b98549e41 100644
--- a/databases/mysql57-client/files/patch-extra_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-extra_CMakeLists.txt
@@ -1,4 +1,4 @@
---- extra/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- extra/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ extra/CMakeLists.txt
 @@ -45,6 +45,7 @@ ENDIF()
  
diff --git a/databases/mysql57-client/files/patch-include_CMakeLists.txt b/databases/mysql57-client/files/patch-include_CMakeLists.txt
index 78841377ee54..1fc41ad15601 100644
--- a/databases/mysql57-client/files/patch-include_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-include_CMakeLists.txt
@@ -1,6 +1,6 @@
---- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ include/CMakeLists.txt
-@@ -37,6 +37,7 @@ SET(HEADERS_ABI 
+@@ -38,6 +38,7 @@ SET(HEADERS_ABI 
  
  SET(HEADERS 
    ${HEADERS_ABI} 
@@ -8,4 +8,3 @@
    my_dbug.h 
    m_string.h
    my_sys.h 
-
diff --git a/databases/mysql57-client/files/patch-include_my__compare.h b/databases/mysql57-client/files/patch-include_my__compare.h
index cd176ca50b43..1a64142bb658 100644
--- a/databases/mysql57-client/files/patch-include_my__compare.h
+++ b/databases/mysql57-client/files/patch-include_my__compare.h
@@ -1,4 +1,4 @@
---- include/my_compare.h.orig	2015-11-29 19:16:24 UTC
+--- include/my_compare.h.orig	2016-03-28 18:06:12 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/mysql57-client/files/patch-include_myisam.h b/databases/mysql57-client/files/patch-include_myisam.h
index 7a9ab13220ea..0a4b795e9426 100644
--- a/databases/mysql57-client/files/patch-include_myisam.h
+++ b/databases/mysql57-client/files/patch-include_myisam.h
@@ -1,4 +1,4 @@
---- include/myisam.h.orig	2015-11-29 19:16:24 UTC
+--- include/myisam.h.orig	2016-03-28 18:06:12 UTC
 +++ include/myisam.h
 @@ -45,7 +45,7 @@ extern "C" {
    The following defines can be increased if necessary.
diff --git a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
index d4a6ee54a7e6..b90821a7f767 100644
--- a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
@@ -1,4 +1,4 @@
---- libmysql/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ libmysql/CMakeLists.txt
 @@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
      COMPONENT SharedLibraries)
diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
index cb52de18bebe..ca7dd233539d 100644
--- a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
+++ b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
@@ -1,4 +1,4 @@
---- mysys_ssl/my_default.cc.orig	2015-11-29 19:16:24 UTC
+--- mysys_ssl/my_default.cc.orig	2016-03-28 18:06:12 UTC
 +++ mysys_ssl/my_default.cc
 @@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
  
diff --git a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
index 7bbaae22bbcf..3e59f3170ddd 100644
--- a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
@@ -1,4 +1,4 @@
---- scripts/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ scripts/CMakeLists.txt
 @@ -43,6 +43,7 @@ ELSE()
    MESSAGE(FATAL_ERROR "Cannot concatenate files")
diff --git a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
index 9305f2ba7f93..282cffdbcbc5 100644
--- a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
+++ b/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
@@ -1,4 +1,4 @@
---- storage/myisam/mi_dynrec.c.orig	2015-12-14 07:39:39 UTC
+--- storage/myisam/mi_dynrec.c.orig	2016-03-28 18:06:12 UTC
 +++ storage/myisam/mi_dynrec.c
 @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
      DBUG_RETURN(1);
diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
index 29eb39c02628..218a1e701b67 100644
--- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
@@ -1,4 +1,4 @@
---- support-files/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ support-files/CMakeLists.txt
 @@ -44,14 +44,17 @@ ELSE()
    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
@@ -18,18 +18,19 @@
    FOREACH(script  mysqld_multi.server mysql-log-rotate)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                     ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -68,8 +71,10 @@ IF(UNIX)
+@@ -68,9 +71,11 @@ IF(UNIX)
    IF(INSTALL_SUPPORTFILESDIR)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()
 +ENDIF()
  
    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+IF(FALSE)
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
    
++IF(FALSE)
    SET(bindir ${prefix}/${INSTALL_BINDIR})
-@@ -84,3 +89,4 @@ IF(UNIX)
+   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
+   SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
+@@ -83,3 +88,4 @@ IF(UNIX)
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  ENDIF()
diff --git a/databases/mysql57-client/pkg-plist b/databases/mysql57-client/pkg-plist
index 5d249b4e089c..299830f01287 100644
--- a/databases/mysql57-client/pkg-plist
+++ b/databases/mysql57-client/pkg-plist
@@ -53,6 +53,8 @@ include/mysql/mysql/plugin_auth_common.h
 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_locking.h
 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
@@ -84,6 +87,7 @@ include/mysql/mysql/service_rules_table.h
 include/mysql/mysql/service_security_context.h
 include/mysql/mysql/service_srv_session.h
 include/mysql/mysql/service_srv_session_info.h
+include/mysql/mysql/service_ssl_wrapper.h
 include/mysql/mysql/service_thd_alloc.h
 include/mysql/mysql/service_thd_engine_lock.h
 include/mysql/mysql/service_thd_wait.h
@@ -103,6 +107,7 @@ include/mysql/plugin.h
 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