From nobody Tue Mar 04 20:12:26 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z6n0W0G3cz5qdqd; Tue, 04 Mar 2025 20:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6n0V6V35z46bL; Tue, 04 Mar 2025 20:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741119146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UampsEP8ol/139UPAOVOuNC2zOoUf8KvY5PUUhEQwI4=; b=eOdFZT802xjp1VPAQo6jnu+24YvGpSFo3hgu0SYuuZ7wKvQ1E4bxU0y80c1kOxOcwjVHKZ 07SsQpxKCoy5HELQSJbc6ALmEGlIGsvMv9qk9HVC+eHtY/0zWHzfdOwb0WhLSYCuHDYDOp UMSWsu+r2SNbBVvUGS9t+r4JN5J3bo0Av8TUQdphnPSITPLsrHYFJoEiC78LfWw80sI/TF c7YtvlPC48tex5U2Fa0GZTZQsP9pv1z+uMqP8eqlDJRhekyhjoWIW++rp4alhGT+kKRt/d 7qIQzzrXvoKhW3rH4Kc7o1sfxKv5uadshoclH3aZIOazS1/t9u3NWeZ9ASpD6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741119146; a=rsa-sha256; cv=none; b=xit84EhpHxMOHPACFtj/iPdMoKmZjyfNFR7cCd58xdFlLIsbjyohtAz7ktljPUfwvwlSmk GnkcL966FpPkW71ecOSHCTQjUeIsePxe3VhLMSTv5F7hxn/quA2GT9yysseQYFJuMYefbF JzKJhT0rxayo+gq0Tmp0gi3a2wvaOKPtIoaBwzh6tXLpWeVFzUQul9b0G6oD95DEtgolRH YWzG74zkyEOrRfRdnBBFQW+G3SkoKx5G1iXAu6rORVx3Ba7+qwvOC2j5La8ZKmmYFNyGvh 2rqzcvn7N0r+UnybEWiABLNdmOc46MTkHg9EWCUME4c7Qk9Zydkh3YWCzdy17A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741119146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UampsEP8ol/139UPAOVOuNC2zOoUf8KvY5PUUhEQwI4=; b=Lc15J8QHo+qrfJNGG5jRLLhGM/KhC0W86ro1cl72rvaK9vQtzoMBdPJqG1jsVnb2aBTjQ4 JbHg/mh9NU2hcJpVWicJaRpZovMPgJYGhYPjkEhTZBCW3cbZYy+SLOiZQz70+ddUaNiR1N BoVW+9URjT/r3MzdX5wtq9SBfqM2KXi1TmCP20qy7WElbDlHcHoLmUuByXFCe6Y1mI4nuO kTl0CnxLQDmv9RJqyRN/8OhvSb/xlnJlOz0xBefg4mC1GQbIW0GYdBpT85eMgcLR6EnA1A NDJXD8y/q8K6PGjLleYfomTkzuMlR6w+r6M2k6OX/FHTlTfTzLD0g29HlXGD/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z6n0V64n8zYtT; Tue, 04 Mar 2025 20:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 524KCQNq053906; Tue, 4 Mar 2025 20:12:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524KCQCY053893; Tue, 4 Mar 2025 20:12:26 GMT (envelope-from git) Date: Tue, 4 Mar 2025 20:12:26 GMT Message-Id: <202503042012.524KCQCY053893@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: fb25a7b49238 - main - mail/postfix: Make postscreen blacklistd aware List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb25a7b49238fac37fa24999089450454a4c3e85 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb25a7b49238fac37fa24999089450454a4c3e85 commit fb25a7b49238fac37fa24999089450454a4c3e85 Author: Michael Grimm AuthorDate: 2025-03-04 20:11:17 +0000 Commit: Juraj Lutter CommitDate: 2025-03-04 20:12:01 +0000 mail/postfix: Make postscreen blacklistd aware PR: 284444 --- mail/postfix/Makefile | 2 +- mail/postfix/files/extra-patch-blacklistd | 66 +++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 3fe0740e9228..b148a5a2fd10 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,6 +1,6 @@ PORTNAME= postfix DISTVERSION= 3.10.0 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= https://postfix-mirror.horus-it.com/postfix-release/ \ diff --git a/mail/postfix/files/extra-patch-blacklistd b/mail/postfix/files/extra-patch-blacklistd index 699d7b890578..6b8d49969405 100644 --- a/mail/postfix/files/extra-patch-blacklistd +++ b/mail/postfix/files/extra-patch-blacklistd @@ -67,3 +67,69 @@ /* 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) +--- src/postscreen/Makefile.in.orig 2025-01-29 08:50:15.761070000 +0100 ++++ src/postscreen/Makefile.in 2025-01-29 08:52:29.611925000 +0100 +@@ -3,13 +3,13 @@ + 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-01-29 08:56:39.949695000 +0100 ++++ src/postscreen/pfilter.c 2025-01-29 08:59:16.979565000 +0100 +@@ -0,0 +1,19 @@ ++#include "pfilter.h" ++#include /* for NULL */ ++#include ++ ++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-01-29 08:56:49.984170000 +0100 ++++ src/postscreen/pfilter.h 2025-01-29 08:59:47.270172000 +0100 +@@ -0,0 +1 @@ ++void pfilter_notify(int, int); +--- src/postscreen/postscreen_early.c.orig 2025-01-29 08:45:04.847798000 +0100 ++++ src/postscreen/postscreen_early.c 2025-01-29 10:18:34.349408000 +0100 +@@ -52,6 +52,7 @@ + /* Application-specific. */ + + #include ++#include "pfilter.h" /* for blacklistd(8) */ + + static char *psc_teaser_greeting; + static VSTRING *psc_escape_buf; +@@ -183,6 +184,10 @@ + 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),