From nobody Wed Apr 20 06:20:09 2022 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 A8FBA11DF31E; Wed, 20 Apr 2022 06:20:09 +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 4KjrBK4MDqz53mP; Wed, 20 Apr 2022 06:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650435609; 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=ovZiYJ6vxQKDejHOtz7HpA7W70jDbmqsPVbr6CKVUlc=; b=T/xpNz/sltdyb9X8M9Jd1UgAK+uFrvOyaOHv3LIMrS4n29yCC+xZ312CkIuxuwc3fOVXVR eXnxuHIje1p879t01ViCWL7TBOR1f5qrSkRdswpYuq9PD3ARB7TIjHK3FmKHAaqQQkJsil 0tQi5L+KR+iw9P7/wdieGCam3y6HvoN/tC00C2yNug2jsl03X+YGPMcKTTvPvBvichHahu dkx16jUVInajfbyykVXCtmEdiiQs6xjX5t1RQ4Iet0sT8AL7b6C5Fd5YRVGCgmojtEiNQH 36qcaYs7nwgrBBfZXQY4iJHq8Aru4tnJUNFl9Cy381wksT9wAcq8wC77YKLrRQ== 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 7192A6B4E; Wed, 20 Apr 2022 06:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23K6K9qm054446; Wed, 20 Apr 2022 06:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23K6K93l054443; Wed, 20 Apr 2022 06:20:09 GMT (envelope-from git) Date: Wed, 20 Apr 2022 06:20:09 GMT Message-Id: <202204200620.23K6K93l054443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dirk Meyer Subject: git: 02e50e4a661c - 2022Q2 - mail/sendmail: Fix option SASL and SMTP AUTH 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 02e50e4a661c036de9f4dbfb0b63642a05997b6a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650435609; 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=ovZiYJ6vxQKDejHOtz7HpA7W70jDbmqsPVbr6CKVUlc=; b=WoKZbeueQpJtumsQm78HBuTYzEmg8gf7fRmWF2FrmkRmqiHNxXUVsOEElRQvSValypSNjJ XEy9A78S0JAK9LQoDEEoyYE+iQ5Vqjh2/3PXxk2Y4Kg242gjqI9k9sxSXw05d90q/zkEAk bf8tKsAl3otp9zXabovkqW48vDvqx8O7PAFbjgcflZmDi4O2kSP9QqLki6hVY0cyjznlIu dmPmafZ4RsdVNstm2F8Ug7bQl2MwNh7Y4VmCiUYTctQmNT+Shz2XG3ULGXDAflIrHiXgEA xBY400S7v3hQ6uwX5T9DUMZfBnSgZVMHEqQZUD+J6m9LunBxMcMqdbJuuYXwNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650435609; a=rsa-sha256; cv=none; b=Dlv9bqWPr0BY8czW12QSn1Tfl/jq695OIIK/g586YSZC2tuwqF2E5sDLP36embFu8xFJjt YDuZQ3lanjkoGcJiUqa+OYx2pt1QUHci6atC9659PsdRneurhoB/eGYDMjNC6hG0Wa3Msc haSLsy02NOJii9S/IfEKSXFDzXPtMS8VBjboojU8EJozPMFZs/rfMIM3hQOKhvMkzySLCs 0ydPu835O9LcL+fL4YIbNlfaVigB4JnTHkWWdinb1Pf4Ykz2pEfoBGC2ZmCqUVnCXRKdR/ URbDLbISlBDVt118RVurvsNk3EOadNiZs+gbUh2ilMxtD/NwciyNY6zfFscGHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=02e50e4a661c036de9f4dbfb0b63642a05997b6a commit 02e50e4a661c036de9f4dbfb0b63642a05997b6a Author: Dirk Meyer AuthorDate: 2022-04-20 05:34:44 +0000 Commit: Dirk Meyer CommitDate: 2022-04-20 06:19:57 +0000 mail/sendmail: Fix option SASL and SMTP AUTH PR: 263287 (cherry picked from commit 0625156b336bacba1e5dc541680af85e97feb0e2) --- mail/sendmail/files/patch-zsasl2 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/mail/sendmail/files/patch-zsasl2 b/mail/sendmail/files/patch-zsasl2 new file mode 100644 index 000000000000..2701fc3499cd --- /dev/null +++ b/mail/sendmail/files/patch-zsasl2 @@ -0,0 +1,21 @@ +--- sendmail/sendmail.h.orig 2022-04-19 21:07:42 UTC ++++ sendmail/sendmail.h +@@ -760,7 +760,7 @@ extern bool filesys_free __P((long)); + # define SASL_IS_AUTH 2 /* authenticated */ + + /* SASL options */ +-# define SASL_AUTH_AUTH 0x1000 /* use auth= only if authenticated */ ++# define SASL_AUTH_AUTH 0x10000 /* use auth= only if authenticated */ + # if SASL >= 20101 + # define SASL_SEC_MASK SASL_SEC_MAXIMUM /* mask for SASL_SEC_* values: sasl.h */ + # else /* SASL >= 20101 */ +@@ -775,6 +775,9 @@ extern bool filesys_free __P((long)); + # endif /* SASL_SEC_NOPLAINTEXT & SASL_SEC_MASK) == 0 ... */ + # endif /* SASL >= 20101 */ + # define MAXOUTLEN 8192 /* length of output buffer, should be 2^n */ ++# if (SASL_AUTH_AUTH & SASL_SEC_MASK) != 0 ++# ERROR "change SASL_AUTH_AUTH notify sendmail.org!" ++# endif + + /* functions */ + extern char *intersect __P((char *, char *, SM_RPOOL_T *));