From nobody Fri Jul 18 14:57:41 2025 X-Original-To: dev-commits-ports-main@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 4bkCZZ1wGYz62QfF; Fri, 18 Jul 2025 14:57:42 +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 4bkCZY66WVz472h; Fri, 18 Jul 2025 14:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752850661; 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=2Xla3ugk3JJZpZQd41mZUxr/w50st3wL2i+MHBCIjNQ=; b=f/qFXtav/yZ1U4TLUpnrHBON+jOiuV1bGRAaE2aYRrYK/Fpx80IOE4MVcp3LH0dYejjmK7 njvrHZ5VxXejaAYxC216yN76t6/M6AvJoZSHNV/8Nd2lS1cHiulBywZjmiWvUjvCmMKjXl EejYg7hd3nwmDQgItyrSNzmkqcTUCVjWIF3CqNJGZ42XAOa/p27EbHrXSetIkQjnUxfbYX Ais7UQMiYecaz+0DuM9RJ1iLC+d+NuWtDjKW8PtFOLcF8wCP9zMeAh7fZApF6f8pd9PsTD Cvh4C9alZNRIvdiwPw7fv69gPXrAYy7RJ3PiKAi06bObx7bYR3YiPjE3G8eZkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752850661; 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=2Xla3ugk3JJZpZQd41mZUxr/w50st3wL2i+MHBCIjNQ=; b=SuMAJq6ZgY8e1poYBQWxGtnxDoBqth3g9MmFX4baCveqBO7zsR5OX44IgQ41fuN/9paASR KexT/MwehdM/C2t3QAtJ6a/3GGRldNglAVzO6m2ralZ0F077rd6bOErvqvtGoWF6y/fQc+ fo9Iey3VTtxzkVn+SGbnuBHqR6UEE3OmoDwTT7JHmUbvd3+hZVD9c31Zd5ViY/8H/h7fip PwUp8yy04gdMRDBFZDmgYJ5Lr8ZrEjCNpSZlqIt7igQ+TwgFYRRcKBRNschjp3VdoLEQmF GUujwXJbET32c3xM3sTJweXZdYhWrYcbpD2bYQDzw2eEliHS1RkDJRY9HRkT7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752850661; a=rsa-sha256; cv=none; b=gEpPZ8gCrlgxojpLDJGoUyEf/TJ0bIdhuUWG0VsnsfpvQe/KUSXngSOdTstt5Yz7bQwza8 YUlXudSEiyBgHIJWCgPkS+muF6CkkDdXevSKlU+HpwYAkHYurpuXkGxI41WGaqDP0QJSfN x1s2ZkKixbx/LSdX9KLPhEONWo99KQ8OkybZ0OkT2HtjYVH4+KwNQp+QOPitAhNIwnLtcK 7j13NHLdZ/SfDPmNqHOIULWT5SY1fI9PId2mVRwijDdLMDU5VQz9yOdVYfXnyYYuFVm7+T f5nnqyziUQ4ZqrJg+PsRwFV7Dwy2+Xg76IU6/jbcVjVoQTftqx+0Crwe5or3Eg== 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 4bkCZY4FvGzlTc; Fri, 18 Jul 2025 14:57:41 +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 56IEvfj1011153; Fri, 18 Jul 2025 14:57:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56IEvfdA011150; Fri, 18 Jul 2025 14:57:41 GMT (envelope-from git) Date: Fri, 18 Jul 2025 14:57:41 GMT Message-Id: <202507181457.56IEvfdA011150@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 169590106d31 - main - l/sendmail-devel: blacklist rejected hosts List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 169590106d318bea396c8ddf0356b96587fbd51f Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=169590106d318bea396c8ddf0356b96587fbd51f commit 169590106d318bea396c8ddf0356b96587fbd51f Author: Dirk Meyer AuthorDate: 2025-07-18 14:57:28 +0000 Commit: Dirk Meyer CommitDate: 2025-07-18 14:57:28 +0000 l/sendmail-devel: blacklist rejected hosts PR: 287739 Submitted by: Helge Oldach --- mail/sendmail-devel/Makefile | 2 +- mail/sendmail-devel/files/patch-srvrsmtp.c | 44 ++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index 9888cab01086..8fe7d586bbc9 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.18.1.10 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/ PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} diff --git a/mail/sendmail-devel/files/patch-srvrsmtp.c b/mail/sendmail-devel/files/patch-srvrsmtp.c index 1bc9071e43b4..0516f9b40ca7 100644 --- a/mail/sendmail-devel/files/patch-srvrsmtp.c +++ b/mail/sendmail-devel/files/patch-srvrsmtp.c @@ -1,4 +1,4 @@ ---- sendmail/srvrsmtp.c.orig 2025-02-05 06:35:18 UTC +--- sendmail/srvrsmtp.c.orig 2025-04-09 08:39:43 UTC +++ sendmail/srvrsmtp.c @@ -972,6 +972,9 @@ do \ # define SHOWCMDINREPLY(inp) inp @@ -10,7 +10,7 @@ void smtp(nullserver, d_flags, e) -@@ -1563,6 +1566,8 @@ smtp(nullserver, d_flags, e) +@@ -1562,6 +1565,8 @@ smtp(nullserver, d_flags, e) /* check if data is on the socket during the pause */ if ((tp = channel_readable(InChannel, msecs)) != NULL) { @@ -19,7 +19,7 @@ greetcode = "554"; nullserver = "Command rejected"; sm_syslog(LOG_INFO, e->e_id, -@@ -1572,6 +1577,8 @@ smtp(nullserver, d_flags, e) +@@ -1571,6 +1576,8 @@ smtp(nullserver, d_flags, e) (int) tp->tv_sec + (tp->tv_usec >= 500000 ? 1 : 0) ); @@ -28,7 +28,7 @@ } } } -@@ -1691,6 +1698,10 @@ smtp(nullserver, d_flags, e) +@@ -1690,6 +1697,10 @@ smtp(nullserver, d_flags, e) SmtpPhase = "server cmd read"; sm_setproctitle(true, e, "server %s cmd read", CurSmtpClient); @@ -39,7 +39,7 @@ /* handle errors */ if (sm_io_error(OutChannel) || (p = sfgets(inp, sizeof(inp), InChannel, -@@ -2006,8 +2017,11 @@ smtp(nullserver, d_flags, e) +@@ -2005,8 +2016,11 @@ smtp(nullserver, d_flags, e) #define LOGAUTHFAIL \ do \ { \ @@ -51,7 +51,33 @@ if (LogLevel >= 9) \ sm_syslog(LOG_WARNING, e->e_id, \ "AUTH failure (%s): %s (%d) %s%s%.*s, relay=%.100s", \ -@@ -2157,6 +2171,9 @@ smtp(nullserver, d_flags, e) +@@ -2105,6 +2119,13 @@ smtp(nullserver, d_flags, e) + case CMDEHLO: + case CMDNOOP: + case CMDRSET: ++ if (lognullconnection) ++ { ++ int fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL); ++ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, nullserver); ++ } ++ /* FALLTHROUGH */ ++ + case CMDERROR: + /* process normally */ + break; +@@ -2132,6 +2153,11 @@ smtp(nullserver, d_flags, e) + #endif /* MAXBADCOMMANDS > 0 */ + if (nullserver != NULL) + { ++ if (lognullconnection) ++ { ++ int fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL); ++ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, nullserver); ++ } + if (ISSMTPREPLY(nullserver)) + { + /* Can't use ("%s", ...) due to usrerr() requirements */ +@@ -2156,6 +2182,9 @@ smtp(nullserver, d_flags, e) DELAY_CONN("AUTH"); if (!sasl_ok || n_mechs <= 0) { @@ -61,7 +87,7 @@ message("503 5.3.3 AUTH not available"); break; } -@@ -3894,10 +3911,17 @@ smtp(nullserver, d_flags, e) +@@ -3908,10 +3937,17 @@ smtp(nullserver, d_flags, e) ** timeouts for the same connection. */ @@ -79,7 +105,7 @@ if (tTd(93, 100)) { /* return to handle next connection */ -@@ -3979,7 +4003,10 @@ smtp(nullserver, d_flags, e) +@@ -3993,7 +4029,10 @@ smtp(nullserver, d_flags, e) #if MAXBADCOMMANDS > 0 if (++n_badcmds > MAXBADCOMMANDS) { @@ -90,7 +116,7 @@ message("421 4.7.0 %s Too many bad commands; closing connection", MyHostName); -@@ -4033,6 +4060,9 @@ smtp(nullserver, d_flags, e) +@@ -4047,6 +4086,9 @@ smtp(nullserver, d_flags, e) } #if SASL }