diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2020-01-31 09:07:49 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2020-01-31 09:07:49 +0000 |
| commit | 193e967f01dfc71c31c842a98c22a01af296e8d5 (patch) | |
| tree | 7d1e958b5e932ddf161fc1caa80d38e92adcb925 /mail/opensmtpd-extras | |
| parent | 52b42196892320f44f88968d1b17b186104c6cb0 (diff) | |
| download | ports-193e967f01dfc71c31c842a98c22a01af296e8d5.tar.gz ports-193e967f01dfc71c31c842a98c22a01af296e8d5.zip | |
mail/opensmtpd-extras: extend mysql80 patch to cover fresh mariadb too
PR: 243749
Reported by: Vikash Badal
Obtained from: OpenSMTPd repo
MFH: 2020Q1
Notes
Notes:
svn path=/head/; revision=524682
Diffstat (limited to 'mail/opensmtpd-extras')
| -rw-r--r-- | mail/opensmtpd-extras/files/patch-git6d424d2 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mail/opensmtpd-extras/files/patch-git6d424d2 b/mail/opensmtpd-extras/files/patch-git6d424d2 index f25f587564fa..6d55535126d5 100644 --- a/mail/opensmtpd-extras/files/patch-git6d424d2 +++ b/mail/opensmtpd-extras/files/patch-git6d424d2 @@ -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; |