From 67fa50d2d9268166d6bc569d9dd0314a5e36f910 Mon Sep 17 00:00:00 2001
From: Dima Panov <fluffy@FreeBSD.org>
Date: Sun, 26 Apr 2020 05:53:37 +0000
Subject: mail/opensmtpd-extras: update to 6.7.1 maintenance release

- fix mysql disconnect on error
- fix build with recent mariadb man mysql >=8.0
---
 mail/opensmtpd-extras/Makefile               |  4 +---
 mail/opensmtpd-extras/distinfo               |  6 +++---
 mail/opensmtpd-extras/files/patch-git6d424d2 | 30 ----------------------------
 3 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 mail/opensmtpd-extras/files/patch-git6d424d2

(limited to 'mail/opensmtpd-extras')

diff --git a/mail/opensmtpd-extras/Makefile b/mail/opensmtpd-extras/Makefile
index 04220a47059a..d8e72ebaf05c 100644
--- a/mail/opensmtpd-extras/Makefile
+++ b/mail/opensmtpd-extras/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd-extras
-PORTVERSION?=	6.6.0
+PORTVERSION?=	6.7.1
 PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES+=	mail
@@ -23,8 +23,6 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 
-WRKSRC=		${WRKDIR}/OpenSMTPD-extras-${PORTVERSION}
-
 CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/mail" \
 			--with-libevent=${LOCALBASE} \
 			--with-libssl=${OPENSSLBASE}
diff --git a/mail/opensmtpd-extras/distinfo b/mail/opensmtpd-extras/distinfo
index ab7c36135497..b8ffd309625b 100644
--- a/mail/opensmtpd-extras/distinfo
+++ b/mail/opensmtpd-extras/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573830614
-SHA256 (opensmtpd-extras-6.6.0.tar.gz) = 126b023602e8bb222bf24543a056ee0a548343dc86d184669ff9d82dfca1fbdf
-SIZE (opensmtpd-extras-6.6.0.tar.gz) = 124234
+TIMESTAMP = 1587878117
+SHA256 (opensmtpd-extras-6.7.1.tar.gz) = f84385559a8bb366b2fe25d8b1f78c108f07cc15992350171569d7bdc2e935ac
+SIZE (opensmtpd-extras-6.7.1.tar.gz) = 548792
diff --git a/mail/opensmtpd-extras/files/patch-git6d424d2 b/mail/opensmtpd-extras/files/patch-git6d424d2
deleted file mode 100644
index 6d55535126d5..000000000000
--- a/mail/opensmtpd-extras/files/patch-git6d424d2
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6d424d2b10b8f8b04197d1edc686d61cdf5154db Mon Sep 17 00:00:00 2001
-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..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 !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001
-+	bool reconn;
-+#else
- 	my_bool	 reconn;
-+#endif
- 	size_t	 i;
- 	char	*host, *username, *password, *database, *q;
- 
-- 
cgit v1.2.3