From owner-svn-ports-all@freebsd.org Tue Sep 11 19:01:26 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB428109A1A9; Tue, 11 Sep 2018 19:01:26 +0000 (UTC) (envelope-from sunpoet@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 7A574856A6; Tue, 11 Sep 2018 19:01:26 +0000 (UTC) (envelope-from sunpoet@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 7075D1BDDD; Tue, 11 Sep 2018 19:01:26 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8BJ1QDV012005; Tue, 11 Sep 2018 19:01:26 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8BJ1Qv9012004; Tue, 11 Sep 2018 19:01:26 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201809111901.w8BJ1Qv9012004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 11 Sep 2018 19:01:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479564 - head/databases/p5-DBD-mysql/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/databases/p5-DBD-mysql/files X-SVN-Commit-Revision: 479564 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Sep 2018 19:01:27 -0000 Author: sunpoet Date: Tue Sep 11 19:01:26 2018 New Revision: 479564 URL: https://svnweb.freebsd.org/changeset/ports/479564 Log: Fix build with MariaDB PR: 231271 Submitted by: pi Added: head/databases/p5-DBD-mysql/files/ head/databases/p5-DBD-mysql/files/patch-dbdimp.c (contents, props changed) Added: head/databases/p5-DBD-mysql/files/patch-dbdimp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/p5-DBD-mysql/files/patch-dbdimp.c Tue Sep 11 19:01:26 2018 (r479564) @@ -0,0 +1,19 @@ +--- dbdimp.c.orig 2018-09-08 20:02:03 UTC ++++ dbdimp.c +@@ -1907,14 +1907,14 @@ MYSQL *mysql_dr_connect( + (SvTRUE(*svp) ? "utf8" : "latin1")); + } + +-#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION) ++#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID) + if ((svp = hv_fetch(hv, "mysql_get_server_pubkey", 23, FALSE)) && *svp && SvTRUE(*svp)) { + my_bool server_get_pubkey = 1; + mysql_options(sock, MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &server_get_pubkey); + } + #endif + +-#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION) ++#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID) + if ((svp = hv_fetch(hv, "mysql_server_pubkey", 19, FALSE)) && *svp) { + STRLEN plen; + char *server_pubkey = SvPV(*svp, plen);