mail/postfix-current: Update to 3.9-20231112

- Update to 3.9-20231112
- Regen extra patches
- Add flavors same as mail/postfix

3 files changed, 69 insertions, 48 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index a37f2af05e3f..f1b63b89bea6 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	postfix
-DISTVERSION=	3.9-20231030
-PORTREVISION=	1
+DISTVERSION=	3.9-20231112
+PORTREVISION?=	0
 PORTEPOCH=	6
 CATEGORIES=	mail
-MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
+MASTER_SITES=	https://postfix-mirror.horus-it.com/postfix-release/ \
+		http://ftp.porcupine.org/mirrors/postfix-release/ \
 		http://de.postfix.org/ftpmirror/ \
-		http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \
 		http://www.artfiles.org/postfix.org/postfix-release/ \
 		http://mirror.lhsolutions.nl/postfix-release/ \
 		ftp://postfix.mirrors.pair.com/
@@ -23,20 +23,42 @@ LICENSE_NAME_IPL10=	IBM PUBLIC LICENSE VERSION 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS_IPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-FLAVORS=			default ldap sasl
-default_CONFLICTS_INSTALL=	postfix-current-base-ldap \
-				postfix-current-base-sasl \
-				postfix-current-ldap postfix-current-sasl
-ldap_PKGNAMESUFFIX=		-current-ldap
-ldap_CONFLICTS_INSTALL=		postfix-current \
-				postfix-current-base \
-				postfix-current-base-sasl \
-				postfix-current-sasl
-sasl_PKGNAMESUFFIX=		-current-sasl
-sasl_CONFLICTS_INSTALL=		postfix-current \
-				postfix-current-base \
-				postfix-current-base-ldap \
-				postfix-current-ldap
+FLAVORS=			default ldap mysql pgsql sasl sqlite
+default_CONFLICTS_INSTALL=	postfix-current-base-ldap postfix-current-base-sasl \
+				postfix-current-ldap postfix-current-sasl \
+				postfix-current-mysql postfix-current-base-mysql \
+				postfix-current-pgsql postfix-current-base-pgsql \
+				postfix-current-sqlite postfix-current-base-sqlite
+ldap_PKGNAMESUFFIX=		-ldap
+ldap_CONFLICTS_INSTALL=		postfix-current postfix-current-base \
+				postfix-current-base-sasl postfix-current-sasl \
+				postfix-current-mysql postfix-current-base-mysql \
+				postfix-current-pgsql postfix-current-base-pgsql \
+				postfix-current-sqlite postfix-current-base-sqlite
+mysql_PKGNAMESUFFIX=		-mysql
+mysql_CONFLICTS_INSTALL=	postfix-current postfix-current-base \
+				postfix-current-ldap postfix-current-base-ldap \
+				postfix-current-pgsql postfix-current-base-pgsql \
+				postfix-current-sasl postfix-current-base-sasl \
+				postfix-current-sqlite postfix-current-base-sqlite
+pgsql_PKGNAMESUFFIX=		-pgsql
+pgsql_CONFLICTS_INSTALL=	postfix-current postfix-current-base \
+				postfix-current-ldap postfix-current-base-ldap \
+				postfix-current-mysql postfix-current-base-mysql \
+				postfix-current-sasl postfix-current-base-sasl \
+				postfix-current-sqlite postfix-current-base-sqlite
+sasl_PKGNAMESUFFIX=		-sasl
+sasl_CONFLICTS_INSTALL=		postfix-current postfix-current-base \
+				postfix-current-base-ldap postfix-current-ldap \
+				postfix-current-mysql postfix-current-base-mysql \
+				postfix-current-pgsql postfix-current-base-pgsql \
+				postfix-current-sqlite postfix-current-base-sqlite
+sqlite_PKGNAMESUFFIX=		-sqlite
+sqlite_CONFLICTS_INSTALL=	postfix-current postfix-current-base \
+				postfix-current-ldap postfix-current-base-ldap \
+				postfix-current-mysql postfix-current-base-mysql \
+				postfix-current-pgsql postfix-current-base-pgsql \
+				postfix-current-sasl postfix-current-base-sasl
 
 COMMENT_ldap=	(with OpenLDAP support)
 COMMENT_sasl=	(with Cyrus SASL support)
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index ef45264c79ba..2ddd2aa58db2 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699483949
-SHA256 (postfix/postfix-3.9-20231030.tar.gz) = 5af6380e3caa51a6b7cc92335f27e923f3f86f551d7fd2191abcd9eb86842ac4
-SIZE (postfix/postfix-3.9-20231030.tar.gz) = 4896025
+TIMESTAMP = 1700225849
+SHA256 (postfix/postfix-3.9-20231112.tar.gz) = c3590cda4a18740274d9d7ffdeec6dad71b7856be012817d90920bc04fc62595
+SIZE (postfix/postfix-3.9-20231112.tar.gz) = 4896401
diff --git a/mail/postfix-current/files/extra-patch-blacklistd b/mail/postfix-current/files/extra-patch-blacklistd
index 2b2bc712e667..c6811790ed66 100644
--- a/mail/postfix-current/files/extra-patch-blacklistd
+++ b/mail/postfix-current/files/extra-patch-blacklistd
@@ -1,6 +1,6 @@
 # PR 225664: support blacklistd on FreeBSD >= 11.0
 #
---- src/smtpd/Makefile.in.orig	2021-04-18 20:45:05 UTC
+--- src/smtpd/Makefile.in.orig	2023-05-21 16:54:34 UTC
 +++ src/smtpd/Makefile.in
 @@ -2,14 +2,14 @@ SHELL	= /bin/sh
  SRCS	= smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
@@ -20,32 +20,7 @@
  TESTSRC	= smtpd_token_test.c
  DEFS	= -I. -I$(INC_DIR) -D$(SYSTYPE)
  CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
---- src/smtpd/smtpd_sasl_glue.c.orig	2020-08-30 21:03:46 UTC
-+++ src/smtpd/smtpd_sasl_glue.c
-@@ -149,6 +149,7 @@
- #include "smtpd.h"
- #include "smtpd_sasl_glue.h"
- #include "smtpd_chat.h"
-+#include "pfilter.h" /* for blacklistd(8) */
- 
- #ifdef USE_SASL_AUTH
- 
-@@ -350,6 +351,10 @@ int     smtpd_sasl_authenticate(SMTPD_STATE *state,
- 	else
- 	    smtpd_chat_reply(state, "535 5.7.8 Error: authentication failed: %s",
- 			     STR(state->sasl_reply));
-+
-+
-+	/* notify blacklistd of SASL authentication failure */
-+	pfilter_notify(1, vstream_fileno(state->client));
- 	return (-1);
-     }
-     /* RFC 4954 Section 6. */
---- src/smtpd/pfilter.h.orig	2021-05-06 19:00:00 UTC
-+++ src/smtpd/pfilter.h
-@@ -0,0 +1 @@
-+void pfilter_notify(int, int);
---- src/smtpd/pfilter.c.orig	2021-05-06 19:00:00 UTC
+--- src/smtpd/pfilter.c.orig	2023-11-17 14:38:32 UTC
 +++ src/smtpd/pfilter.c
 @@ -0,0 +1,19 @@
 +#include "pfilter.h"
@@ -67,3 +42,27 @@
 +		blstate = NULL;
 +	}
 +}
+--- src/smtpd/pfilter.h.orig	2023-11-17 14:38:32 UTC
++++ src/smtpd/pfilter.h
+@@ -0,0 +1 @@
++void pfilter_notify(int, int);
+--- src/smtpd/smtpd_sasl_glue.c.orig	2023-11-12 21:41:13 UTC
++++ src/smtpd/smtpd_sasl_glue.c
+@@ -153,6 +153,7 @@
+ #include "smtpd.h"
+ #include "smtpd_sasl_glue.h"
+ #include "smtpd_chat.h"
++#include "pfilter.h" /* for blacklistd(8) */
+ 
+ #ifdef USE_SASL_AUTH
+ 
+@@ -358,6 +359,9 @@ int     smtpd_sasl_authenticate(SMTPD_STATE *state,
+ 	else
+ 	    smtpd_chat_reply(state, "535 5.7.8 Error: authentication failed: %s",
+ 			     reason);
++
++	/* notify blacklistd of SASL authentication failure */
++	pfilter_notify(1, vstream_fileno(state->client));
+ 	return (-1);
+     }
+     /* RFC 4954 Section 6. */