Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Sep 2018 15:26:04 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r479432 - head/databases/mysql-connector-c/files
Message-ID:  <201809101526.w8AFQ4fQ041651@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Mon Sep 10 15:26:04 2018
New Revision: 479432
URL: https://svnweb.freebsd.org/changeset/ports/479432

Log:
  databases/mysql-connector-c: Fix build with Clang 6
  
  sql-common/client_authentication.cc:86:56: error: comparison between pointer and integer ('char *' and 'int')
        mysql->options.extension->server_public_key_path != '\0')
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~
  
  http://beefy12.nyi.freebsd.org/data/head-amd64-default/p479076_s338486/logs/errors/mysql-connector-c-6.1.11.log
  
  PR:		230959
  Approved by:	bofh (maintainer timeout, 2 weeks)

Added:
  head/databases/mysql-connector-c/files/patch-sql-common_client__authentication.cc   (contents, props changed)

Added: head/databases/mysql-connector-c/files/patch-sql-common_client__authentication.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql-connector-c/files/patch-sql-common_client__authentication.cc	Mon Sep 10 15:26:04 2018	(r479432)
@@ -0,0 +1,15 @@
+sql-common/client_authentication.cc:86:56: error: comparison between pointer and integer ('char *' and 'int')
+      mysql->options.extension->server_public_key_path != '\0')
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~
+
+--- sql-common/client_authentication.cc.orig	2018-08-27 19:39:51 UTC
++++ sql-common/client_authentication.cc
+@@ -83,7 +83,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')
+   {
+     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
+                         "r");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809101526.w8AFQ4fQ041651>