4858c5d946
databases/mysql80-client: Unbreak patching Broken after patch(1) changes in r326084 PR: 228788 Submitted by: curtis@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@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)
12 lines
517 B
C++
12 lines
517 B
C++
--- sql-common/client.cc.orig 2018-04-08 06:44:49 UTC
|
|
+++ sql-common/client.cc
|
|
@@ -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;
|