diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-02-05 16:09:52 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-02-05 16:09:52 +0000 |
| commit | 0b5842d0e39360a02230319b8a73bc3cee0f007b (patch) | |
| tree | 0641a6cb47011e9d1f9dac0a8370a0119dfb6e98 /databases | |
| parent | 506ca49473de43dec66b3625cc7510296f680e63 (diff) | |
| download | pkgsrc-0b5842d0e39360a02230319b8a73bc3cee0f007b.tar.gz | |
mysql56-client: Backport comparison fix from upstream.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql56-client/distinfo | 3 | ||||
| -rw-r--r-- | databases/mysql56-client/patches/patch-sql-common_client__authentication.cc | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo index 01593509867..96a9c2e795d 100644 --- a/databases/mysql56-client/distinfo +++ b/databases/mysql56-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2018/01/16 16:27:12 adam Exp $ +$NetBSD: distinfo,v 1.46 2018/02/05 16:09:52 jperkin Exp $ SHA1 (mysql-5.6.39.tar.gz) = 8f69162cfcfb031e0e60f85e46182548a4e34b41 RMD160 (mysql-5.6.39.tar.gz) = 5b1eb6a5cd696112ec925b5d26dcf67dce7adc08 @@ -30,6 +30,7 @@ SHA1 (patch-mysys_stacktrace.c) = 27ddd012c9ca299cfe2b9935b9f99fe603415e7e SHA1 (patch-scripts_CMakeLists.txt) = 5b44d2d137e3e64474d663a8faab5b5f289f4cf5 SHA1 (patch-scripts_mysql__install__db.pl.in) = c2ed1705a530a0f2dfb8325496ceb7e2a9c98185 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b +SHA1 (patch-sql-common_client__authentication.cc) = fb14e5bcb64c4d2d0b8cbbe97ff5b24b725e509e SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5 SHA1 (patch-sql_log_event.h) = a413038ffa29103c75e1d243864615ccb3d9621e SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf diff --git a/databases/mysql56-client/patches/patch-sql-common_client__authentication.cc b/databases/mysql56-client/patches/patch-sql-common_client__authentication.cc new file mode 100644 index 00000000000..7d76fd4d24f --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql-common_client__authentication.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-sql-common_client__authentication.cc,v 1.1 2018/02/05 16:09:52 jperkin Exp $ + +Backport upstream fix. + +--- sql-common/client_authentication.cc.orig 2017-12-09 07:33:37.000000000 +0000 ++++ sql-common/client_authentication.cc +@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql) + + if (mysql->options.extension != NULL && + mysql->options.extension->server_public_key_path != NULL && +- mysql->options.extension->server_public_key_path != '\0') ++ mysql->options.extension->server_public_key_path[0] != '\0') + { + pub_key_file= fopen(mysql->options.extension->server_public_key_path, + "r"); |