From nobody Fri Jun 3 04:45:57 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 136C81B65BDF; Fri, 3 Jun 2022 04:45:58 +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 4LDr1K57HGz4VTR; Fri, 3 Jun 2022 04:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654231557; 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=dE7gyQSe2Tneyvj068JM1Qs9mF4fsU7PKZy8+zIKjoE=; b=GAbyFCPnXnV8makq8If4BMoyVdikyhw7hORq3GkEZN0I5VISqCbNMGNvhq5K8OaGB/6U3u 9MhRck3yJmx2sz58dWBt5dEtbVTimiBbNo/IU7ZmfOHmvnubyjCn9mwkIyf0pYek7F6hzf oAJrO004aNEIiN/smEbi1JXrsPCd2uxvVmNTFjA6CnrCcqY3pTFY/WodGC8t4eXsOPA9ou U/jHgP8FjyHbgMchics8c/2xCW4hyIBjAjD2hbtOJVgfrJQ0JCjnZTqBMMlyzkSbDC252j xPz+pgPYhLdbvlDGGKqshR6YYfyPqnYdipjs7JAuRipwTu/uNOCMkcCSPzVz7g== 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 8C27D22376; Fri, 3 Jun 2022 04:45:57 +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 2534jvoA036444; Fri, 3 Jun 2022 04:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2534jvaJ036443; Fri, 3 Jun 2022 04:45:57 GMT (envelope-from git) Date: Fri, 3 Jun 2022 04:45:57 GMT Message-Id: <202206030445.2534jvaJ036443@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: 7384f5368e82 - main - mail/sendmail: New options MTA-STS TLS_CERT_CHAIN 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: 7384f5368e82dd9644322da2b07abc32a3c44ca9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654231557; 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=dE7gyQSe2Tneyvj068JM1Qs9mF4fsU7PKZy8+zIKjoE=; b=GegpNZeCG/fnM3HvFPO9DFRLhrmzGQXNqX6XE7CnO5X+LagUbxzxyp/OjS2cx6+P/A6BIm xjHz7FMtoTjbQrZh1BUHcOjZHOeAn5fuhQdoXMrPuKYIqledgBAI7S+5NO2AevbEbkzNz1 vQpfjPgqAayOIGFk70JqGKnt8RdVNjH45vEGAzsoS2sU9QZnb7E2NCnBsJcK7Daw3UXjjV ZMHBZYUFKJ/gLn0ySw0fPj65s8tHDh9fIc50jE5QIxQ6e1Th9bhz6Y/1uvQev4zVv+vldK +/XVZMihqbZ4OXLUye+MWXPPMpE6gsNsZDmlUWDomcdddFQnDAl3a/IrBn8puw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654231557; a=rsa-sha256; cv=none; b=x5NuFTExdmFIeFNo0tf3qEj8DNB8SCkE4vMe5qDBLyO38XiMQr6aT+qWvDSmdIAeW/IJh8 fE8/6KysHFT79+IC93SDxvxjDSeEFzP7RZF97Ahazj2WkFihcyfn7AnngLQhGL3nHpwxE8 Y0tV/GlXHVF3x6WHrAdTLs+6dpEM02lk2bBaLZn6xINf/LRdR0MISfu8ByhlMpsX5tRpqx JVZyttoiPoUMcYCwgX8IaHzKM4ivw6X+8XxVlU1nh1dVnMTr3ekQh7Y9YcqrerGHAheMTw 5LiZ7LXVhuczIP2OYFSgMx/EdT0GETaB5QRw0S+8l4dIg7khS9mfANLDCbk4nA== 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=7384f5368e82dd9644322da2b07abc32a3c44ca9 commit 7384f5368e82dd9644322da2b07abc32a3c44ca9 Author: Dirk Meyer AuthorDate: 2022-06-03 04:45:38 +0000 Commit: Dirk Meyer CommitDate: 2022-06-03 04:45:38 +0000 mail/sendmail: New options MTA-STS TLS_CERT_CHAIN PR: 264324 --- mail/sendmail/Makefile | 19 +++++++++++++------ mail/sendmail/files/patch-cfsts.m4 | 9 +++++++++ mail/sendmail/files/site.config.m4.mta-sts | 1 + mail/sendmail/files/site.config.m4.tls | 4 +++- mail/sendmail/files/site.config.m4.tls-cert-chain | 1 + 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index f83d376b872a..0df6543f1256 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.17.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -46,7 +46,7 @@ MILTER_SOVER?= 6 OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS DANE SASL SASLAUTHD LDAP \ BDB GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \ - PICKY_HELO_CHECK MILTER DOCS + PICKY_HELO_CHECK MILTER MTA_STS TLS_CERT_CHAIN DOCS OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS DANE SASL SASLAUTHD BDB1 \ BLACKLISTD PICKY_HELO_CHECK MILTER NO_OPTIONS_SORT=yes @@ -63,6 +63,8 @@ CYRUSLOOKUP_DESC= Enable cyruslookup feature PICKY_HELO_CHECK_DESC= Enable picky HELO check MILTER_DESC= Enable milter support SMTPUTF8_DESC= Enable unicode address support +MTA_STS_DESC= Emable MTA-STS support (option SOCKETMAP and TLS needed) +TLS_CERT_CHAIN_DESC= Enable certificate chain file support (incompatibility) TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -73,7 +75,10 @@ LDAP_IMPLIES= DANE BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= compat +CYRUSLOOKUP_IMPLIES= SOCKETMAP SMTPUTF8_LIB_DEPENDS= libidn2.so:dns/libidn2 libicui18n.so:devel/icu +MTA_STS_IMPLIES= SOCKETMAP TLS +TLS_CERT_CHAIN_IMPLIES= TLS .include @@ -97,12 +102,8 @@ SASL_SUFFIX?= +sasl2 CONFLICTS+= sendmail-ldap-8.* sendmail-tls-8.* .endif .if ${PORT_OPTIONS:MCYRUSLOOKUP} -.if ! ${PORT_OPTIONS:MSOCKETMAP} -IGNORE= option CYRUSLOOKUP requires option SOCKETMAP -.else EXTRA_PATCHES+= ${FILESDIR}/cyruslookup.patch .endif -.endif .if ${PORT_OPTIONS:MTLS} TLS_SUFFIX?= +tls CONFLICTS+= sendmail-ldap-8.* sendmail-sasl2-8.* @@ -146,6 +147,9 @@ SITE+= ${FILESDIR}/site.config.m4.milter LICENSE_PERMS= dist-mirror dist-sell no-pkg-mirror no-pkg-sell auto-accept SITE+= ${FILESDIR}/site.config.m4.gdbm .endif +.if ${PORT_OPTIONS:MMTA_STS} +SITE+= ${FILESDIR}/site.config.m4.mta-sts +.endif SED_SCRIPT= -e "s|\`-O'|\`${CFLAGS}'|" \ -e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|' @@ -344,6 +348,9 @@ help: SITE+= ${FILESDIR}/site.config.m4.ssl .endif SITE+= ${FILESDIR}/site.config.m4.tls +.if ${PORT_OPTIONS:MTLS_CERT_CHAIN} +SITE+= ${FILESDIR}/site.config.m4.tls-cert-chain +.endif .endif .if exists(${FILESDIR}/site.config.m4.local) diff --git a/mail/sendmail/files/patch-cfsts.m4 b/mail/sendmail/files/patch-cfsts.m4 new file mode 100644 index 000000000000..d72176c43a21 --- /dev/null +++ b/mail/sendmail/files/patch-cfsts.m4 @@ -0,0 +1,9 @@ +--- cf/feature/sts.m4.orig 2021-06-08 04:03:56.000000000 +0900 ++++ cf/feature/sts.m4 2022-02-24 21:30:48.072162000 +0900 +@@ -15,5 +15,5 @@ + LOCAL_CONFIG + O StrictTransportSecurity=true + ifelse(_ARG2_,`NO_SAN_TST',`',`O SetCertAltnames=true') +-Ksts ifelse(defn(`_ARG_'), `', socket -d5 -T inet:5461@127.0.0.1, ++Ksts ifelse(defn(`_ARG_'), `', socket -d5 -T inet:8461@127.0.0.1, + defn(`_NARG_'), `', `_ARG_', `_NARG_') diff --git a/mail/sendmail/files/site.config.m4.mta-sts b/mail/sendmail/files/site.config.m4.mta-sts new file mode 100644 index 000000000000..27167096539d --- /dev/null +++ b/mail/sendmail/files/site.config.m4.mta-sts @@ -0,0 +1 @@ +APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_MTA_STS') diff --git a/mail/sendmail/files/site.config.m4.tls b/mail/sendmail/files/site.config.m4.tls index ec8a57bdbee1..49ed44d92ebe 100644 --- a/mail/sendmail/files/site.config.m4.tls +++ b/mail/sendmail/files/site.config.m4.tls @@ -1,2 +1,4 @@ -APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DTLS_EC') +APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DTLS_EC=2') +APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_ALTNAMES') +APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_VRFY_TRUSTED_FIRST') APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto') diff --git a/mail/sendmail/files/site.config.m4.tls-cert-chain b/mail/sendmail/files/site.config.m4.tls-cert-chain new file mode 100644 index 000000000000..c65889272804 --- /dev/null +++ b/mail/sendmail/files/site.config.m4.tls-cert-chain @@ -0,0 +1 @@ +APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_USE_CERTIFICATE_CHAIN_FILE')