aboutsummaryrefslogtreecommitdiff
path: root/mail/postfix-current
diff options
context:
space:
mode:
Diffstat (limited to 'mail/postfix-current')
-rw-r--r--mail/postfix-current/Makefile2
-rw-r--r--mail/postfix-current/distinfo6
-rw-r--r--mail/postfix-current/files/extra-patch-blacklistd109
-rw-r--r--mail/postfix-current/files/patch-src_util_sys__defs.h2
4 files changed, 107 insertions, 12 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 0759221f8d75..86e745b3b4dc 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,5 +1,5 @@
PORTNAME= postfix
-DISTVERSION= 3.11-20250818
+DISTVERSION= 3.11-20250928
PORTREVISION?= 0
PORTEPOCH= 6
CATEGORIES= mail
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index b7f4a3f18cf6..692c27318e30 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755703540
-SHA256 (postfix/postfix-3.11-20250818.tar.gz) = 87efc4dc86d2cefad6cd047ac4469a7dbd549af73c690af6dfe36587deee1f8d
-SIZE (postfix/postfix-3.11-20250818.tar.gz) = 5091048
+TIMESTAMP = 1759477012
+SHA256 (postfix/postfix-3.11-20250928.tar.gz) = 22e2ef531e31455eec5c9c532d0697b2752b78f23c85a4623af93b4593a2da38
+SIZE (postfix/postfix-3.11-20250928.tar.gz) = 5083596
diff --git a/mail/postfix-current/files/extra-patch-blacklistd b/mail/postfix-current/files/extra-patch-blacklistd
index c6811790ed66..e21b40fd63ec 100644
--- a/mail/postfix-current/files/extra-patch-blacklistd
+++ b/mail/postfix-current/files/extra-patch-blacklistd
@@ -1,8 +1,72 @@
-# PR 225664: support blacklistd on FreeBSD >= 11.0
-#
---- src/smtpd/Makefile.in.orig 2023-05-21 16:54:34 UTC
+--- src/postscreen/Makefile.in.orig 2024-03-09 21:34:49 UTC
++++ src/postscreen/Makefile.in
+@@ -3,13 +3,13 @@ SRCS = postscreen.c postscreen_dict.c postscreen_dnsbl
+ postscreen_early.c postscreen_smtpd.c postscreen_misc.c \
+ postscreen_state.c postscreen_tests.c postscreen_send.c \
+ postscreen_starttls.c postscreen_expand.c postscreen_endpt.c \
+- postscreen_haproxy.c
++ postscreen_haproxy.c pfilter.c
+ OBJS = postscreen.o postscreen_dict.o postscreen_dnsbl.o \
+ postscreen_early.o postscreen_smtpd.o postscreen_misc.o \
+ postscreen_state.o postscreen_tests.o postscreen_send.o \
+ postscreen_starttls.o postscreen_expand.o postscreen_endpt.o \
+- postscreen_haproxy.o
+-HDRS =
++ postscreen_haproxy.o pfilter.o
++HDRS = pfilter.h
+ TESTSRC =
+ DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE)
+ CFLAGS = $(DEBUG) $(OPT) $(DEFS)
+--- src/postscreen/pfilter.c.orig 2025-07-11 20:30:00 UTC
++++ src/postscreen/pfilter.c
+@@ -0,0 +1,19 @@
++#include "pfilter.h"
++#include <stdio.h> /* for NULL */
++#include <blacklist.h>
++
++static struct blacklist *blstate;
++
++void
++pfilter_notify(int a, int fd)
++{
++ if (blstate == NULL)
++ blstate = blacklist_open();
++ if (blstate == NULL)
++ return;
++ (void)blacklist_r(blstate, a, fd, "postscreen");
++ if (a == 0) {
++ blacklist_close(blstate);
++ blstate = NULL;
++ }
++}
+--- src/postscreen/pfilter.h.orig 2025-07-11 20:30:00 UTC
++++ src/postscreen/pfilter.h
+@@ -0,0 +1 @@
++void pfilter_notify(int, int);
+--- src/postscreen/postscreen_early.c.orig 2021-02-18 18:55:31 UTC
++++ src/postscreen/postscreen_early.c
+@@ -52,6 +52,7 @@
+ /* Application-specific. */
+
+ #include <postscreen.h>
++#include "pfilter.h" /* for blacklistd(8) */
+
+ static char *psc_teaser_greeting;
+ static VSTRING *psc_escape_buf;
+@@ -183,6 +184,10 @@ static void psc_early_event(int event, void *context)
+ msg_info("DNSBL rank %d for [%s]:%s",
+ state->dnsbl_score, PSC_CLIENT_ADDR_PORT(state));
+ PSC_FAIL_SESSION_STATE(state, PSC_STATE_FLAG_DNSBL_FAIL);
++
++ /* notify blacklistd of DNSBL rank violation */
++ pfilter_notify(1, vstream_fileno(state->smtp_client_stream));
++
+ switch (psc_dnsbl_action) {
+ case PSC_ACT_DROP:
+ state->dnsbl_reply = vstring_sprintf(vstring_alloc(100),
+--- src/smtpd/Makefile.in.orig 2025-01-09 22:06:10 UTC
+++ src/smtpd/Makefile.in
-@@ -2,14 +2,14 @@ SHELL = /bin/sh
+@@ -2,14 +2,14 @@ SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.
SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \
smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c \
@@ -20,7 +84,7 @@
TESTSRC = smtpd_token_test.c
DEFS = -I. -I$(INC_DIR) -D$(SYSTYPE)
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
---- src/smtpd/pfilter.c.orig 2023-11-17 14:38:32 UTC
+--- src/smtpd/pfilter.c.orig 2025-07-11 20:30:00 UTC
+++ src/smtpd/pfilter.c
@@ -0,0 +1,19 @@
+#include "pfilter.h"
@@ -42,10 +106,38 @@
+ blstate = NULL;
+ }
+}
---- src/smtpd/pfilter.h.orig 2023-11-17 14:38:32 UTC
+--- src/smtpd/pfilter.h.orig 2025-07-11 20:30:00 UTC
+++ src/smtpd/pfilter.h
@@ -0,0 +1 @@
+void pfilter_notify(int, int);
+--- src/smtpd/smtpd_check.c.orig 2025-07-11 20:34:19 UTC
++++ src/smtpd/smtpd_check.c
+@@ -1767,6 +1767,7 @@ static int reject_unauth_destination(SMTPD_STATE *stat
+ /*
+ * Reject relaying to sites that are not listed in relay_domains.
+ */
++ pfilter_notify(1, vstream_fileno(state->client));
+ return (smtpd_check_reject(state, MAIL_ERROR_POLICY,
+ reply_code, reply_dsn,
+ "<%s>: Relay access denied",
+--- src/smtpd/smtpd_milter.c.orig 2025-07-11 20:33:21 UTC
++++ src/smtpd/smtpd_milter.c
+@@ -193,6 +193,7 @@ const char *smtpd_milter_eval(const char *name, void *
+ return ("");
+ if (state->milter_reject_text) {
+ /* 554 5.7.1 <user@example.com>: Relay access denied */
++ pfilter_notify(1, vstream_fileno(state->client));
+ vstring_strcpy(state->expand_buf, state->milter_reject_text + 4);
+ cp = split_at(STR(state->expand_buf), ' ');
+ return (cp ? split_at(cp, ' ') : cp);
+@@ -210,6 +211,7 @@ const char *smtpd_milter_eval(const char *name, void *
+ return (0);
+ if (state->milter_reject_text) {
+ /* 554 5.7.1 <user@example.com>: Relay access denied */
++ pfilter_notify(1, vstream_fileno(state->client));
+ vstring_strcpy(state->expand_buf, state->milter_reject_text + 4);
+ (void) split_at(STR(state->expand_buf), ' ');
+ return (STR(state->expand_buf));
--- src/smtpd/smtpd_sasl_glue.c.orig 2023-11-12 21:41:13 UTC
+++ src/smtpd/smtpd_sasl_glue.c
@@ -153,6 +153,7 @@
@@ -56,7 +148,7 @@
#ifdef USE_SASL_AUTH
-@@ -358,6 +359,9 @@ int smtpd_sasl_authenticate(SMTPD_STATE *state,
+@@ -358,8 +359,12 @@ int smtpd_sasl_authenticate(SMTPD_STATE *state,
else
smtpd_chat_reply(state, "535 5.7.8 Error: authentication failed: %s",
reason);
@@ -65,4 +157,7 @@
+ pfilter_notify(1, vstream_fileno(state->client));
return (-1);
}
++
/* RFC 4954 Section 6. */
+ smtpd_chat_reply(state, "235 2.7.0 Authentication successful");
+ if ((sasl_username = xsasl_server_get_username(state->sasl_server)) == 0)
diff --git a/mail/postfix-current/files/patch-src_util_sys__defs.h b/mail/postfix-current/files/patch-src_util_sys__defs.h
index 80e5cd02c3eb..1bbdfd79156c 100644
--- a/mail/postfix-current/files/patch-src_util_sys__defs.h
+++ b/mail/postfix-current/files/patch-src_util_sys__defs.h
@@ -5,7 +5,7 @@
|| defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
|| defined(FREEBSD11) || defined(FREEBSD12) || defined(FREEBSD13) \
- || defined(FREEBSD14) \
-+ || defined(FREEBSD14) || defined(FREEBSD15) \
++ || defined(FREEBSD14) || defined(FREEBSD15) || defined(FREEBSD16) \
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
|| defined(OPENBSD5) || defined(OPENBSD6) || defined(OPENBSD7) \
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-04 23:08:55 +0000