diff options
author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-05-12 15:35:25 +0000 |
---|---|---|
committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-05-12 15:35:25 +0000 |
commit | acca27b6ca8327e93f12cb06800447a44129d72a (patch) | |
tree | 82f92efa85f110d6c1ceb5c7f78a94138fbaaf69 /databases/mysql80-server/files/patch-sql-common_client.cc | |
parent | sysutils/fusefs-libs: sort USES (diff) |
databases/mysql80-{client,server}: Upgrade the ports to GA version 8.0.11
Fix build with LibreSSL and OpenSSL-devel ports as well
MySQL 8.0.11 is the General Availability (GA) version of MySQL 8.
MySQL since this version supports FIPS-mode, if compiled using OpenSSL, AND
an OpenSSL library and FIPS Object Module are available at runtime.
FIPS mode imposes conditions on cryptographic operations such as
restrictions on acceptable encryption algorithms or requirements for longer key lengths.
The --ssl-fips-mode client option enables control of FIPS mode on the client side for:
mysql, mysqladmin, mysqlbinlog, mysqlcheck, mysqldump, mysqlimport, mysqlpump, ...
This update includes bugfixes including (not limited to):
-InnoDB: The server was stopped before a fatal error message
was written to the error log.
-InnoDB: An incorrect GROUP BY result was returned when using the
TempTable storage engine and a NO PAD collation.
-InnoDB: The data retrieved from INFORMATION_SCHEMA.INNODB_COLUMNS was
incorrect for tables containing a virtual column.
Full Release-Notes are available at:
https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-11.html
Notes
Notes:
svn path=/head/; revision=469734
Diffstat (limited to 'databases/mysql80-server/files/patch-sql-common_client.cc')
-rw-r--r-- | databases/mysql80-server/files/patch-sql-common_client.cc | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/databases/mysql80-server/files/patch-sql-common_client.cc b/databases/mysql80-server/files/patch-sql-common_client.cc new file mode 100644 index 000000000000..4067fc8f097f --- /dev/null +++ b/databases/mysql80-server/files/patch-sql-common_client.cc @@ -0,0 +1,27 @@ +--- 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; + case MYSQL_OPT_SSL_FIPS_MODE: { +-#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) ++#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) + char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; + ENSURE_EXTENSIONS_PRESENT(&mysql->options); + mysql->options.extension->ssl_fips_mode = *(uint *)arg; |