Index: head/mail/opensmtpd-extras/files/patch-git6d424d2 =================================================================== --- head/mail/opensmtpd-extras/files/patch-git6d424d2 (revision 532996) +++ head/mail/opensmtpd-extras/files/patch-git6d424d2 (nonexistent) @@ -1,30 +0,0 @@ -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. - -From 337e64706c9d7f8e00d710b855fe5e5373354d65 Mon Sep 17 00:00:00 2001 -From: adufray -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; - Property changes on: head/mail/opensmtpd-extras/files/patch-git6d424d2 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/opensmtpd-extras/Makefile =================================================================== --- head/mail/opensmtpd-extras/Makefile (revision 532996) +++ head/mail/opensmtpd-extras/Makefile (revision 532997) @@ -1,109 +1,107 @@ # Created by: gahr # $FreeBSD$ PORTNAME= opensmtpd-extras -PORTVERSION?= 6.6.0 +PORTVERSION?= 6.7.1 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES+= mail MASTER_SITES= http://www.opensmtpd.org/archives/ # NB: Please reset PORTREVISION to 0 in all slave subports # while updating PORTVERSION for master port MAINTAINER= fluffy@FreeBSD.org COMMENT?= Addons for OpenSMTPD LICENSE?= ISCL LIB_DEPENDS+= libevent.so:devel/libevent USES+= autoreconf ssl libtool 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} NO_OPTIONS_SORT= yes # NB: Please *DO NOT* add the following; they are NOT for end-users: # queue-null, queue-stub # scheduler-stub # table-stub # # Pass OpenSMTPD branch selection to all extras # #OPTIONS_DEFINE= OPENSMTP_DEVEL #OPENSMTP_DEVEL_DESC= Depend on opensmtpd-devel (opensmtpd if off) #OPENSMTP_DEVEL_BUILD_DEPENDS_OFF= smtpctl:mail/opensmtpd #OPENSMTP_DEVEL_RUN_DEPENDS_OFF= smtpctl:mail/opensmtpd #OPENSMTP_DEVEL_BUILD_DEPENDS= smtpctl:mail/opensmtpd-devel #OPENSMTP_DEVEL_RUN_DEPENDS= smtpctl:mail/opensmtpd-devel BUILD_DEPENDS= smtpctl:mail/opensmtpd RUN_DEPENDS= smtpctl:mail/opensmtpd .if empty(SLAVE_PORT) OPTIONS_GROUP= TABLE QUEUE SCHEDULER OPTIONS_GROUP_QUEUE= QUEUE_PYTHON QUEUE_RAM OPTIONS_GROUP_SCHEDULER= SCHEDULER_PYTHON SCHEDULER_RAM OPTIONS_GROUP_TABLE= TABLE_LDAP TABLE_MYSQL TABLE_PASSWD TABLE_PGSQL TABLE_PYTHON TABLE_REDIS TABLE_SOCKETMAP TABLE_SQLITE OPTIONS_DEFAULT= ${OPTIONS_GROUP_TABLE} # Groups QUEUE_DESC= EXPERIMENTAL QUEUES SCHEDULER_DESC= EXPERIMENTAL SCHEDULERS TABLE_DESC= BASE TABLES # Queues QUEUE_PYTHON_DESC= The queue-python QUEUE_RAM_DESC= The queue-ram # Schedulers SCHEDULER_PYTHON_DESC= The scheduler-python SCHEDULER_RAM_DESC= The scheduler-ram # Tables TABLE_LDAP_DESC= LDAP table support TABLE_MYSQL_DESC= MySQL table support TABLE_PASSWD_DESC= passwd(5) table support TABLE_PGSQL_DESC= PgSQL table support TABLE_PYTHON_DESC= Python table support TABLE_REDIS_DESC= REDIS table support TABLE_SOCKETMAP_DESC= Socketmap protocol support TABLE_SQLITE_DESC= SQLite table support INSTALL_DIR= ${LOCALBASE}/libexec/opensmtpd NO_ARCH= yes # Queues QUEUE_PYTHON_RUN_DEPENDS= ${INSTALL_DIR}/queue-python:mail/opensmtpd-extras-queue-python QUEUE_RAM_RUN_DEPENDS= ${INSTALL_DIR}/queue-ram:mail/opensmtpd-extras-queue-ram # Schedulers SCHEDULER_PYTHON_RUN_DEPENDS= ${INSTALL_DIR}/scheduler-python:mail/opensmtpd-extras-scheduler-python SCHEDULER_RAM_RUN_DEPENDS= ${INSTALL_DIR}/scheduler-ram:mail/opensmtpd-extras-scheduler-ram # Tables TABLE_LDAP_RUN_DEPENDS= ${INSTALL_DIR}/table-ldap:mail/opensmtpd-extras-table-ldap TABLE_MYSQL_RUN_DEPENDS= ${INSTALL_DIR}/table-mysql:mail/opensmtpd-extras-table-mysql TABLE_PASSWD_RUN_DEPENDS= ${INSTALL_DIR}/table-passwd:mail/opensmtpd-extras-table-passwd TABLE_PGSQL_RUN_DEPENDS= ${INSTALL_DIR}/table-postgres:mail/opensmtpd-extras-table-postgresql TABLE_PYTHON_RUN_DEPENDS= ${INSTALL_DIR}/table-python:mail/opensmtpd-extras-table-python TABLE_REDIS_RUN_DEPENDS= ${INSTALL_DIR}/table-redis:mail/opensmtpd-extras-table-redis TABLE_SOCKETMAP_RUN_DEPENDS= ${INSTALL_DIR}/table-socketmap:mail/opensmtpd-extras-table-socketmap TABLE_SQLITE_RUN_DEPENDS= ${INSTALL_DIR}/table-sqlite:mail/opensmtpd-extras-table-sqlite #.else .endif .include Index: head/mail/opensmtpd-extras/distinfo =================================================================== --- head/mail/opensmtpd-extras/distinfo (revision 532996) +++ head/mail/opensmtpd-extras/distinfo (revision 532997) @@ -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