[pkgsrc/trunk]: pkgsrc/databases/mysql55-client Change patch to use upstream ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6cdadb6b8cdb
branches:  trunk
changeset: 363952:6cdadb6b8cdb
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Jun 19 12:07:50 2017 +0000

description:
Change patch to use upstream 5.6+ change, fixes segfault reported by mark.

Bump PKGREVISION.

diffstat:

 databases/mysql55-client/Makefile                      |  3 ++-
 databases/mysql55-client/distinfo                      |  4 ++--
 databases/mysql55-client/patches/patch-client_mysql.cc |  6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 9798ca26c18a -r 6cdadb6b8cdb databases/mysql55-client/Makefile
--- a/databases/mysql55-client/Makefile Mon Jun 19 11:11:34 2017 +0000
+++ b/databases/mysql55-client/Makefile Mon Jun 19 12:07:50 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2016/08/04 10:09:46 adam Exp $
+# $NetBSD: Makefile,v 1.28 2017/06/19 12:07:50 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
+PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]*
diff -r 9798ca26c18a -r 6cdadb6b8cdb databases/mysql55-client/distinfo
--- a/databases/mysql55-client/distinfo Mon Jun 19 11:11:34 2017 +0000
+++ b/databases/mysql55-client/distinfo Mon Jun 19 12:07:50 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2017/05/24 15:28:25 jperkin Exp $
+$NetBSD: distinfo,v 1.58 2017/06/19 12:07:50 jperkin Exp $
 
 SHA1 (mysql-5.5.56.tar.gz) = e8005b7612aa65bd11fc1e2f8bc11dad3f46ac39
 RMD160 (mysql-5.5.56.tar.gz) = 9ef621da171dcbe020dbb3f685b39ce89f47c4bb
@@ -11,7 +11,7 @@
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
-SHA1 (patch-client_mysql.cc) = 36ebfa1f3e5356bb7472be5c0be87198d138729f
+SHA1 (patch-client_mysql.cc) = 69e40248d654e385abee9272df093afc525971bc
 SHA1 (patch-client_mysqladmin.cc) = c640d3ca742dc1b200701d21d82d8f2093917cf2
 SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206
 SHA1 (patch-client_mysqlshow.c) = a12b06241eee91d1ec11e3b7e4f3125aa6c79905
diff -r 9798ca26c18a -r 6cdadb6b8cdb databases/mysql55-client/patches/patch-client_mysql.cc
--- a/databases/mysql55-client/patches/patch-client_mysql.cc    Mon Jun 19 11:11:34 2017 +0000
+++ b/databases/mysql55-client/patches/patch-client_mysql.cc    Mon Jun 19 12:07:50 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-client_mysql.cc,v 1.1 2017/05/24 15:28:25 jperkin Exp $
+$NetBSD: patch-client_mysql.cc,v 1.2 2017/06/19 12:07:50 jperkin Exp $
 
-Pointer fix.
+Compilation warning fix from upstream.
 
 --- client/mysql.cc.orig       2017-04-27 07:12:30.000000000 +0000
 +++ client/mysql.cc
@@ -9,7 +9,7 @@
          break;
        }
 -      field_names[i][num_fields*2]= '\0';
-+      *field_names[i][num_fields*2]= '\0';
++      field_names[i][num_fields*2]= NULL;
        j=0;
        while ((sql_field=mysql_fetch_field(fields)))
        {