databases/mysql80-{client, server}: Update ports to 8.0.12

This update includes Oracle Critical Patch Advisory published on July 2018
More info:
http://www.oracle.com/technetwork/security-advisory/cpujul2018-4258247.html#AppendixMSQL
Also:
Delete upstreamed hunks of patches.
Change local patches regarding upstream changes.

PR:		229861
Reported by:	Markus Kohlmeyer <rootservice@gmail.com>
Sponsored by:	The FreeBSD Foundation

12 files changed, 30 insertions, 57 deletions

diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 2d48a0d44d40..f666f66bf6f8 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql80-client/files/patch-CMakeLists.txt b/databases/mysql80-client/files/patch-CMakeLists.txt
index 7481d9053a23..5e7e62c5f8df 100644
--- a/databases/mysql80-client/files/patch-CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
 --- CMakeLists.txt.orig	2018-05-03 10:27:45 UTC
 +++ CMakeLists.txt
-@@ -835,14 +835,12 @@ ADD_SUBDIRECTORY(extra/regex)
+@@ -835,6 +835,7 @@ ADD_SUBDIRECTORY(extra/regex)
  ADD_SUBDIRECTORY(libmysql)
  ADD_SUBDIRECTORY(libbinlogevents)
  ADD_SUBDIRECTORY(libbinlogstandalone)
@@ -8,14 +8,6 @@
  
  IF(NOT WITHOUT_SERVER)
    SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
-   # Add storage engines and plugins.
-   CONFIGURE_PLUGINS()
--ELSE()
--  # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
--  ADD_SUBDIRECTORY(storage/ndb)
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
 @@ -966,12 +964,10 @@ ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
  ADD_SUBDIRECTORY(packaging/solaris)
diff --git a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
index 3e59f3170ddd..8deeef6509d1 100644
--- a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
@@ -35,11 +35,11 @@
 @@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
+           SET(${var} "${${var}}-l${lib} " )
 +        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
++          SET(${var} "${${var}}-pthread " )
          ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
+           SET(${var} "${${var}}-l${lib} " )
          ENDIF()
 @@ -430,19 +436,7 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
diff --git a/databases/mysql80-client/files/patch-sql-common_client.cc b/databases/mysql80-client/files/patch-sql-common_client.cc
index 4067fc8f097f..9758da5c5dcd 100644
--- a/databases/mysql80-client/files/patch-sql-common_client.cc
+++ b/databases/mysql80-client/files/patch-sql-common_client.cc
@@ -1,21 +1,5 @@
 --- sql-common/client.cc.orig	2018-04-08 06:44:49 UTC
 +++ sql-common/client.cc
-@@ -2649,11 +2649,11 @@ static int ssl_verify_server_cert(Vio *v
-     goto error;
-   }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--  cn = (char *)ASN1_STRING_data(cn_asn1);
--#else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   cn = (char *)ASN1_STRING_get0_data(cn_asn1);
--#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#else  /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-+  cn = (char *)ASN1_STRING_data(cn_asn1);
-+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
- 
-   // There should not be any NULL embedded in the CN
-   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) {
 @@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, 
  #endif
        break;
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index d246136724ae..da38dbf7112b 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=		mysql
-PORTVERSION=		8.0.11
-PORTREVISION?=		2
+PORTVERSION=		8.0.12
+PORTREVISION?=		0
 CATEGORIES=		databases ipv6
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo
index 7d854439ceab..4d9301da569c 100644
--- a/databases/mysql80-server/distinfo
+++ b/databases/mysql80-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524414416
-SHA256 (mysql-boost-8.0.11.tar.gz) = f40711a9bd91ab2ccea331484a6d281f806b0fdecf78f4c9e9d8a4c91208f309
-SIZE (mysql-boost-8.0.11.tar.gz) = 77647598
+TIMESTAMP = 1534018331
+SHA256 (mysql-boost-8.0.12.tar.gz) = 99abae6660b53a462cff7c9fefb56d17f52823e9a964831aee1ae5633d9a2982
+SIZE (mysql-boost-8.0.12.tar.gz) = 83152486
diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt
index ad2f0efbae51..a732789b3d38 100644
--- a/databases/mysql80-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt
@@ -10,9 +10,9 @@
  ## We will need libeay32.dll and ssleay32.dll when running client executables.
  COPY_OPENSSL_DLLS(copy_openssl_client)
 @@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+ 
  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
- ADD_DEFINITIONS(${SSL_DEFINES})
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc)
  TARGET_LINK_LIBRARIES(mysql mysqlclient)
diff --git a/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt b/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
index 686023c4568b..ef1ad0500b6f 100644
--- a/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
@@ -1,15 +1,16 @@
 --- plugin/x/CMakeLists.txt.orig	2018-04-08 06:44:49 UTC
 +++ plugin/x/CMakeLists.txt
-@@ -82,11 +82,14 @@ INCLUDE_DIRECTORIES(
+@@ -82,12 +82,15 @@ INCLUDE_DIRECTORIES(
+   ${MYSQLX_GENERATE_DIR}
    ${MYSQLX_PROTOCOL_INCLUDE_DIR}
-   ${MYSQLX_PROJECT_DIR}/client/
-   ${CMAKE_SOURCE_DIR}/extra/regex
+   ${MYSQLX_CLIENT_INCLUDE_DIR}
 +  ${BOOST_INCLUDE_DIR}
  )
  
  INCLUDE_DIRECTORIES(SYSTEM
    ${PROTOBUF_INCLUDE_DIRS}
    ${LIBEVENT_INCLUDE_DIR}
+   ${ICU_INCLUDE_DIRS}
 +  ${SSL_INCLUDE_DIRS}
 +  ${ZLIB_INCLUDE_DIR}
  )
diff --git a/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc b/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc
new file mode 100644
index 000000000000..151de1e46b72
--- /dev/null
+++ b/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc
@@ -0,0 +1,11 @@
+--- plugin/x/src/xpl_regex.cc.orig	2018-08-11 18:13:47 UTC
++++ plugin/x/src/xpl_regex.cc
+@@ -53,7 +53,7 @@ bool xpl::Regex::match(const char *value
+    * and parse the text patter each time that xpl::Regex::match
+    * is called.
+    */
+-  UnicodeString value_as_utf8{icu::UnicodeString::fromUTF8(value)};
++  icu::UnicodeString value_as_utf8{icu::UnicodeString::fromUTF8(value)};
+   std::unique_ptr<icu::RegexMatcher> regexp{
+       m_pattern->matcher(value_as_utf8, match_status)};
+ 
diff --git a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
index b8481a0aed4e..1903d7724828 100644
--- a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
@@ -3,11 +3,11 @@
 @@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
+           SET(${var} "${${var}}-l${lib} " )
 +        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
++          SET(${var} "${${var}}-pthread " )
          ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
+           SET(${var} "${${var}}-l${lib} " )
          ENDIF()
 @@ -430,14 +432,13 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
diff --git a/databases/mysql80-server/files/patch-sql-common_client.cc b/databases/mysql80-server/files/patch-sql-common_client.cc
index 4067fc8f097f..9758da5c5dcd 100644
--- a/databases/mysql80-server/files/patch-sql-common_client.cc
+++ b/databases/mysql80-server/files/patch-sql-common_client.cc
@@ -1,21 +1,5 @@
 --- sql-common/client.cc.orig	2018-04-08 06:44:49 UTC
 +++ sql-common/client.cc
-@@ -2649,11 +2649,11 @@ static int ssl_verify_server_cert(Vio *v
-     goto error;
-   }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--  cn = (char *)ASN1_STRING_data(cn_asn1);
--#else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   cn = (char *)ASN1_STRING_get0_data(cn_asn1);
--#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#else  /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-+  cn = (char *)ASN1_STRING_data(cn_asn1);
-+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
- 
-   // There should not be any NULL embedded in the CN
-   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn)) {
 @@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, 
  #endif
        break;
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index 47be1527096b..1ac9a7725129 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -174,6 +174,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysql_sys_schema.sql
 %%DATADIR%%/mysql_system_tables.sql
 %%DATADIR%%/mysql_system_tables_data.sql
+%%DATADIR%%/mysql_system_users.sql
 %%DATADIR%%/mysql_test_data_timezone.sql
 %%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/norwegian-ny/errmsg.sys