svn commit: r477159 - in branches/2018Q3/databases: mysql80-client mysql80-client/files mysql80-server mysql80-server/files
Mahdi Mokhtari
mmokhi at FreeBSD.org
Tue Aug 14 14:44:33 UTC 2018
Author: mmokhi
Date: Tue Aug 14 14:44:29 2018
New Revision: 477159
URL: https://svnweb.freebsd.org/changeset/ports/477159
Log:
MFH: r476016 r476944 r477036 r477063 r477105
databases/mysql80-client: Unbreak patching
Broken after patch(1) changes in r326084
PR: 228788
Submitted by: curtis at ipv6.occnc.com
Approved by: tcberner (mentor) mmokhi (maintainer)
Differential Revision: https://reviews.freebsd.org/D16532
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 at gmail.com>
Sponsored by: The FreeBSD Foundation
databases/mysql80-server: Fix build on default Clang of 10.4-base
Add sse4.2 flag to CXXFLAGS on 10.4 case.
The build-script needs it when using intrin lib on crc32
Sponsored by: The FreeBSD Foundation
databases/mysql80-server: Use c++14-lang instead of `msse-4.2 in CXXFLAG`
As suggested via replies to r477036 using `-msse-4.2` may break build on other
platforms.
Reported by: linimon danfe jbeich
Sponsored by: The FreeBSD Foundation
databases/mysql80-server: Delete no-longer-needed patch for sse4.2
Reported by: jbeich
Sponsored by: The FreeBSD Foundation
Approved by: ports-secteam (feld)
Added:
branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc
- copied unchanged from r476944, head/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc
Modified:
branches/2018Q3/databases/mysql80-client/Makefile
branches/2018Q3/databases/mysql80-client/files/patch-CMakeLists.txt
branches/2018Q3/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
branches/2018Q3/databases/mysql80-client/files/patch-sql-common_client.cc
branches/2018Q3/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
branches/2018Q3/databases/mysql80-server/Makefile
branches/2018Q3/databases/mysql80-server/distinfo
branches/2018Q3/databases/mysql80-server/files/patch-client_CMakeLists.txt
branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
branches/2018Q3/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
branches/2018Q3/databases/mysql80-server/files/patch-sql-common_client.cc
branches/2018Q3/databases/mysql80-server/pkg-plist
Directory Properties:
branches/2018Q3/ (props changed)
Modified: branches/2018Q3/databases/mysql80-client/Makefile
==============================================================================
--- branches/2018Q3/databases/mysql80-client/Makefile Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-client/Makefile Tue Aug 14 14:44:29 2018 (r477159)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= 80-client
COMMENT= Multithreaded SQL database (client)
Modified: branches/2018Q3/databases/mysql80-client/files/patch-CMakeLists.txt
==============================================================================
--- branches/2018Q3/databases/mysql80-client/files/patch-CMakeLists.txt Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-client/files/patch-CMakeLists.txt Tue Aug 14 14:44:29 2018 (r477159)
@@ -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)
Modified: branches/2018Q3/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
==============================================================================
--- branches/2018Q3/databases/mysql80-client/files/patch-scripts_CMakeLists.txt Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-client/files/patch-scripts_CMakeLists.txt Tue Aug 14 14:44:29 2018 (r477159)
@@ -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
Modified: branches/2018Q3/databases/mysql80-client/files/patch-sql-common_client.cc
==============================================================================
--- branches/2018Q3/databases/mysql80-client/files/patch-sql-common_client.cc Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-client/files/patch-sql-common_client.cc Tue Aug 14 14:44:29 2018 (r477159)
@@ -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;
Modified: branches/2018Q3/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
==============================================================================
--- branches/2018Q3/databases/mysql80-client/files/patch-utilities_CMakeLists.txt Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-client/files/patch-utilities_CMakeLists.txt Tue Aug 14 14:44:29 2018 (r477159)
@@ -12,7 +12,7 @@
ENDIF()
+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
Modified: branches/2018Q3/databases/mysql80-server/Makefile
==============================================================================
--- branches/2018Q3/databases/mysql80-server/Makefile Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-server/Makefile Tue Aug 14 14:44:29 2018 (r477159)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME?= mysql
-PORTVERSION= 8.0.11
-PORTREVISION?= 1
+PORTVERSION= 8.0.12
+PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-8.0
PKGNAMESUFFIX?= 80-server
@@ -17,8 +17,8 @@ LICENSE= GPLv2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
SLAVEDIRS= databases/mysql80-client
-USES= bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \
- cpe libedit localbase perl5 shebangfix ssl
+USES= bison:build cmake:outsource,noninja compiler:c++14-lang \
+ compiler:c++14-lib cpe libedit localbase perl5 shebangfix ssl
USE_PERL5= run
Modified: branches/2018Q3/databases/mysql80-server/distinfo
==============================================================================
--- branches/2018Q3/databases/mysql80-server/distinfo Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-server/distinfo Tue Aug 14 14:44:29 2018 (r477159)
@@ -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
Modified: branches/2018Q3/databases/mysql80-server/files/patch-client_CMakeLists.txt
==============================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-client_CMakeLists.txt Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-server/files/patch-client_CMakeLists.txt Tue Aug 14 14:44:29 2018 (r477159)
@@ -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)
Modified: branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
==============================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt Tue Aug 14 14:44:29 2018 (r477159)
@@ -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}
)
Copied: branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc (from r476944, head/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q3/databases/mysql80-server/files/patch-plugin_x_src_xpl__regex.cc Tue Aug 14 14:44:29 2018 (r477159, copy of r476944, head/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)};
+
Modified: branches/2018Q3/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
==============================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-scripts_CMakeLists.txt Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-server/files/patch-scripts_CMakeLists.txt Tue Aug 14 14:44:29 2018 (r477159)
@@ -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
Modified: branches/2018Q3/databases/mysql80-server/files/patch-sql-common_client.cc
==============================================================================
--- branches/2018Q3/databases/mysql80-server/files/patch-sql-common_client.cc Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-server/files/patch-sql-common_client.cc Tue Aug 14 14:44:29 2018 (r477159)
@@ -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;
Modified: branches/2018Q3/databases/mysql80-server/pkg-plist
==============================================================================
--- branches/2018Q3/databases/mysql80-server/pkg-plist Tue Aug 14 14:25:18 2018 (r477158)
+++ branches/2018Q3/databases/mysql80-server/pkg-plist Tue Aug 14 14:44:29 2018 (r477159)
@@ -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
More information about the svn-ports-all
mailing list