Added support for TLS. To use this, set POSTFIX_USE_TLS=YES

in /etc/mk.conf. To verify the TLS support, type

# /usr/pkg/sbin/postconf | grep tls

Submitted by Dawid Szymanski in pkg/17570.

4 files changed, 39 insertions, 3 deletions

diff --git a/mail/postfix/MESSAGE.tls b/mail/postfix/MESSAGE.tls
new file mode 100644
index 00000000000..d3fc8a16df6
--- /dev/null
+++ b/mail/postfix/MESSAGE.tls
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE.tls,v 1.1 2002/07/22 10:39:26 martti Exp $
+
+To enable TLS, you might need to reconfigure /etc/postfix/main.cf and
+/etc/postfix/master.cf (See ${PREFIX}/share/postfix/sample-tls.cf.)
+
+master.cf:
+----------
+ tlsmgr    fifo  -       -       y       300     1       tlsmgr
+ smtps     inet  n       -       y       -       -       smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
+ submission inet n       -       y       -       -       smtpd -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+
+===========================================================================
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index e8e0dc64388..d01f663d41b 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2002/07/03 11:11:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.67 2002/07/22 10:39:26 martti Exp $
 
 DISTNAME=	postfix-1.1.11
 PKGREVISION=	1
@@ -25,7 +25,8 @@ POSTFIX_SPOOL=	/var/spool/postfix
 
 .if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES" \
 	|| defined(USE_SASL) && ${USE_SASL} == "YES" \
-	|| defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
+	|| defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES" \
+	|| defined(POSTFIX_USE_TLS) && ${POSTFIX_USE_TLS} == "YES"
 CCARGS=		-I${LOCALBASE}/include
 AUXLIBS=	-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
 MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
@@ -56,6 +57,18 @@ MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 BUILD_DEFS+=	USE_SASL
 .endif
 
+.if defined(POSTFIX_USE_TLS) && ${POSTFIX_USE_TLS} == "YES"
+PATCH_SITES+=	http://people.arhea.net/dawszy/NetBSD/postfix_tls/
+PATCHFILES+=	pfixtls-1.1.11.diff.gz
+PATCH_DIST_STRIP=	-p1
+CCARGS+=	-DHAS_SSL
+AUXLIBS+=	-lssl -lcrypto
+PLIST_SRC+=	${PKGDIR}/PLIST.tls
+MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
+BUILD_DEFS+=	POSTFIX_USE_TLS
+.endif
+
+MESSAGE_SRC+=	${PKGDIR}/MESSAGE
 PLIST_SRC+=	${PKGDIR}/PLIST
 ALL_TARGET=	#empty
 MAKE_ENV=	CC="${CC}" OPT="${CFLAGS}"
@@ -134,4 +147,8 @@ post-install:
 	${TEST} -f /etc/postfix/master.cf || \
 		${INSTALL_DATA} ${PREFIX}/share/postfix/master.cf /etc/postfix
 
+.if defined(POSTFIX_USE_TLS) && ${POSTFIX_USE_TLS} == "YES"
+.include "../../security/openssl/buildlink.mk"
+.endif
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/PLIST.tls b/mail/postfix/PLIST.tls
new file mode 100644
index 00000000000..df9f94c520e
--- /dev/null
+++ b/mail/postfix/PLIST.tls
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.tls,v 1.1 2002/07/22 10:39:26 martti Exp $
+libexec/postfix/tlsmgr
+man/man8/tlsmgr.8
+share/postfix/sample-tls.cf
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index d80abf08488..badf96d3bcf 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.23 2002/07/17 22:34:45 itojun Exp $
+$NetBSD: distinfo,v 1.24 2002/07/22 10:39:26 martti Exp $
 
 SHA1 (postfix/postfix-1.1.11.tar.gz) = 3a28c32800f94df0c504df68c4c6191f48217c5c
 Size (postfix/postfix-1.1.11.tar.gz) = 1190741 bytes
+SHA1 (postfix/pfixtls-1.1.11.diff.gz) = 9cf910346d46c106d52e9012c4a84cdd15491cec
+Size (postfix/pfixtls-1.1.11.diff.gz) = 63310 bytes
 SHA1 (patch-aa) = 01d0df30acc0ee454771ade263b6e793d0dba6a4
 SHA1 (patch-ab) = d4e50ffc31d71ff64067101f6d733655fcf76713
 SHA1 (patch-ac) = 0c79f73f1a9327e97ab6e6910d03b479c849d9f4