summaryrefslogtreecommitdiff
path: root/databases/mysql80-client/files/patch-vio_viosslfactories.cc
diff options
context:
space:
mode:
authorJochen Neumeister <joneum@FreeBSD.org>2020-01-08 16:47:12 +0000
committerJochen Neumeister <joneum@FreeBSD.org>2020-01-08 16:47:12 +0000
commit342c784ae3cb74eeb87d281182060a1a31a1481c (patch)
tree507562d12bec10bc99bb7bd7de1c273e3934a2da /databases/mysql80-client/files/patch-vio_viosslfactories.cc
parent- update from 1.1.7 to 1.1.8 (diff)
databases/mysql80-{client, server}: Update to latest release 8.0.18
switch patch-files to mysql80-server to make it easy for maintain. Bugfix: - CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher. - The DISABLE_SHARED CMake option was unused and has been removed. - The CMake code to find Protobuf executables now works on platforms that split these into multiple packages. - The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used. - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed. - The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382. - MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL. - The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html A big thanks to @fluffy for his help with this update MFH: 2020Q1 Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH
Notes
Notes: svn path=/head/; revision=522436
Diffstat (limited to 'databases/mysql80-client/files/patch-vio_viosslfactories.cc')
-rw-r--r--databases/mysql80-client/files/patch-vio_viosslfactories.cc47
1 files changed, 0 insertions, 47 deletions
diff --git a/databases/mysql80-client/files/patch-vio_viosslfactories.cc b/databases/mysql80-client/files/patch-vio_viosslfactories.cc
deleted file mode 100644
index f0f74c3812e4..000000000000
--- a/databases/mysql80-client/files/patch-vio_viosslfactories.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- vio/viosslfactories.cc.orig 2018-04-08 06:44:49 UTC
-+++ vio/viosslfactories.cc
-@@ -37,6 +37,7 @@
-
- #ifdef HAVE_OPENSSL
- #include <openssl/dh.h>
-+#include <openssl/crypto.h>
-
- #define TLS_VERSION_OPTION_SIZE 256
- #define SSL_CIPHER_LIST_SIZE 4096
-@@ -135,7 +136,7 @@ static DH *get_dh2048(void) {
- BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
- BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
- if (!p || !g
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- || !DH_set0_pqg(dh, p, NULL, g)
- #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
- ) {
-@@ -426,7 +427,7 @@ void ssl_start() {
- }
- }
-
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- /**
- Set fips mode in openssl library,
- When we set fips mode ON/STRICT, it will perform following operations:
-@@ -449,6 +450,10 @@ int set_fips_mode(const uint fips_mode,
- int rc = -1;
- unsigned int fips_mode_old = -1;
- unsigned long err_library = 0;
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+ err_string="LibreSSL deosn't have FIPS_mode functionas";
-+ goto EXIT;
-+#else
- if (fips_mode > 2) {
- goto EXIT;
- }
-@@ -462,6 +467,7 @@ int set_fips_mode(const uint fips_mode,
- ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
- err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
- }
-+#endif
- EXIT:
- return rc;
- }