Update to upstream version 5.7.15; fixes zero-day remote vuln CVE-2016-6662

PR:		212690
Submitted by:	mokhi64@gmail.com (maintainer)
MFH:		2016Q3
Security:	CVE 2016-6662

6 files changed, 36 insertions, 27 deletions

diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index c83923409922..15f0c354d4ba 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.7.13
-PORTREVISION?=	1
+PORTVERSION=	5.7.15
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server
@@ -55,7 +55,8 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DWITH_EDITLINE=system \
 		-DWITH_LIBEVENT=system \
 		-DWITH_LZ4=system \
-		-DWITH_ZLIB=system
+		-DWITH_ZLIB=system \
+		-DINSTALL_MYSQLTESTDIR=0
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
@@ -128,15 +129,19 @@ PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
 PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ### Just for the sake of FreeBSD 9.X ###
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
 .  if !defined(CLIENT_ONLY)
 EXTRA_PATCHES+=		${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
 .  endif
+### Just like deperecated `WITH_OPENSSL_PORT=yes` a workaround for building on 9.X ###
+DEFAULT_VERSIONS+=ssl=openssl
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${SSL_DEFAULT} == base
 BROKEN_FreeBSD_9=	FreeBSD 9.x requires SSL from ports
 CMAKE_ARGS+=		-DWITH_SSL=system
diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo
index 9ee61e895cb9..b3fcf738dec9 100644
--- a/databases/mysql57-server/distinfo
+++ b/databases/mysql57-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465065317
-SHA256 (mysql-boost-5.7.13.tar.gz) = 2a768682c37dfbca286912bd137f1a526075ac1f00a6a46da8b6fe63f6fcfa37
-SIZE (mysql-boost-5.7.13.tar.gz) = 60561931
+TIMESTAMP = 1473858917
+SHA256 (mysql-boost-5.7.15.tar.gz) = 7342a3a3e40878378dfaee252d42a3a5b06c58237f49c2544424d27316738945
+SIZE (mysql-boost-5.7.15.tar.gz) = 60583907
diff --git a/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
index 0b4ee9e2360e..ea05679341fa 100644
--- a/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
+++ b/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig	2016-03-28 18:06:12 UTC
+--- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
 +++ mysys_ssl/my_default.cc
-@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
+@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
  
  /* Which directories are searched for options (and in which order) */
  
@@ -9,7 +9,7 @@
  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
  static const char **default_directories = NULL;
  
-@@ -909,6 +909,14 @@
+@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
        return 1;                                 /* Ignore wrong files */
    }
  
@@ -21,10 +21,10 @@
 +      goto err;
 +  }
 +
-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp))
+   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
    {
      line++;
-@@ -1245,7 +1253,8 @@
+@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
              end[(strlen(end)-1)] = ' ';
            else
              strxmov(end, conf_file, *ext , " ",  NullS);
@@ -34,7 +34,7 @@
          }
        }
      }
-@@ -1404,13 +1413,8 @@
+@@ -1411,13 +1420,8 @@ static const char **init_default_directo
  
  #else
  
@@ -50,7 +50,7 @@
  
  #endif
  
-@@ -1480,7 +1484,7 @@
+@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
    MY_STAT stat_info;
  
    if (!my_stat(file_name,&stat_info,MYF(0)))
diff --git a/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake b/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
new file mode 100644
index 000000000000..52828f00f631
--- /dev/null
+++ b/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
@@ -0,0 +1,15 @@
+--- rapid/plugin/x/mysqlx_configure.cmake.orig	2016-09-14 15:25:26 UTC
++++ rapid/plugin/x/mysqlx_configure.cmake
+@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
+ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
+                ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
+ 
++IF(FALSE)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
+         DESTINATION ${INSTALL_INCLUDEDIR}
+         COMPONENT Developement)
+@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
+         DESTINATION ${INSTALL_INCLUDEDIR}
+         COMPONENT Developement)
++ENDIF()
diff --git a/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake b/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake
deleted file mode 100644
index 3239e33e82cb..000000000000
--- a/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- rapid/plugin/x/mysqlx_error.cmake.orig	2016-04-14 21:38:55 UTC
-+++ rapid/plugin/x/mysqlx_error.cmake
-@@ -26,6 +26,8 @@ GENERATE_XERRORS(${MYSQLX_PROJECT_DIR}/s
- CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_error.h.in 
-                ${CMAKE_CURRENT_BINARY_DIR}/mysqlx_error.h)
- 
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqlx_error.h
-         DESTINATION ${INSTALL_INCLUDEDIR}
-         COMPONENT Developement)
-+ENDIF()
diff --git a/databases/mysql57-server/files/patch-sql_CMakeLists.txt b/databases/mysql57-server/files/patch-sql_CMakeLists.txt
index 6f0f1f4bdab9..033958f32efb 100644
--- a/databases/mysql57-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mysql57-server/files/patch-sql_CMakeLists.txt
@@ -1,4 +1,4 @@
---- sql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- sql/CMakeLists.txt.orig	2016-08-25 11:52:06 UTC
 +++ sql/CMakeLists.txt
 @@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
    ${ZLIB_INCLUDE_DIR}
@@ -6,6 +6,6 @@
    ${CMAKE_BINARY_DIR}/sql
 +  ${CMAKE_BINARY_DIR}/include
 +  ${CMAKE_BINARY_DIR}
+   ${LZ4_INCLUDE_DIR}
  )
  
- SET(CONF_SOURCES