CVS commit: pkgsrc/databases/mysql56-client

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Feb  5 16:09:52 UTC 2018

Modified Files:
        pkgsrc/databases/mysql56-client: distinfo
Added Files:
        pkgsrc/databases/mysql56-client/patches:
            patch-sql-common_client__authentication.cc

Log Message:
mysql56-client: Backport comparison fix from upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/mysql56-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mysql56-client/patches/patch-sql-common_client__authentication.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql56-client/distinfo
diff -u pkgsrc/databases/mysql56-client/distinfo:1.45 pkgsrc/databases/mysql56-client/distinfo:1.46
--- pkgsrc/databases/mysql56-client/distinfo:1.45       Tue Jan 16 16:27:12 2018
+++ pkgsrc/databases/mysql56-client/distinfo    Mon Feb  5 16:09:52 2018
@@ -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) = 27ddd0
 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

Added files:

Index: pkgsrc/databases/mysql56-client/patches/patch-sql-common_client__authentication.cc
diff -u /dev/null pkgsrc/databases/mysql56-client/patches/patch-sql-common_client__authentication.cc:1.1
--- /dev/null   Mon Feb  5 16:09:52 2018
+++ pkgsrc/databases/mysql56-client/patches/patch-sql-common_client__authentication.cc  Mon Feb  5 16:09:52 2018
@@ -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");