From owner-svn-ports-head@freebsd.org Mon Jan 15 16:31:20 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 72F66EB89A2; Mon, 15 Jan 2018 16:31:20 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48C7C7F62F; Mon, 15 Jan 2018 16:31:20 +0000 (UTC) (envelope-from vd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88DC813A0D; Mon, 15 Jan 2018 16:31:19 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0FGVJQg040508; Mon, 15 Jan 2018 16:31:19 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FGVJ0m040507; Mon, 15 Jan 2018 16:31:19 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201801151631.w0FGVJ0m040507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Mon, 15 Jan 2018 16:31:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459077 - head/databases/mysqlwsrep56-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: vd X-SVN-Commit-Paths: head/databases/mysqlwsrep56-server/files X-SVN-Commit-Revision: 459077 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: Mon, 15 Jan 2018 16:31:20 -0000 Author: vd Date: Mon Jan 15 16:31:19 2018 New Revision: 459077 URL: https://svnweb.freebsd.org/changeset/ports/459077 Log: databases/mysqlwsrep56-server: fix compilation with Clang 6 Similarly to what was done with databases/mysql56-server in r458124. Added: head/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc (contents, props changed) Deleted: head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc Added: head/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc Mon Jan 15 16:31:19 2018 (r459077) @@ -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");