diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2014-12-10 14:24:17 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2014-12-10 14:24:17 +0000 |
| commit | 0275ae5d481da766b72a1550dfcd7898ad7cb185 (patch) | |
| tree | cc1f6c9a1d3b2c4157d4be73c1f93808e568dbab /mail/sendmail | |
| parent | Update "BSD" license in security category (diff) | |
- update to 8.15.1
- cleanup options
- tlsext.patch removed, now part of distribution
Notes
Notes:
svn path=/head/; revision=374459
Diffstat (limited to 'mail/sendmail')
| -rw-r--r-- | mail/sendmail/Makefile | 6 | ||||
| -rw-r--r-- | mail/sendmail/distinfo | 4 | ||||
| -rw-r--r-- | mail/sendmail/files/site.config.m4.ipv6 | 1 | ||||
| -rw-r--r-- | mail/sendmail/files/site.config.m4.pre4 | 1 | ||||
| -rw-r--r-- | mail/sendmail/files/site.config.m4.tls | 1 | ||||
| -rw-r--r-- | mail/sendmail/files/tlsext.patch | 13 |
6 files changed, 4 insertions, 22 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 558c0784c6ce..e37fb3c60b39 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sendmail -PORTVERSION= 8.14.9 -PORTREVISION= 3 +PORTVERSION= 8.15.1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,} @@ -82,9 +81,6 @@ 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 \ diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo index d34db0fb4648..0e5f1aca95e6 100644 --- a/mail/sendmail/distinfo +++ b/mail/sendmail/distinfo @@ -1,2 +1,2 @@ -SHA256 (sendmail.8.14.9.tar.gz) = f5a497151abd8f341cca0736c3f9bd703d574d93146b2989689dff6d7a445d75 -SIZE (sendmail.8.14.9.tar.gz) = 2114293 +SHA256 (sendmail.8.15.1.tar.gz) = ed1f9e0f2a1a58c9ff94950264a2fc186d6fd237bac66b175d79a2b89a950746 +SIZE (sendmail.8.15.1.tar.gz) = 2186562 diff --git a/mail/sendmail/files/site.config.m4.ipv6 b/mail/sendmail/files/site.config.m4.ipv6 index 41f0cccf3a1d..5040616c1823 100644 --- a/mail/sendmail/files/site.config.m4.ipv6 +++ b/mail/sendmail/files/site.config.m4.ipv6 @@ -1,2 +1,3 @@ APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6') APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6') +APPENDDEF(`conf_libsm_ENVDEF', `-DNETINET6') diff --git a/mail/sendmail/files/site.config.m4.pre4 b/mail/sendmail/files/site.config.m4.pre4 index 384a8ec2334e..99835cc669c5 100644 --- a/mail/sendmail/files/site.config.m4.pre4 +++ b/mail/sendmail/files/site.config.m4.pre4 @@ -1,3 +1,2 @@ -APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY') APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""') APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""') diff --git a/mail/sendmail/files/site.config.m4.tls b/mail/sendmail/files/site.config.m4.tls index e310d3fc3601..ce46df9dc9fd 100644 --- a/mail/sendmail/files/site.config.m4.tls +++ b/mail/sendmail/files/site.config.m4.tls @@ -1,3 +1,2 @@ APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS') -APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_1') APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto') diff --git a/mail/sendmail/files/tlsext.patch b/mail/sendmail/files/tlsext.patch deleted file mode 100644 index dc6b0eb89170..000000000000 --- a/mail/sendmail/files/tlsext.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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; |