From owner-svn-ports-head@freebsd.org Fri Jan 5 10:54:42 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84BAEEC3B83; Fri, 5 Jan 2018 10:54:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C4182F7E; Fri, 5 Jan 2018 10:54:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w05AsfS0026574; Fri, 5 Jan 2018 10:54:41 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w05AsfqX026571; Fri, 5 Jan 2018 10:54:41 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801051054.w05AsfqX026571@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 5 Jan 2018 10:54:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458124 - in head/databases: mysql56-client/files mysql56-server mysql56-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/databases: mysql56-client/files mysql56-server mysql56-server/files X-SVN-Commit-Revision: 458124 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jan 2018 10:54:42 -0000 Author: jbeich Date: Fri Jan 5 10:54:41 2018 New Revision: 458124 URL: https://svnweb.freebsd.org/changeset/ports/458124 Log: databases/mysql56-server: unbreak build with Clang 6 (C++14 by default) sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int') mysql->options.extension->server_public_key_path != '\0') ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~ sql/sql_trigger.cc:195:5: error: non-constant-expression cannot be narrowed from type 'int' to 'size_t' (aka 'unsigned long') in initializer list [-Wc++11-narrowing] static_cast(my_offsetof(class Table_triggers_list, definitions_list)), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported by: antoine (via bug 224669) Added: head/databases/mysql56-client/files/patch-sql-common_client__authentication.cc (contents, props changed) head/databases/mysql56-server/files/patch-sql-common_client__authentication.cc (contents, props changed) Deleted: head/databases/mysql56-server/files/patch-sql_sql_trigger.cc head/databases/mysql56-server/files/patch-sql_sql_view.cc Modified: head/databases/mysql56-server/Makefile (contents, props changed) Added: head/databases/mysql56-client/files/patch-sql-common_client__authentication.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-client/files/patch-sql-common_client__authentication.cc Fri Jan 5 10:54:41 2018 (r458124) @@ -0,0 +1,17 @@ +sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int') + mysql->options.extension->server_public_key_path != '\0') + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~ + +Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4 + +--- sql-common/client_authentication.cc.orig 2017-09-13 15:49:17 UTC ++++ 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"); Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Fri Jan 5 09:26:49 2018 (r458123) +++ head/databases/mysql56-server/Makefile Fri Jan 5 10:54:41 2018 (r458124) @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.6.38 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server Added: head/databases/mysql56-server/files/patch-sql-common_client__authentication.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-server/files/patch-sql-common_client__authentication.cc Fri Jan 5 10:54:41 2018 (r458124) @@ -0,0 +1,17 @@ +sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int') + mysql->options.extension->server_public_key_path != '\0') + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~ + +Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4 + +--- sql-common/client_authentication.cc.orig 2017-09-13 15:49:17 UTC ++++ 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");