diff options
author | dinoex <dinoex@FreeBSD.org> | 2001-03-11 15:03:34 +0800 |
---|---|---|
committer | dinoex <dinoex@FreeBSD.org> | 2001-03-11 15:03:34 +0800 |
commit | 63367c322a9a4fca2d093fb204f0018b0ec8c8a9 (patch) | |
tree | 7d411a61760d9b7d1d2bcdd11b4f6f276a6cc570 /mail | |
parent | fed677f31d43a77ad8ec48e66f328c033168b439 (diff) | |
download | freebsd-ports-gnome-63367c322a9a4fca2d093fb204f0018b0ec8c8a9.tar.gz freebsd-ports-gnome-63367c322a9a4fca2d093fb204f0018b0ec8c8a9.tar.zst freebsd-ports-gnome-63367c322a9a4fca2d093fb204f0018b0ec8c8a9.zip |
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
Diffstat (limited to 'mail')
-rw-r--r-- | mail/sendmail-old/Makefile | 13 | ||||
-rw-r--r-- | mail/sendmail-old/files/site.config.m4.sasl | 4 | ||||
-rw-r--r-- | mail/sendmail-old/files/site.config.m4.sfio | 6 | ||||
-rw-r--r-- | mail/sendmail/Makefile | 13 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4.sasl | 4 | ||||
-rw-r--r-- | mail/sendmail/files/site.config.m4.sfio | 6 | ||||
-rw-r--r-- | mail/sendmail811/Makefile | 13 | ||||
-rw-r--r-- | mail/sendmail811/files/site.config.m4.sasl | 4 | ||||
-rw-r--r-- | mail/sendmail811/files/site.config.m4.sfio | 6 | ||||
-rw-r--r-- | mail/sendmail812/Makefile | 13 | ||||
-rw-r--r-- | mail/sendmail812/files/site.config.m4.sasl | 4 | ||||
-rw-r--r-- | mail/sendmail812/files/site.config.m4.sfio | 6 |
12 files changed, 72 insertions, 20 deletions
diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile index 07e4ffa8bb08..55174e30b821 100644 --- a/mail/sendmail-old/Makefile +++ b/mail/sendmail-old/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/sendmail-old/files/site.config.m4.sasl b/mail/sendmail-old/files/site.config.m4.sasl index 7b8813c8c15e..0eb90926903e 100644 --- a/mail/sendmail-old/files/site.config.m4.sasl +++ b/mail/sendmail-old/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/sendmail-old/files/site.config.m4.sfio b/mail/sendmail-old/files/site.config.m4.sfio new file mode 100644 index 000000000000..9abe6d48d7b3 --- /dev/null +++ b/mail/sendmail-old/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') diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 07e4ffa8bb08..55174e30b821 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/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/sendmail/files/site.config.m4.sasl b/mail/sendmail/files/site.config.m4.sasl index 7b8813c8c15e..0eb90926903e 100644 --- a/mail/sendmail/files/site.config.m4.sasl +++ b/mail/sendmail/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/sendmail/files/site.config.m4.sfio b/mail/sendmail/files/site.config.m4.sfio new file mode 100644 index 000000000000..9abe6d48d7b3 --- /dev/null +++ b/mail/sendmail/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') diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile index 07e4ffa8bb08..55174e30b821 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 7b8813c8c15e..0eb90926903e 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 000000000000..9abe6d48d7b3 --- /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') diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile index 07e4ffa8bb08..55174e30b821 100644 --- a/mail/sendmail812/Makefile +++ b/mail/sendmail812/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/sendmail812/files/site.config.m4.sasl b/mail/sendmail812/files/site.config.m4.sasl index 7b8813c8c15e..0eb90926903e 100644 --- a/mail/sendmail812/files/site.config.m4.sasl +++ b/mail/sendmail812/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/sendmail812/files/site.config.m4.sfio b/mail/sendmail812/files/site.config.m4.sfio new file mode 100644 index 000000000000..9abe6d48d7b3 --- /dev/null +++ b/mail/sendmail812/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') |