- Update to 5.4.2p1

- Add OPTIONS for CA bundle, and Redis support
- Switch to OptionsNG helpers
- Remove _smtpf user (not used anymore)

Changes:	http://article.gmane.org/gmane.mail.opensmtpd.general/1415

4 files changed, 41 insertions, 50 deletions

diff --git a/UIDs b/UIDs
index 1e8a25ff63be..253a4a8e711e 100644
--- a/UIDs
+++ b/UIDs
@@ -135,7 +135,6 @@ _adsuck:*:253:253::0:0:Adsuck ad blocking user:/nonexistent:/usr/sbin/nologin
 _tor:*:256:256::0:0:Tor anonymizing router:/var/db/tor:/usr/sbin/nologin
 _smtpd:*:257:257::0:0:OpenSMTPD:/var/empty:/usr/sbin/nologin
 _smtpq:*:258:257::0:0:OpenSMTPD queue user:/var/empty:/usr/sbin/nologin
-_smtpf:*:259:257::0:0:OpenSMTPD filter user:/var/empty:/usr/sbin/nologin
 meta1s:*:260:260::0:0:MeTA1 SMTPS:/nonexistent:/usr/sbin/nologin
 meta1q:*:261:261::0:0:MeTA1 QMGR:/nonexistent:/usr/sbin/nologin
 meta1c:*:262:262::0:0:MeTA1 SMTPC:/nonexistent:/usr/sbin/nologin
diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
index 885dbe3a10e1..3c9be9b4c4ec 100644
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
-PORTVERSION=	5.4.1
+PORTVERSION=	5.4.2
 PORTEPOCH=	1
-PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
 		http://distfiles.pirateparty.in/ashish/
@@ -17,9 +16,11 @@ LICENSE=	ISCL
 
 LIB_DEPENDS=	event-1:${PORTSDIR}/devel/libevent
 
-OPTIONS_DEFINE=	PAM SQLITE MYSQL PGSQL LDAP
+OPTIONS_DEFINE=	CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS
 
-OPTIONS_DEFAULT=	PAM
+OPTIONS_DEFAULT=	CA_BUNDLE PAM
+
+CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
 
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 GNU_CONFIGURE=	yes
@@ -31,51 +32,37 @@ SUB_FILES=	pkg-install pkg-deinstall pkg-message
 
 CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]* opensmtpd-devel-[0-9]*
 
-USERS=		_smtpd _smtpq _smtpf
+USERS=		_smtpd _smtpq
 GROUPS=		_smtpd
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=		MYSQL SQLITE PGSQL LDAP REDIS
 
-USE_OPENSSL=	yes
+CA_BUNDLE_CONFIGURE_ON=	--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
-CFLAGS+=	-I${LOCALBASE}/include/mysql
-LDFLAGS+=	-L${LOCALBASE}/lib/mysql
-CONFIGURE_ARGS+=	--with-experimental-mysql
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
+MYSQL_USE=		MYSQL=yes
+MYSQL_CFLAGS=		-I${LOCALBASE}/include/mysql
+MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+MYSQL_CONFIGURE_ON=	--with-experimental-mysql
 
-.if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=		3
-CONFIGURE_ARGS+=	--with-experimental-sqlite
-PLIST_SUB+=	SQLITE=""
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-PLIST_SUB+=	SQLITE="@comment "
-.endif
+SQLITE_USE=		SQLITE=3
+SQLITE_CFLAGS=		-I${LOCALBASE}/include
+SQLITE_LDFLAGS=		-L${LOCALBASE}/lib
+SQLITE_CONFIGURE_ON=	--with-experimental-sqlite
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-CONFIGURE_ARGS+=	--with-experimental-postgres
-PLIST_SUB+=	PGSQL=""
-.else
-PLIST_SUB+=	PGSQL="@comment "
-.endif
+PGSQL_USE=		PGSQL=yes
+PGSQL_CONFIGURE_ON=	--with-experimental-postgres
 
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=	--with-experimental-ldap
-PLIST_SUB+=	LDAP=""
-.else
-PLIST_SUB+=	LDAP="@comment "
-.endif
+LDAP_CONFIGURE_ON=	--with-experimental-ldap
 
-.if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=	--with-pam
-.endif
+PAM_CONFIGURE_ON=	--with-pam --with-pam-service=smtpd
+
+REDIS_LIB_DEPENDS=	hiredis:${PORTSDIR}/databases/hiredis
+REDIS_CONFIGURE_ON=	--with-experimental-redis
+
+.include <bsd.port.options.mk>
+
+USE_OPENSSL=	yes
 
 # FreeBSD 7.3 and earlier need to use OpenSSL from ports
 .if ${OSVERSION} < 704000
diff --git a/mail/opensmtpd/distinfo b/mail/opensmtpd/distinfo
index 49f2a1c481a5..46d199ec292b 100644
--- a/mail/opensmtpd/distinfo
+++ b/mail/opensmtpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-5.4.1p1.tar.gz) = 7debbf7e55ff3687617ae2c3b38e1cf30574b96f56b869e597c0e98478e5b5d9
-SIZE (opensmtpd-5.4.1p1.tar.gz) = 871745
+SHA256 (opensmtpd-5.4.2p1.tar.gz) = 4ffaf48d3d044ef8be1bd80c8972c87ba830a21bb330b85a59f6a70da5fbd9a2
+SIZE (opensmtpd-5.4.2p1.tar.gz) = 881853
diff --git a/mail/opensmtpd/pkg-plist b/mail/opensmtpd/pkg-plist
index fd26460401ee..551c52c0e605 100644
--- a/mail/opensmtpd/pkg-plist
+++ b/mail/opensmtpd/pkg-plist
@@ -11,18 +11,23 @@ libexec/opensmtpd/table-passwd
 %%SQLITE%%libexec/opensmtpd/table-sqlite
 %%LDAP%%libexec/opensmtpd/table-ldap
 %%PGSQL%%libexec/opensmtpd/table-postgres
+%%REDIS%%libexec/opensmtpd/table-redis
 libexec/opensmtpd/scheduler-ram
 libexec/opensmtpd/scheduler-stub
-man/man8/makemap.8.gz
+libexec/opensmtpd/filter-dnsbl
+libexec/opensmtpd/filter-monkey
+libexec/opensmtpd/filter-stub
+libexec/opensmtpd/filter-trace
+sbin/smtpctl
+sbin/smtpd
 man/man8/newaliases.8.gz
 man/man8/sendmail.8.gz
-man/man8/smtpctl.8.gz
 man/man8/smtpd.8.gz
-man/man5/forward.5.gz
-man/man5/aliases.5.gz
+man/man8/makemap.8.gz
+man/man8/smtpctl.8.gz
 man/man5/table.5.gz
 man/man5/smtpd.conf.5.gz
-sbin/smtpctl
-sbin/smtpd
+man/man5/forward.5.gz
+man/man5/aliases.5.gz
 @dirrm libexec/opensmtpd
 @dirrmtry etc/mail