Date: Fri, 31 Jan 2020 09:31:02 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r524684 - branches/2020Q1/mail/opensmtpd-extras/files Message-ID: <202001310931.00V9V2m7088456@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Fri Jan 31 09:31:02 2020 New Revision: 524684 URL: https://svnweb.freebsd.org/changeset/ports/524684 Log: MFH: r524682 mail/opensmtpd-extras: extend mysql80 patch to cover fresh mariadb too PR: 243749 Reported by: Vikash Badal Obtained from: OpenSMTPd repo Approved by: ports-secteam (miwi) Modified: branches/2020Q1/mail/opensmtpd-extras/files/patch-git6d424d2 Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/mail/opensmtpd-extras/files/patch-git6d424d2 ============================================================================== --- branches/2020Q1/mail/opensmtpd-extras/files/patch-git6d424d2 Fri Jan 31 09:30:31 2020 (r524683) +++ branches/2020Q1/mail/opensmtpd-extras/files/patch-git6d424d2 Fri Jan 31 09:31:02 2020 (r524684) @@ -3,19 +3,24 @@ From: Reio Remma <reio@mrstuudio.ee> Date: Thu, 19 Dec 2019 18:55:30 +0200 Subject: [PATCH] Fix building with MySQL 8.0.1. +From 337e64706c9d7f8e00d710b855fe5e5373354d65 Mon Sep 17 00:00:00 2001 +From: adufray <github@adufray.com> +Date: Wed, 29 Jan 2020 09:47:04 -0600 +Subject: [PATCH] Fix builds for MariaDB users + --- 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 +index a58fdf1..53fb7b7 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 ++#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 + bool reconn; +#else my_bool reconn;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001310931.00V9V2m7088456>