diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2020-09-17 21:32:20 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2020-09-17 21:32:20 +0000 |
| commit | 60dda5b7c07e548c4d380e1df1f90efef07439af (patch) | |
| tree | 73956c39730c01f4a2f4f99b9b7ffb2f4f2237cb /databases/percona56-client/files | |
| parent | Update 3.12 (diff) | |
Update to 5.6.49.89.0 and fix build on head.
Diffstat (limited to 'databases/percona56-client/files')
| -rw-r--r-- | databases/percona56-client/files/patch-extra_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | databases/percona56-client/files/patch-vio_viosslfactories.c | 23 |
2 files changed, 24 insertions, 16 deletions
diff --git a/databases/percona56-client/files/patch-extra_CMakeLists.txt b/databases/percona56-client/files/patch-extra_CMakeLists.txt index ecb8c412cb02..5235c53fe569 100644 --- a/databases/percona56-client/files/patch-extra_CMakeLists.txt +++ b/databases/percona56-client/files/patch-extra_CMakeLists.txt @@ -1,17 +1,16 @@ ---- extra/CMakeLists.txt.orig 2016-03-03 15:27:37.000000000 +0200 -+++ extra/CMakeLists.txt 2016-03-10 21:04:51.367091216 +0200 -@@ -59,7 +59,7 @@ - ADD_DEPENDENCIES(GenError copy_openssl_extra) - ENDIF() +--- extra/CMakeLists.txt.orig 2020-07-21 12:31:43.000000000 +0200 ++++ extra/CMakeLists.txt 2020-09-17 22:40:42.442794000 +0200 +@@ -58,6 +58,7 @@ + ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys + ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt) -- +IF(FALSE) MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) + TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -98,10 +98,13 @@ - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) +@@ -97,10 +98,13 @@ TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) + ADD_DEPENDENCIES(innochecksum GenError) ENDIF() +ENDIF() diff --git a/databases/percona56-client/files/patch-vio_viosslfactories.c b/databases/percona56-client/files/patch-vio_viosslfactories.c index 267a2fd82d03..42a28cd67cdd 100644 --- a/databases/percona56-client/files/patch-vio_viosslfactories.c +++ b/databases/percona56-client/files/patch-vio_viosslfactories.c @@ -1,11 +1,20 @@ ---- vio/viosslfactories.c.orig 2018-01-17 11:42:33.764076000 +0000 -+++ vio/viosslfactories.c 2018-01-17 11:43:21.072238000 +0000 -@@ -125,7 +125,7 @@ - { - BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); - BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); +--- vio/viosslfactories.c.orig 2020-07-21 12:31:43.000000000 +0200 ++++ vio/viosslfactories.c 2020-09-17 22:38:47.837385000 +0200 +@@ -128,7 +128,7 @@ + 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 */ + ) { +@@ -136,7 +136,7 @@ + DH_free(dh); + return NULL; + } -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER ) dh->p= p; dh->g= g; - if (! dh->p || ! dh->g) + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ |