From owner-svn-ports-all@freebsd.org Fri Jan 24 09:26:32 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C55D233986; Fri, 24 Jan 2020 09:26:32 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 483v0S2jqpz3Ht5; Fri, 24 Jan 2020 09:26:32 +0000 (UTC) (envelope-from fluffy@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 5441025361; Fri, 24 Jan 2020 09:26:32 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00O9QW2b080982; Fri, 24 Jan 2020 09:26:32 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00O9QW1a080981; Fri, 24 Jan 2020 09:26:32 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202001240926.00O9QW1a080981@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Fri, 24 Jan 2020 09:26:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523958 - head/mail/opensmtpd-extras/files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: head/mail/opensmtpd-extras/files X-SVN-Commit-Revision: 523958 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.29 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: Fri, 24 Jan 2020 09:26:32 -0000 Author: fluffy Date: Fri Jan 24 09:26:31 2020 New Revision: 523958 URL: https://svnweb.freebsd.org/changeset/ports/523958 Log: mail/opensmtpd-extras: Fix building with MySQL 8.0.1 Obtained from: OpenSMTPd repo MFH: 2020Q1 Added: head/mail/opensmtpd-extras/files/ head/mail/opensmtpd-extras/files/patch-git6d424d2 (contents, props changed) Added: head/mail/opensmtpd-extras/files/patch-git6d424d2 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/opensmtpd-extras/files/patch-git6d424d2 Fri Jan 24 09:26:31 2020 (r523958) @@ -0,0 +1,25 @@ +From 6d424d2b10b8f8b04197d1edc686d61cdf5154db Mon Sep 17 00:00:00 2001 +From: Reio Remma +Date: Thu, 19 Dec 2019 18:55:30 +0200 +Subject: [PATCH] Fix building with MySQL 8.0.1. + +--- + extras/tables/table-mysql/table_mysql.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git ./extras/tables/table-mysql/table_mysql.c ./extras/tables/table-mysql/table_mysql.c +index a58fdf1..257a713 100644 +--- ./extras/tables/table-mysql/table_mysql.c ++++ ./extras/tables/table-mysql/table_mysql.c +@@ -243,7 +243,11 @@ config_connect(struct config *conf) + { "query_addrname", 1 }, + { "query_mailaddrmap", 1 }, + }; ++#if MYSQL_VERSION_ID >= 80001 ++ bool reconn; ++#else + my_bool reconn; ++#endif + size_t i; + char *host, *username, *password, *database, *q; +