diff options
| author | dinoex <dinoex@FreeBSD.org> | 2014-08-15 00:37:21 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2014-08-15 00:37:21 +0800 |
| commit | a07c225f7aea6f975c842c253bbfd5b92ddae98d (patch) | |
| tree | 8ce8671e361b3450421896a88645385b1729c4ce | |
| parent | 75d834ceea106a8aa6c1f0afee741aac6039579e (diff) | |
| download | freebsd-ports-gnome-a07c225f7aea6f975c842c253bbfd5b92ddae98d.tar.gz freebsd-ports-gnome-a07c225f7aea6f975c842c253bbfd5b92ddae98d.tar.zst freebsd-ports-gnome-a07c225f7aea6f975c842c253bbfd5b92ddae98d.zip | |
- enable options TLS SASL SASLAUTHD by default
- new option TLSEXT_PADDING
The port disables TLSEXT_PADDING by default.
This fixes "TLS handshake failed" errors when sending to Ironport appliances.
| -rw-r--r-- | mail/sendmail/Makefile | 12 | ||||
| -rw-r--r-- | mail/sendmail/files/tlsext.patch | 13 |
2 files changed, 21 insertions, 4 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index d9cd96754326..bd21c48650bf 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -2,7 +2,7 @@ PORTNAME= sendmail PORTVERSION= 8.14.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,} @@ -31,8 +31,8 @@ PLIST_SUB+= PREFIX=${PREFIX:S=${PREFIX}/==} MANPREFIX=${MANPREFIX:S=$=/=:S=${PRE PKGMESSAGE= ${WRKSRC}/pkg-message MILTER_SOVER?= 6 -OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL DOCS -OPTIONS_DEFAULT?= SHMEM SEM LA NIS IPV6 PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL +OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL TLSEXT_PADDING DOCS +OPTIONS_DEFAULT?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL NO_OPTIONS_SORT=yes SHMEM_DESC= System V shared memory support LA_DESC= load averages support @@ -45,6 +45,7 @@ PICKY_HELO_CHECK_DESC= Enable picky HELO check MILTER_DESC= Build libmilter MILTER_SHARED_DESC= Build shared libmilter MILTER_POOL_DESC= Enable milter thread pools +TLSEXT_PADDING_DESC= Enable TLSEXT padding BDB_USE= BDB=yes LDAP_USE= OPENLDAP=yes @@ -81,6 +82,9 @@ EXTRA_PATCHES+= ${FILESDIR}/cyruslookup.patch .if ${PORT_OPTIONS:MTLS} TLS_SUFFIX?= +tls CONFLICTS+= sendmail-ldap-8.* sendmail-sasl-8.* sendmail-sasl2-8.* +.if ! ${PORT_OPTIONS:MTLSEXT_PADDING} +EXTRA_PATCHES+= ${FILESDIR}/tlsext.patch +.endif .endif MAKE_PKGNAMES= for i in "" +tls; do \ @@ -91,7 +95,7 @@ MAKE_PKGNAMES= for i in "" +tls; do \ done done done done ALL_PKGNAMES!= ${MAKE_PKGNAMES} -CONFLICTS2!= ${MAKE_PKGNAMES} | grep -v "${PORTNAME}${PKGNAMESUFFIX}-8." +CONFLICTS2!= ${MAKE_PKGNAMES} | grep -v "${PORTNAME}${PKGNAMESUFFIX:S|${PKGNAMESUFFIX2}||}-8." CONFLICTS+= ${CONFLICTS2} # Build site.config.m4 diff --git a/mail/sendmail/files/tlsext.patch b/mail/sendmail/files/tlsext.patch new file mode 100644 index 000000000000..dc6b0eb89170 --- /dev/null +++ b/mail/sendmail/files/tlsext.patch @@ -0,0 +1,13 @@ +--- sendmail/readcf.c.orig 2014-05-16 22:40:15.000000000 +0200 ++++ sendmail/readcf.c 2014-08-14 18:05:59.000000000 +0200 +@@ -124,6 +124,10 @@ + | SSL_OP_NO_TICKET + #endif + ; ++#ifdef SSL_OP_TLSEXT_PADDING ++ Srv_SSL_Options &= ~SSL_OP_TLSEXT_PADDING; ++ Clt_SSL_Options &= ~SSL_OP_TLSEXT_PADDING; ++#endif + #endif /* STARTTLS */ + if (DontLockReadFiles) + sff |= SFF_NOLOCK; |