[Midnightbsd-cvs] mports [17887] trunk/mail/sendmail: sendmail 8.15.1

[laffer1 at midnightbsd.org]

Revision: 17887
          http://svnweb.midnightbsd.org/mports/?rev=17887
Author:   laffer1
Date:     2014-12-18 18:50:04 -0500 (Thu, 18 Dec 2014)
Log Message:
-----------
sendmail 8.15.1

Modified Paths:
--------------
    trunk/mail/sendmail/Makefile
    trunk/mail/sendmail/distinfo
    trunk/mail/sendmail/files/site.config.m4.ipv6
    trunk/mail/sendmail/files/site.config.m4.pre4
    trunk/mail/sendmail/files/site.config.m4.ssl
    trunk/mail/sendmail/files/site.config.m4.tls

Removed Paths:
-------------
    trunk/mail/sendmail/files/tlsext.patch

Modified: trunk/mail/sendmail/Makefile
===================================================================
--- trunk/mail/sendmail/Makefile	2014-12-18 04:03:43 UTC (rev 17886)
+++ trunk/mail/sendmail/Makefile	2014-12-18 23:50:04 UTC (rev 17887)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	sendmail
-PORTVERSION=	8.14.9
-PORTREVISION=	3
+PORTVERSION=	8.15.1
+PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
@@ -85,10 +85,7 @@
 .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 \
 	for j in "" +sasl +sasl1 +sasl2; do \

Modified: trunk/mail/sendmail/distinfo
===================================================================
--- trunk/mail/sendmail/distinfo	2014-12-18 04:03:43 UTC (rev 17886)
+++ trunk/mail/sendmail/distinfo	2014-12-18 23:50:04 UTC (rev 17887)
@@ -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

Modified: trunk/mail/sendmail/files/site.config.m4.ipv6
===================================================================
--- trunk/mail/sendmail/files/site.config.m4.ipv6	2014-12-18 04:03:43 UTC (rev 17886)
+++ trunk/mail/sendmail/files/site.config.m4.ipv6	2014-12-18 23:50:04 UTC (rev 17887)
@@ -1,2 +1,3 @@
 APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6')
 APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
+APPENDDEF(`conf_libsm_ENVDEF', `-DNETINET6')

Modified: trunk/mail/sendmail/files/site.config.m4.pre4
===================================================================
--- trunk/mail/sendmail/files/site.config.m4.pre4	2014-12-18 04:03:43 UTC (rev 17886)
+++ trunk/mail/sendmail/files/site.config.m4.pre4	2014-12-18 23:50:04 UTC (rev 17887)
@@ -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\""')

Modified: trunk/mail/sendmail/files/site.config.m4.ssl
===================================================================
--- trunk/mail/sendmail/files/site.config.m4.ssl	2014-12-18 04:03:43 UTC (rev 17886)
+++ trunk/mail/sendmail/files/site.config.m4.ssl	2014-12-18 23:50:04 UTC (rev 17887)
@@ -1,4 +1,4 @@
 APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`confLDOPTS', `-Wl,-rpath=%%LOCALBASE%%/lib')
+APPENDDEF(`confLDOPTS', ``-Wl,-rpath=%%LOCALBASE%%/lib'')
 APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DHASSRANDOMDEV')

Modified: trunk/mail/sendmail/files/site.config.m4.tls
===================================================================
--- trunk/mail/sendmail/files/site.config.m4.tls	2014-12-18 04:03:43 UTC (rev 17886)
+++ trunk/mail/sendmail/files/site.config.m4.tls	2014-12-18 23:50:04 UTC (rev 17887)
@@ -1,3 +1,2 @@
 APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_1')
 APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')

Deleted: trunk/mail/sendmail/files/tlsext.patch
===================================================================
--- trunk/mail/sendmail/files/tlsext.patch	2014-12-18 04:03:43 UTC (rev 17886)
+++ trunk/mail/sendmail/files/tlsext.patch	2014-12-18 23:50:04 UTC (rev 17887)
@@ -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;