From 63367c322a9a4fca2d093fb204f0018b0ec8c8a9 Mon Sep 17 00:00:00 2001
From: dinoex <dinoex@FreeBSD.org>
Date: Sun, 11 Mar 2001 07:03:34 +0000
Subject: sendmail -- TLS/SASL/SFIO enhancement: This is a diff to the current
 port that implements SFIO and SASL options support in addition to TLS.  It
 makes the sendmail port conform more closely to the available documentation
 for such security enhancements.

ken@nova.org
- renamed option from SENDMAIL_WITH_TSL to SENDMAIL_WITH_TLS
- new option SENDMAIL_WITH_SFIO
- fixed bug in site.config.m4.sasl

PR:		25661
Submitted by:	ken@nova.org
---
 mail/sendmail811/Makefile                  | 13 ++++++++++---
 mail/sendmail811/files/site.config.m4.sasl |  4 ++--
 mail/sendmail811/files/site.config.m4.sfio |  6 ++++++
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 mail/sendmail811/files/site.config.m4.sfio

(limited to 'mail/sendmail811')

diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index 07e4ffa..55174e3 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -19,29 +19,36 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WCONF=		${WRKSRC}/devtools/Site
 PLIST=		${WRKDIR}/.PLIST.more
 
-.if defined(SENDMAIL_WITH_TSL)
+.if defined(SENDMAIL_WITH_TLS)
 USE_OPENSSL=	yes
 .endif
 .if defined(SENDMAIL_WITH_SASL)
 BUILD_DEPENDS=	${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
 .endif
+.if defined(SENDMAIL_WITH_SFIO)
+BUILD_DEPENDS=	${LOCALBASE}/lib/libsfio.a:${PORTSDIR}/devel/sfio
+.endif
 
 .if exists(${DESTDIR}/etc/mail/mailer.conf)
 pre-configure:
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
 		${FILESDIR}/site.config.m4 > ${WCONF}/site.config.m4
-.if defined(SENDMAIL_WITH_TSL)
+.if defined(SENDMAIL_WITH_TLS)
 	${CAT} ${FILESDIR}/site.config.m4.tls >> ${WCONF}/site.config.m4
 .endif
 .if defined(SENDMAIL_WITH_SASL)
 	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
 		${FILESDIR}/site.config.m4.sasl >>${WCONF}/site.config.m4
 .endif
+.if defined(SENDMAIL_WITH_SFIO)
+	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
+		${FILESDIR}/site.config.m4.sfio >>${WCONF}/site.config.m4
+.endif
 .else
 pre-configure:
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
 		${FILESDIR}/site.config.m4.pre4 > ${WCONF}/site.config.m4
-.if defined(SENDMAIL_WITH_TSL)
+.if defined(SENDMAIL_WITH_TLS)
 	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
 		${FILESDIR}/site.config.m4.ssl >> ${WCONF}/site.config.m4
 .endif
diff --git a/mail/sendmail811/files/site.config.m4.sasl b/mail/sendmail811/files/site.config.m4.sasl
index 7b8813c..0eb9092 100644
--- a/mail/sendmail811/files/site.config.m4.sasl
+++ b/mail/sendmail811/files/site.config.m4.sasl
@@ -1,5 +1,5 @@
 APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DDSASL')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL')
+APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
+APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL -D_FFR_SASL_OPTS')
 APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
 APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
diff --git a/mail/sendmail811/files/site.config.m4.sfio b/mail/sendmail811/files/site.config.m4.sfio
new file mode 100644
index 0000000..9abe6d4
--- /dev/null
+++ b/mail/sendmail811/files/site.config.m4.sfio
@@ -0,0 +1,6 @@
+define(`confSTDIO_TYPE', `portable')
+APPENDDEF(`confENVDEF', `-U_FFR_TLS_TOREK -DSFIO')
+APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include/sfio')
+APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
+APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
+APPENDDEF(`confLIBS', `-lsfio')
-- 
cgit v1.1