diff options
author | taca <taca@pkgsrc.org> | 2018-07-08 14:43:22 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2018-07-08 14:43:22 +0000 |
commit | 469dca4040f03f1419060cf77847d07887d3aff3 (patch) | |
tree | 88bdf033334ca641b76259ef4fd74220e6d429c1 /databases | |
parent | c69ab2c6dafc67cec3878792f432dda2ff4f495b (diff) | |
download | pkgsrc-469dca4040f03f1419060cf77847d07887d3aff3.tar.gz |
databases/mysql57-client: fix build problem of mysql57-server
Fix build problem of mysql57-server on prior to OpenSSL 1.1 systems.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mysql57-client/distinfo | 4 | ||||
-rw-r--r-- | databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo index 9a61858438d..84bc7250823 100644 --- a/databases/mysql57-client/distinfo +++ b/databases/mysql57-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2018/06/14 13:13:35 jperkin Exp $ +$NetBSD: distinfo,v 1.21 2018/07/08 14:43:22 taca Exp $ SHA1 (mysql-5.7.22.tar.gz) = 734b98efa9f9691b056b9d788c7d936bc52bbde3 RMD160 (mysql-5.7.22.tar.gz) = a0e7bcb650543c8b54579399f641430e338c76e2 @@ -26,7 +26,7 @@ SHA1 (patch-mysys_my__symlink.c) = 23b57cd5922357d0bc72f5c15100a9fe1f89cfb2 SHA1 (patch-mysys_stacktrace.c) = 3e0794f544f0e35f44a694330885478247657842 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_sock__probe__ix.c) = 1a389fca13ada1be74d96276e11baee16bbc2363 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c) = 7077900830f904c74c79439b856d9d176fc27f15 -SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c) = 5860b1b5511acf3fd6a2ce9f3ba58cfa45a06297 +SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c) = da85cb9b6ca434ec4faa29b1bcb0b04ffd419319 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c) = d7f87bff5a41ff6a130fcf74dc520b38cedf5924 SHA1 (patch-rapid_plugin_group__replication_rpcgen.cmake) = 5c14be97bd1fd04b2b845f1a2422452445733474 SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = aedf7d93889d4e7b4e04d182fe1a6775134f97e8 diff --git a/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c b/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c index 134295563e8..a7c44051820 100644 --- a/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c +++ b/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c @@ -1,9 +1,9 @@ -$NetBSD: patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c,v 1.1 2018/02/25 01:15:22 markd Exp $ +$NetBSD: patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c,v 1.2 2018/07/08 14:43:22 taca Exp $ support openssl 1.1 from https://bugs.mysql.com/bug.php?id=83814 ---- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig 2017-12-28 03:46:26.000000000 +0000 +--- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig 2018-03-04 13:40:40.000000000 +0000 +++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c @@ -104,7 +104,7 @@ static const char* tls_cipher_blocked= " mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ== @@ -14,7 +14,7 @@ from https://bugs.mysql.com/bug.php?id=83814 { 0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37, 0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C, -@@ -131,20 +131,24 @@ static unsigned char dh2048_p[]= +@@ -131,20 +131,37 @@ static unsigned char dh2048_p[]= }; @@ -25,23 +25,33 @@ from https://bugs.mysql.com/bug.php?id=83814 static DH *get_dh2048(void) { -- DH *dh; -- if ((dh=DH_new())) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + DH *dh; + if ((dh=DH_new())) ++#else + DH *dh = DH_new(); + BIGNUM *dhp_bn, *dhg_bn; + if (dh != NULL) ++#endif { - dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); - dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); -- if (! dh->p || ! dh->g) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ dh->p=BN_bin2bn(dhp_2048, sizeof(dhp_2048), NULL); ++ dh->g=BN_bin2bn(dhg_2048, sizeof(dhg_2048), NULL); + if (! dh->p || ! dh->g) ++#else + dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL); + dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL); + if (dhp_bn == NULL || dhg_bn == NULL + || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) ++#endif { DH_free(dh); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L + BN_free(dhp_bn); + BN_free(dhg_bn); ++#endif dh=0; } } |