kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mail/sendmail: New options MTA-STS TLS_CERT_CHAIN

Browse source 
PR: 264324
This commit is contained in:
Dirk Meyer 2022-06-03 06:45:38 +02:00
parent 5f6bb89ad9
commit 7384f5368e
5 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mail/sendmail/Makefile
View file

@ -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 <bsd.port.options.mk>
@ -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)

9
mail/sendmail/files/patch-cfsts.m4 Normal file
View file

@ -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<TMPF> inet:5461@127.0.0.1,
+Ksts ifelse(defn(`_ARG_'), `', socket -d5 -T<TMPF> inet:8461@127.0.0.1,
defn(`_NARG_'), `', `_ARG_', `_NARG_')

1
mail/sendmail/files/site.config.m4.mta-sts Normal file
View file

@ -0,0 +1 @@
APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_MTA_STS')

4
mail/sendmail/files/site.config.m4.tls
View file

@ -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')

1
mail/sendmail/files/site.config.m4.tls-cert-chain Normal file
View file

@ -0,0 +1 @@
APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_USE_CERTIFICATE_CHAIN_FILE')