Date: Thu, 14 Aug 2014 16:37:22 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364856 - in head/mail/sendmail: . files Message-ID: <201408141637.s7EGbM7s082292@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Thu Aug 14 16:37:21 2014 New Revision: 364856 URL: http://svnweb.freebsd.org/changeset/ports/364856 QAT: https://qat.redports.org/buildarchive/r364856/ Log: - 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. Added: head/mail/sendmail/files/tlsext.patch (contents, props changed) Modified: head/mail/sendmail/Makefile Modified: head/mail/sendmail/Makefile ============================================================================== --- head/mail/sendmail/Makefile Thu Aug 14 16:25:11 2014 (r364855) +++ head/mail/sendmail/Makefile Thu Aug 14 16:37:21 2014 (r364856) @@ -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}/ 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 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. .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 Added: head/mail/sendmail/files/tlsext.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/sendmail/files/tlsext.patch Thu Aug 14 16:37:21 2014 (r364856) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408141637.s7EGbM7s082292>