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/files | |
| parent | Update "BSD" license in security category (diff) | |
- update to 8.15.1
- cleanup options
- tlsext.patch removed, now part of distribution
Diffstat (limited to 'mail/sendmail/files')
| -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 |
4 files changed, 1 insertions, 15 deletions
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; |