From nobody Wed Apr 20 05:35:07 2022 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 6B9D011D488A; Wed, 20 Apr 2022 05:35:07 +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 4KjqBM2ZDsz4xfB; Wed, 20 Apr 2022 05:35:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650432907; 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=Y39q9j8MHQqslXKBV0bS63HDZvISk9Q/+1kpmA0qqsE=; b=MlXQNu1T73eVwhaH+gk4L4F0LlrHJGNLlV9mFVbEiUpoezQyL9Fu11vvw5c0a30yIBjjvZ 9EyuH4OljUY700pbJCUvVFjfBwoCH4e/fJua4r+Hlw8eoqe1jlP0CqqJ/YxjN58/fzaB2u HK7k23V47ktXiQm282zv6tdm8N1+BhOJdkJDItsF15+we72V0kUiRZGxYWAGRrkBuK2JRP 048ZOddiAX8miVA01rL3U2gb9Pc92R1avkylaNT2jK8BVa06BjLSSdHLdh8PzSpoOxJxUT a1hUKKNRw/KbhiX2P17nbSi0qNghGFSy+OYcw789TNqIzI8UysyzO2yWcsg6DQ== 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 380B45DFF; Wed, 20 Apr 2022 05:35:07 +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 23K5Z77Z096697; Wed, 20 Apr 2022 05:35:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23K5Z7Is096696; Wed, 20 Apr 2022 05:35:07 GMT (envelope-from git) Date: Wed, 20 Apr 2022 05:35:07 GMT Message-Id: <202204200535.23K5Z7Is096696@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: 0625156b336b - main - mail/sendmail: Fix option SASL and SMTP AUTH 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 0625156b336bacba1e5dc541680af85e97feb0e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650432907; 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=Y39q9j8MHQqslXKBV0bS63HDZvISk9Q/+1kpmA0qqsE=; b=k19zO2xTGLdSBOycTd69uLv0l5YW/yPIz2XWVQqxiEcp4Tq90ZXPeZxnRE9Cqxq9jnyeYj 2zK9fz0SOF7vbOJawI37OAbTuKCiU7R2f5NjZuxThuxUX/LvQPRG6BkC2/uxiewkvYQjNe XP5XRglYlRwC5lYW4CvbiBstZOThQ31CY6eLfQ+zlmmP1gtwu2d4dtBKNd5X7ffqpjLr6o i4G0A6Ts/37faSq0mDZLsggtlwtx6sgmy5YQaN+r4ZXTAsPIRW9mnHXdo7fhGYP6Uz7flU 3P6iRbpVUddCUWRTNVJ2jwoIHgosfZ5vBzj9ftBTjZEsUs3QInS+biJczKD9Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650432907; a=rsa-sha256; cv=none; b=EMeRpJ+AjxHIfnfXk88ZmthSYgMnJ79sBePKM72H97X34c854twYczdl7IuB/jFnoGRySw AGzPcFUoSXrSDFVfnEsFmt2Ug9ws1Rd2dUza8CjhL+8jcxOS6g50BKRMOookX2IJAi3jgL 9f4XYunh+lGRPZBoPe0mAFRPBoUB53zkmr3R5YA9M5JrUIZ2CYWjIxXOl0oLlnxjMfF+s2 WUnz0wlj/Msl6T4Is+53h5cP+KPDjs0VBekAGHKZFTw5E9VG+UXi89Bh5sH1hS2saJWYkH oAmHNhcL76omjRm+rc7cK+1SwCI6DuTAFygMIh87rYGYJ2bYUpVn4IDBNF2q5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=0625156b336bacba1e5dc541680af85e97feb0e2 commit 0625156b336bacba1e5dc541680af85e97feb0e2 Author: Dirk Meyer AuthorDate: 2022-04-20 05:34:44 +0000 Commit: Dirk Meyer CommitDate: 2022-04-20 05:34:44 +0000 mail/sendmail: Fix option SASL and SMTP AUTH PR: 263287 --- mail/sendmail/Makefile | 2 +- mail/sendmail/files/patch-zsasl2 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 7c36b1ec32be..f83d376b872a 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.17.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} 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 *));