From nobody Fri Dec 22 07:01:52 2023 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 4SxJBS5MBmz54sCm; Fri, 22 Dec 2023 07:01:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SxJBS4nggz3fCx; Fri, 22 Dec 2023 07:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703228512; 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=yvnDZscmWpVh2ooh8JIYbD/tC5qLj9PCxM0w7YFgWpU=; b=mt+fC2vOg/N+wiGiRN4quRHSkcig8ceo1I9bI7HIgbFsLuSQoqUnnEewUX6Ft+0jVUn5z9 6MhrEg1VQoTJsKwikgl3TXZuvIKSo5OL3eXMc7XR3KraMPNuzAD9ARuRCt1wi534KX7MRN 2NeSGREpz1sk5ZkOD2rRYb18eMMkJoQzpQ44druW7+WfGbwCwMY2l2FejOptqMVphtPt4w 8Frd1balfbyz8QwhBub3xbnPrURvZVU8jUBf9XlroVIpQVO94Fid7F2HpVnEH8IRdjOZ/H 5OZcewriEaIQcQy0BVQkMRxGryXynCDt35kG3abzgA3deL5vUoJa4nSD1REwKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703228512; a=rsa-sha256; cv=none; b=FYs9w8S/EgJt3AAswTqos/9sq0dcFy4juMC8/3pAXkBMEefCPQemDJL7TVoxANYAa75/1Z UkvILYZJf8pSAvemjpuVBj1sv/DmBgNkwID1EFdKgU/+WLodx7zbjsR6QU7nVUYX9arY+J fWJL16aJF5J+xQ1ppJqMRiy/uMPrqNFOIUUybWM3Z0sDBLJLRPf+9UQaTO/fCJzleMGFXC BX6OQ+Wn4HBa7TiQLUhoA5Ux5VVRvdq7Gy4Y3wibT/YoRgueDGHwVin/VWU58797y4jnWT HyGpzcsCVnXokR2WniUu10pfTF6oESuH852aMOc1n/eCV344Wp8Mgv1IsjSjsA== 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=1703228512; 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=yvnDZscmWpVh2ooh8JIYbD/tC5qLj9PCxM0w7YFgWpU=; b=kEySDosrZsfj/MpfS91DaaoHfIr6y+5sbkTOB3Ed7uvmYB7o3sYR9eAjb2SthuufRMt9hU h8G/T2b+4tpwJAnVl4MdLqcTzl6rGhS0o4d/AAaQx+bCXdlAOkVdHzk2ASHlE52+LBW+sm 12MBdAdRrAcKXueMWV3+ZbF6Xqm75vX5LWlzQlqDBBPjU1KrfidYMRsZf5NwsN9EmPEY6p cBy9uTXSNolz7zIOyh+Blwvmw27PpmedLvPWARbDJy6eDlmotRgDEpFuL8GQKiZ2bIe3e/ 5HJDGZw7YxNDy8eXEqVEQxRp25kx97MOKU7Muzxbqke6uhhZk7tzDIjliWEUpg== 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 4SxJBS3XKkz1525; Fri, 22 Dec 2023 07:01:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BM71qwK023498; Fri, 22 Dec 2023 07:01:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BM71q7N023495; Fri, 22 Dec 2023 07:01:52 GMT (envelope-from git) Date: Fri, 22 Dec 2023 07:01:52 GMT Message-Id: <202312220701.3BM71q7N023495@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: f65dcbde97ed - main - mail/sendmail-devel: Update to 8.18.0.2 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: f65dcbde97ed01982df5ce7c5152c4f862d3db05 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=f65dcbde97ed01982df5ce7c5152c4f862d3db05 commit f65dcbde97ed01982df5ce7c5152c4f862d3db05 Author: Dirk Meyer AuthorDate: 2023-12-22 07:01:36 +0000 Commit: Dirk Meyer CommitDate: 2023-12-22 07:01:36 +0000 mail/sendmail-devel: Update to 8.18.0.2 --- mail/sendmail-devel/Makefile | 4 +-- mail/sendmail-devel/distinfo | 6 ++-- mail/sendmail-devel/files/patch-sendmail.h | 16 +++++------ mail/sendmail-devel/files/patch-srvrsmtp.c | 46 ++++++++++++++++++------------ 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index c75143cfacb3..453c1bfadba2 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail -PORTVERSION= 8.17.1.28 -PORTREVISION= 1 +PORTVERSION= 8.18.0.2 +PORTREVISION= 0 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/ PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} diff --git a/mail/sendmail-devel/distinfo b/mail/sendmail-devel/distinfo index 88a311f408ed..f8e56900dee7 100644 --- a/mail/sendmail-devel/distinfo +++ b/mail/sendmail-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692158033 -SHA256 (sendmail.8.17.1.28.tar.gz) = 909c2a58772783aced1cd1be45f1a1af5b61b468775ca9d45c79568edca54719 -SIZE (sendmail.8.17.1.28.tar.gz) = 2312572 +TIMESTAMP = 1703097465 +SHA256 (sendmail.8.18.0.2.tar.gz) = b8f64c67f94dc6ff0f65498636f8f90b794e58ded15a05650a98115167b60773 +SIZE (sendmail.8.18.0.2.tar.gz) = 2330539 diff --git a/mail/sendmail-devel/files/patch-sendmail.h b/mail/sendmail-devel/files/patch-sendmail.h index 448f0d15ddce..89a33cfff8a2 100644 --- a/mail/sendmail-devel/files/patch-sendmail.h +++ b/mail/sendmail-devel/files/patch-sendmail.h @@ -1,7 +1,7 @@ ---- sendmail/sendmail.h.orig 2019-02-15 10:30:19 UTC +--- sendmail/sendmail.h.orig 2023-12-05 09:53:22 UTC +++ sendmail/sendmail.h -@@ -61,6 +61,10 @@ SM_UNUSED(static char SmailId[]) = "@(#) - #endif /* _DEFINE */ +@@ -73,6 +73,10 @@ SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail. + #endif #include "bf.h" +#if USE_BLACKLIST @@ -10,15 +10,15 @@ +#include "blacklist_client.h" #include "timers.h" #include - #include -@@ -2513,6 +2517,10 @@ EXTERN int Hacks; /* bit field of run-ti + #include +@@ -2734,6 +2738,10 @@ EXTERN int Hacks; /* bit field of run-time enabled "ha + #endif EXTERN int ConnectionRateWindowSize; - ++ +#if USE_BLACKLIST +EXTERN bool UseBlacklist; +#endif -+ + /* ** Declarations of useful functions - */ diff --git a/mail/sendmail-devel/files/patch-srvrsmtp.c b/mail/sendmail-devel/files/patch-srvrsmtp.c index 5ffa4eec4dbd..e4abbbf00a57 100644 --- a/mail/sendmail-devel/files/patch-srvrsmtp.c +++ b/mail/sendmail-devel/files/patch-srvrsmtp.c @@ -1,24 +1,34 @@ ---- sendmail/srvrsmtp.c.orig 2019-02-15 10:30:19 UTC +--- sendmail/srvrsmtp.c.orig 2023-12-05 09:53:22 UTC +++ sendmail/srvrsmtp.c -@@ -878,6 +878,9 @@ smtp(nullserver, d_flags, e) - #if _FFR_BADRCPT_SHUTDOWN - int n_badrcpts_adj; +@@ -921,6 +921,9 @@ do \ + # define SHOWCMDINREPLY(inp) inp + # define SHOWSHRTCMDINREPLY(inp) shortenstring(inp, MAXSHORTSTR) #endif +#ifdef USE_BLACKLIST + int saved_bl_fd; +#endif - RESET_AUTH_FAIL_LOG_USER; - SevenBitInput_Saved = SevenBitInput; -@@ -1377,6 +1380,7 @@ smtp(nullserver, d_flags, e) - (int) tp.tv_sec + - (tp.tv_usec >= 500000 ? 1 : 0) + void + smtp(nullserver, d_flags, e) +@@ -1504,6 +1507,8 @@ smtp(nullserver, d_flags, e) + /* check if data is on the socket during the pause */ + if ((tp = channel_readable(InChannel, msecs)) != NULL) + { ++ int fd; ++ + greetcode = "554"; + nullserver = "Command rejected"; + sm_syslog(LOG_INFO, e->e_id, +@@ -1513,6 +1518,8 @@ smtp(nullserver, d_flags, e) + (int) tp->tv_sec + + (tp->tv_usec >= 500000 ? 1 : 0) ); ++ fd = sm_io_getinfo(InChannel, SM_IO_WHAT_FD, NULL); + BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, fd, "pre-greeting traffic"); } } } -@@ -1479,6 +1483,10 @@ smtp(nullserver, d_flags, e) +@@ -1631,6 +1638,10 @@ smtp(nullserver, d_flags, e) SmtpPhase = "server cmd read"; sm_setproctitle(true, e, "server %s cmd read", CurSmtpClient); @@ -29,7 +39,7 @@ /* handle errors */ if (sm_io_error(OutChannel) || (p = sfgets(inp, sizeof(inp), InChannel, -@@ -1792,8 +1800,11 @@ smtp(nullserver, d_flags, e) +@@ -1944,8 +1955,11 @@ smtp(nullserver, d_flags, e) #define LOGAUTHFAIL \ do \ { \ @@ -41,7 +51,7 @@ if (LogLevel >= 9) \ sm_syslog(LOG_WARNING, e->e_id, \ "AUTH failure (%s): %s (%d) %s%s%.*s, relay=%.100s", \ -@@ -1943,6 +1954,9 @@ smtp(nullserver, d_flags, e) +@@ -2095,6 +2109,9 @@ smtp(nullserver, d_flags, e) DELAY_CONN("AUTH"); if (!sasl_ok || n_mechs <= 0) { @@ -51,7 +61,7 @@ message("503 5.3.3 AUTH not available"); break; } -@@ -3546,10 +3560,17 @@ doquit: +@@ -3836,10 +3853,17 @@ smtp(nullserver, d_flags, e) ** timeouts for the same connection. */ @@ -69,7 +79,7 @@ if (tTd(93, 100)) { /* return to handle next connection */ -@@ -3607,7 +3628,10 @@ doquit: +@@ -3921,7 +3945,10 @@ smtp(nullserver, d_flags, e) #if MAXBADCOMMANDS > 0 if (++n_badcmds > MAXBADCOMMANDS) { @@ -80,13 +90,13 @@ message("421 4.7.0 %s Too many bad commands; closing connection", MyHostName); -@@ -3659,6 +3683,9 @@ doquit: +@@ -3975,6 +4002,9 @@ smtp(nullserver, d_flags, e) + } #if SASL } - #endif ++#endif +#ifdef USE_BLACKLIST + close(saved_bl_fd); -+#endif + #endif } SM_EXCEPT(exc, "[!F]*") - {