Attachment #234304 for bug #264324

View | Details | Raw Unified | Return to bug 264324
Collapse All | Expand All

Lines 1-6 Link Here

(-)mail/sendmail/Makefile (-6 / +13 lines)
1	PORTNAME= sendmail	1	PORTNAME= sendmail
2	PORTVERSION= 8.17.1	2	PORTVERSION= 8.17.1
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= mail	4	CATEGORIES= mail
5	MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/	5	MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
6	DISTNAME= ${PORTNAME}.${PORTVERSION}	6	DISTNAME= ${PORTNAME}.${PORTVERSION}
Lines 46-52 MILTER_SOVER?= 6 Link Here
46		46
47	OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS DANE SASL SASLAUTHD LDAP \	47	OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS DANE SASL SASLAUTHD LDAP \
48	BDB GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \	48	BDB GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \
49	PICKY_HELO_CHECK MILTER DOCS	49	PICKY_HELO_CHECK MILTER DOCS MTA_STS TLS_CERT_CHAIN
50	OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS DANE SASL SASLAUTHD BDB1 \	50	OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS DANE SASL SASLAUTHD BDB1 \
51	BLACKLISTD PICKY_HELO_CHECK MILTER	51	BLACKLISTD PICKY_HELO_CHECK MILTER
52	NO_OPTIONS_SORT=yes	52	NO_OPTIONS_SORT=yes
Lines 63-68 CYRUSLOOKUP_DESC= Enable cyruslookup feature Link Here
63	PICKY_HELO_CHECK_DESC= Enable picky HELO check	63	PICKY_HELO_CHECK_DESC= Enable picky HELO check
64	MILTER_DESC= Enable milter support	64	MILTER_DESC= Enable milter support
65	SMTPUTF8_DESC= Enable unicode address support	65	SMTPUTF8_DESC= Enable unicode address support
		66	MTA_STS_DESC= Emable MTA-STS support (option SOCKETMAP and TLS needed)
		67	TLS_CERT_CHAIN_DESC= Enable certificate chain file support (incompatibility)
66		68
67	TLS_USES= ssl	69	TLS_USES= ssl
68	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2	70	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
Lines 73-79 LDAP_IMPLIES= DANE Link Here
73	BDB_USES= bdb	75	BDB_USES= bdb
74	GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm	76	GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm
75	GDBM_CONFIGURE_WITH= compat	77	GDBM_CONFIGURE_WITH= compat
		78	CYRUSLOOKUP_IMPLIES= SOCKETMAP
76	SMTPUTF8_LIB_DEPENDS= libidn2.so:dns/libidn2 libicui18n.so:devel/icu	79	SMTPUTF8_LIB_DEPENDS= libidn2.so:dns/libidn2 libicui18n.so:devel/icu
		80	MTA_STS_IMPLIES= SOCKETMAP TLS
		81	TLS_CERT_CHAIN_IMPLIES= TLS
77		82
78	.include <bsd.port.options.mk>	83	.include <bsd.port.options.mk>
79		84
Lines 97-108 SASL_SUFFIX?= +sasl2 Link Here
97	CONFLICTS+= sendmail-ldap-8.* sendmail-tls-8.*	102	CONFLICTS+= sendmail-ldap-8.* sendmail-tls-8.*
98	.endif	103	.endif
99	.if ${PORT_OPTIONS:MCYRUSLOOKUP}	104	.if ${PORT_OPTIONS:MCYRUSLOOKUP}
100	.if ! ${PORT_OPTIONS:MSOCKETMAP}
101	IGNORE= option CYRUSLOOKUP requires option SOCKETMAP
102	.else
103	EXTRA_PATCHES+= ${FILESDIR}/cyruslookup.patch	105	EXTRA_PATCHES+= ${FILESDIR}/cyruslookup.patch
104	.endif	106	.endif
105	.endif
106	.if ${PORT_OPTIONS:MTLS}	107	.if ${PORT_OPTIONS:MTLS}
107	TLS_SUFFIX?= +tls	108	TLS_SUFFIX?= +tls
108	CONFLICTS+= sendmail-ldap-8.* sendmail-sasl2-8.*	109	CONFLICTS+= sendmail-ldap-8.* sendmail-sasl2-8.*
Lines 146-151 SITE+= ${FILESDIR}/site.config.m4.milter Link Here
146	LICENSE_PERMS= dist-mirror dist-sell no-pkg-mirror no-pkg-sell auto-accept	147	LICENSE_PERMS= dist-mirror dist-sell no-pkg-mirror no-pkg-sell auto-accept
147	SITE+= ${FILESDIR}/site.config.m4.gdbm	148	SITE+= ${FILESDIR}/site.config.m4.gdbm
148	.endif	149	.endif
		150	.if ${PORT_OPTIONS:MMTA_STS}
		151	SITE+= ${FILESDIR}/site.config.m4.mta-sts
		152	.endif
149		153
150	SED_SCRIPT= -e "s\|\`-O'\|\`${CFLAGS}'\|" \	154	SED_SCRIPT= -e "s\|\`-O'\|\`${CFLAGS}'\|" \
151	-e 's\|%%CC%%\|${CC}\|' -e 's\|%%LD%%\|${LD}\|'	155	-e 's\|%%CC%%\|${CC}\|' -e 's\|%%LD%%\|${LD}\|'
Lines 344-349 help: Link Here
344	SITE+= ${FILESDIR}/site.config.m4.ssl	348	SITE+= ${FILESDIR}/site.config.m4.ssl
345	.endif	349	.endif
346	SITE+= ${FILESDIR}/site.config.m4.tls	350	SITE+= ${FILESDIR}/site.config.m4.tls
		351	.if ${PORT_OPTIONS:MTLS_CERT_CHAIN}
		352	SITE+= ${FILESDIR}/site.config.m4.tls-cert-chain
		353	.endif
347	.endif	354	.endif
348		355
349	.if exists(${FILESDIR}/site.config.m4.local)	356	.if exists(${FILESDIR}/site.config.m4.local)

Added Link Here

(-)mail/sendmail/files/patch-cfsts.m4 (+9 lines)
1	--- cf/feature/sts.m4.orig 2021-06-08 04:03:56.000000000 +0900
2	+++ cf/feature/sts.m4 2022-02-24 21:30:48.072162000 +0900
3	@@ -15,5 +15,5 @@
4	LOCAL_CONFIG
5	O StrictTransportSecurity=true
6	ifelse(_ARG2_,`NO_SAN_TST',`',`O SetCertAltnames=true')
7	-Ksts ifelse(defn(`_ARG_'), `', socket -d5 -T<TMPF> inet:5461@127.0.0.1,
8	+Ksts ifelse(defn(`_ARG_'), `', socket -d5 -T<TMPF> inet:8461@127.0.0.1,
9	defn(`_NARG_'), `', `_ARG_', `_NARG_')

Added Link Here

(-)mail/sendmail/files/site.config.m4.mta-sts (+1 lines)
1	APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_MTA_STS')

Lines 1-2 Link Here

(-)mail/sendmail/files/site.config.m4.tls (-1 / +3 lines)
1	APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DTLS_EC')	1	APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS -DTLS_EC=2')
		2	APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_ALTNAMES')
		3	APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_VRFY_TRUSTED_FIRST')
2	APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')	4	APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')

Added Link Here

(-)mail/sendmail/files/site.config.m4.tls-cert-chain (+1 lines)
1	APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_USE_CERTIFICATE_CHAIN_FILE')

Return to bug 264324