Sat Jul 14 17:41:26 2018 UTC ()
Pullup ticket #5787 - requested by taca
databases/mysql57-client: build fix for databases/mysql57-server

Revisions pulled up:
- databases/mysql57-client/distinfo                             1.21
- databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c 1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Jul  8 14:43:22 UTC 2018

   Modified Files:
   	pkgsrc/databases/mysql57-client: distinfo
   	pkgsrc/databases/mysql57-client/patches:
   	    patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c

   Log Message:
   databases/mysql57-client: fix build problem of mysql57-server

   Fix build problem of mysql57-server on prior to OpenSSL 1.1 systems.

   To generate a diff of this commit:
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/mysql57-client/distinfo
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c


(spz)
diff -r1.20 -r1.20.2.1 pkgsrc/databases/mysql57-client/distinfo
diff -r1.1 -r1.1.4.1 pkgsrc/databases/mysql57-client/patches/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c
cvs diff -r1.20 -r1.20.2.1 pkgsrc/databases/mysql57-client/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/distinfo 2018/06/14 13:13:35 1.20
+++ pkgsrc/databases/mysql57-client/distinfo 2018/07/14 17:41:26 1.20.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.20 2018/06/14 13:13:35 jperkin Exp $ 1$NetBSD: distinfo,v 1.20.2.1 2018/07/14 17:41:26 spz Exp $
2 2
3SHA1 (mysql-5.7.22.tar.gz) = 734b98efa9f9691b056b9d788c7d936bc52bbde3 3SHA1 (mysql-5.7.22.tar.gz) = 734b98efa9f9691b056b9d788c7d936bc52bbde3
4RMD160 (mysql-5.7.22.tar.gz) = a0e7bcb650543c8b54579399f641430e338c76e2 4RMD160 (mysql-5.7.22.tar.gz) = a0e7bcb650543c8b54579399f641430e338c76e2
5SHA512 (mysql-5.7.22.tar.gz) = 91df104493edac6a7b7e76ab1c8d465a6a5cba7552d2d0e2e0f58e3943a5ccdbcad9964f30c81d5d734d0dc988ef07f90215e91639014e51c8fba773855123d7 5SHA512 (mysql-5.7.22.tar.gz) = 91df104493edac6a7b7e76ab1c8d465a6a5cba7552d2d0e2e0f58e3943a5ccdbcad9964f30c81d5d734d0dc988ef07f90215e91639014e51c8fba773855123d7
6Size (mysql-5.7.22.tar.gz) = 51868499 bytes 6Size (mysql-5.7.22.tar.gz) = 51868499 bytes
7SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365 7SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
8SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f 8SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f
9SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb 9SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
10SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93 10SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
11SHA1 (patch-cmake_boost.cmake) = 5a6ad341e956178cc63195966529e0fceab31a6d 11SHA1 (patch-cmake_boost.cmake) = 5a6ad341e956178cc63195966529e0fceab31a6d
12SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320 12SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
13SHA1 (patch-cmake_plugin.cmake) = 92267182d4ec559a312a5a38826b9047c99b122f 13SHA1 (patch-cmake_plugin.cmake) = 92267182d4ec559a312a5a38826b9047c99b122f
14SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c 14SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
@@ -16,27 +16,27 @@ SHA1 (patch-include_CMakeLists.txt) = 94 @@ -16,27 +16,27 @@ SHA1 (patch-include_CMakeLists.txt) = 94
16SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5 16SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
17SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2 17SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
18SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127 18SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127
19SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb 19SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb
20SHA1 (patch-libmysql_CMakeLists.txt) = 306c73384226e07bf2a45af5d92b6f05d6044cbe 20SHA1 (patch-libmysql_CMakeLists.txt) = 306c73384226e07bf2a45af5d92b6f05d6044cbe
21SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d 21SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d
22SHA1 (patch-mysys__ssl_CMakeLists.txt) = 4750125b2e98d11c9efb653beda2d4d5166adc02 22SHA1 (patch-mysys__ssl_CMakeLists.txt) = 4750125b2e98d11c9efb653beda2d4d5166adc02
23SHA1 (patch-mysys__ssl_my__aes__openssl.cc) = 98881ab664bf674e6813ffc31f458a3e93c3fb3e 23SHA1 (patch-mysys__ssl_my__aes__openssl.cc) = 98881ab664bf674e6813ffc31f458a3e93c3fb3e
24SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b 24SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
25SHA1 (patch-mysys_my__symlink.c) = 23b57cd5922357d0bc72f5c15100a9fe1f89cfb2 25SHA1 (patch-mysys_my__symlink.c) = 23b57cd5922357d0bc72f5c15100a9fe1f89cfb2
26SHA1 (patch-mysys_stacktrace.c) = 3e0794f544f0e35f44a694330885478247657842 26SHA1 (patch-mysys_stacktrace.c) = 3e0794f544f0e35f44a694330885478247657842
27SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_sock__probe__ix.c) = 1a389fca13ada1be74d96276e11baee16bbc2363 27SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_sock__probe__ix.c) = 1a389fca13ada1be74d96276e11baee16bbc2363
28SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c) = 7077900830f904c74c79439b856d9d176fc27f15 28SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c) = 7077900830f904c74c79439b856d9d176fc27f15
29SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c) = 5860b1b5511acf3fd6a2ce9f3ba58cfa45a06297 29SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c) = da85cb9b6ca434ec4faa29b1bcb0b04ffd419319
30SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c) = d7f87bff5a41ff6a130fcf74dc520b38cedf5924 30SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c) = d7f87bff5a41ff6a130fcf74dc520b38cedf5924
31SHA1 (patch-rapid_plugin_group__replication_rpcgen.cmake) = 5c14be97bd1fd04b2b845f1a2422452445733474 31SHA1 (patch-rapid_plugin_group__replication_rpcgen.cmake) = 5c14be97bd1fd04b2b845f1a2422452445733474
32SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = aedf7d93889d4e7b4e04d182fe1a6775134f97e8 32SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = aedf7d93889d4e7b4e04d182fe1a6775134f97e8
33SHA1 (patch-rapid_unittest_gunit_xplugin_CMakeLists.txt) = c0ae4570e138869a3203f7d4704a0b6b5c19e517 33SHA1 (patch-rapid_unittest_gunit_xplugin_CMakeLists.txt) = c0ae4570e138869a3203f7d4704a0b6b5c19e517
34SHA1 (patch-scripts_CMakeLists.txt) = b149f40f65c4ce8f6f4a7adf75f5ec4be44319f1 34SHA1 (patch-scripts_CMakeLists.txt) = b149f40f65c4ce8f6f4a7adf75f5ec4be44319f1
35SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b 35SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
36SHA1 (patch-sql_CMakeLists.txt) = d66fe5fc8ac3a6230f1a3aa1395cf72e1a2b682e 36SHA1 (patch-sql_CMakeLists.txt) = d66fe5fc8ac3a6230f1a3aa1395cf72e1a2b682e
37SHA1 (patch-sql_conn__handler_socket__connection.cc) = 12cf83e061edbe59eb073037b1036903b7ba4b00 37SHA1 (patch-sql_conn__handler_socket__connection.cc) = 12cf83e061edbe59eb073037b1036903b7ba4b00
38SHA1 (patch-sql_item__geofunc__internal.cc) = 752862c3a30231e694e508ced1a215a610649fc6 38SHA1 (patch-sql_item__geofunc__internal.cc) = 752862c3a30231e694e508ced1a215a610649fc6
39SHA1 (patch-sql_log_event.h) = 311dc7fb04ea832df229dc2a28bcfbf263670ebf 39SHA1 (patch-sql_log_event.h) = 311dc7fb04ea832df229dc2a28bcfbf263670ebf
40SHA1 (patch-sql_mysqld.cc) = a1e2470d027ad39d6f2b177d39cb637a8c0dcd98 40SHA1 (patch-sql_mysqld.cc) = a1e2470d027ad39d6f2b177d39cb637a8c0dcd98
41SHA1 (patch-storage_archive_CMakeLists.txt) = 4cf5ed97a226a3844e184c46958b5202eefb9dd5 41SHA1 (patch-storage_archive_CMakeLists.txt) = 4cf5ed97a226a3844e184c46958b5202eefb9dd5
42SHA1 (patch-storage_blackhole_CMakeLists.txt) = 1d066d686172657ce9f812a505c7323a76111a63 42SHA1 (patch-storage_blackhole_CMakeLists.txt) = 1d066d686172657ce9f812a505c7323a76111a63
cvs diff -r1.1 -r1.1.4.1 pkgsrc/databases/mysql57-client/patches/Attic/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c (expand / switch to unified diff)

--- pkgsrc/databases/mysql57-client/patches/Attic/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c 2018/02/25 01:15:22 1.1
+++ pkgsrc/databases/mysql57-client/patches/Attic/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c 2018/07/14 17:41:26 1.1.4.1
@@ -1,47 +1,57 @@ @@ -1,47 +1,57 @@
1$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 $ 1$NetBSD: patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c,v 1.1.4.1 2018/07/14 17:41:26 spz Exp $
2 2
3support openssl 1.1  3support openssl 1.1
4from https://bugs.mysql.com/bug.php?id=83814 4from https://bugs.mysql.com/bug.php?id=83814
5 5
6--- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig 2017-12-28 03:46:26.000000000 +0000 6--- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig 2018-03-04 13:40:40.000000000 +0000
7+++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c 7+++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
8@@ -104,7 +104,7 @@ static const char* tls_cipher_blocked= " 8@@ -104,7 +104,7 @@ static const char* tls_cipher_blocked= "
9 mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ== 9 mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
10 -----END DH PARAMETERS----- 10 -----END DH PARAMETERS-----
11 */ 11 */
12-static unsigned char dh2048_p[]= 12-static unsigned char dh2048_p[]=
13+static unsigned char dhp_2048[]= 13+static unsigned char dhp_2048[]=
14 { 14 {
15 0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37, 15 0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
16 0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C, 16 0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
17@@ -131,20 +131,24 @@ static unsigned char dh2048_p[]= 17@@ -131,20 +131,37 @@ static unsigned char dh2048_p[]=
18 }; 18 };
19  19
20  20
21-static unsigned char dh2048_g[]={ 21-static unsigned char dh2048_g[]={
22+static unsigned char dhg_2048[]={ 22+static unsigned char dhg_2048[]={
23 0x05, 23 0x05,
24 }; 24 };
25  25
26 static DH *get_dh2048(void) 26 static DH *get_dh2048(void)
27 { 27 {
28- DH *dh; 28+#if OPENSSL_VERSION_NUMBER < 0x10100000L
29- if ((dh=DH_new())) 29 DH *dh;
 30 if ((dh=DH_new()))
 31+#else
30+ DH *dh = DH_new(); 32+ DH *dh = DH_new();
31+ BIGNUM *dhp_bn, *dhg_bn; 33+ BIGNUM *dhp_bn, *dhg_bn;
32+ if (dh != NULL) 34+ if (dh != NULL)
 35+#endif
33 { 36 {
34- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL); 37- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
35- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL); 38- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
36- if (! dh->p || ! dh->g) 39+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 40+ dh->p=BN_bin2bn(dhp_2048, sizeof(dhp_2048), NULL);
 41+ dh->g=BN_bin2bn(dhg_2048, sizeof(dhg_2048), NULL);
 42 if (! dh->p || ! dh->g)
 43+#else
37+ dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL); 44+ dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL);
38+ dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL); 45+ dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL);
39+ if (dhp_bn == NULL || dhg_bn == NULL 46+ if (dhp_bn == NULL || dhg_bn == NULL
40+ || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn))  47+ || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn))
 48+#endif
41 { 49 {
42 DH_free(dh); 50 DH_free(dh);
 51+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
43+ BN_free(dhp_bn); 52+ BN_free(dhp_bn);
44+ BN_free(dhg_bn); 53+ BN_free(dhg_bn);
 54+#endif
45 dh=0; 55 dh=0;
46 } 56 }
47 } 57 }