Add 'lua' option, enabled by default. Increase default datalimit.

Detach from the controlling terminal with pgrphack(8). Let tcpserver
path be configurable. Bump PKGREVISION.

3 files changed, 20 insertions, 15 deletions

diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index ed96d85358f..1b8d7ae2acc 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2017/04/27 20:18:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2017/07/31 20:38:51 schmonz Exp $
 #
 
 DISTNAME=		mailfront-2.12
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}archive/
 
@@ -14,10 +15,9 @@ DEPENDS+=		daemontools-[0-9]*:../../sysutils/daemontools
 DEPENDS_QMAIL=		qmail>=1.03nb8:../../mail/qmail
 DEPENDS+=		${DEPENDS_QMAIL}
 
-# XXX optional: lua 5 or later ("make lua")
-
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
+BUILD_TARGET=		all
 DJB_CONFIG_CMDS+=	${ECHO} ${PREFIX}/include > conf-include;	\
 			${ECHO} ${PREFIX}/lib/${PKGBASE} > conf-modules;
 
@@ -33,6 +33,8 @@ USE_LIBTOOL=		yes
 
 MAKE_JOBS_SAFE=		no # due to hacky libtoolization
 
+.include "options.mk"
+
 .include "../../mk/bsd.prefs.mk"
 
 post-install:
diff --git a/mail/mailfront/PLIST b/mail/mailfront/PLIST
index 2daaa6ad1eb..7c49e8bad07 100644
--- a/mail/mailfront/PLIST
+++ b/mail/mailfront/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/01/02 02:19:46 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/07/31 20:38:51 schmonz Exp $
 bin/imapfront-auth
 bin/mailfront
 bin/pop3front-auth
@@ -21,6 +21,7 @@ lib/mailfront/plugin-clamav.so
 lib/mailfront/plugin-counters.so
 lib/mailfront/plugin-cvm-authenticate.so
 lib/mailfront/plugin-cvm-validate.so
+${PLIST.lua}lib/mailfront/plugin-lua.so
 lib/mailfront/plugin-mailrules.so
 lib/mailfront/plugin-patterns.so
 lib/mailfront/plugin-qmail-validate.so
diff --git a/mail/mailfront/files/smtpfront.sh b/mail/mailfront/files/smtpfront.sh
index d0bd1a689ac..4f3faae4023 100644
--- a/mail/mailfront/files/smtpfront.sh
+++ b/mail/mailfront/files/smtpfront.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: smtpfront.sh,v 1.2 2017/04/27 20:18:44 schmonz Exp $
+# $NetBSD: smtpfront.sh,v 1.3 2017/07/31 20:38:51 schmonz Exp $
 #
 
 # PROVIDE: smtpfront
@@ -13,8 +13,9 @@ name="smtpfront"
 : ${smtpfront_tcpflags:="-vRl0"}
 : ${smtpfront_tcphost:="0"}
 : ${smtpfront_tcpport:="25"}
-: ${smtpfront_datalimit:="2000000"}
+: ${smtpfront_datalimit:="180000000"}
 : ${smtpfront_pretcpserver:=""}
+: ${smtpfront_tcpserver:="@PREFIX@/bin/tcpserver"}
 : ${smtpfront_presmtpd:=""}
 : ${smtpfront_smtpdcmd:="@PREFIX@/bin/smtpfront-qmail"}
 : ${smtpfront_postsmtpd:=""}
@@ -30,7 +31,7 @@ rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/concurrencyincoming"
 required_files="${required_files} @PKG_SYSCONFDIR@/tcp.smtp.cdb"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
-command="@PREFIX@/bin/tcpserver"
+command="${smtpfront_tcpserver}"
 procname=${name}
 start_precmd="smtpfront_precmd"
 extra_commands="cdb"
@@ -38,22 +39,22 @@ cdb_cmd="smtpfront_cdb"
 
 smtpfront_precmd()
 {
-	# tcpserver(1) is akin to inetd(8), but runs one service per process.
-	# We want to signal only the tcpserver process responsible for SMTP
-	# service. Use argv0(1) to set procname to "smtpfront".
 	if [ -f /etc/rc.subr ] && ! checkyesno smtpfront_log; then
 		smtpfront_logcmd=${smtpfront_nologcmd}
 	fi
-	command="@SETENV@ - ${smtpfront_postenv}
+	# tcpserver(1) is akin to inetd(8), but runs one service per process.
+	# We want to signal only the tcpserver process responsible for SMTP
+	# service. Use argv0(1) to set procname to "smtpfront".
+	command="@PREFIX@/bin/pgrphack @SETENV@ - ${smtpfront_postenv}
 @PREFIX@/bin/softlimit -m ${smtpfront_datalimit} ${smtpfront_pretcpserver}
-@PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name}
+@PREFIX@/bin/argv0 ${smtpfront_tcpserver} ${name}
 ${smtpfront_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb
 -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming`
 -u `@ID@ -u @QMAIL_DAEMON_USER@ ` -g `@ID@ -g @QMAIL_DAEMON_USER@`
 ${smtpfront_tcphost} ${smtpfront_tcpport}
 ${smtpfront_presmtpd} ${smtpfront_smtpdcmd} ${smtpfront_postsmtpd}
 2>&1 |
-@PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${smtpfront_logcmd}"
+@PREFIX@/bin/pgrphack @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${smtpfront_logcmd}"
 	command_args="&"
 	rc_flags=""
 }
@@ -61,8 +62,9 @@ ${smtpfront_presmtpd} ${smtpfront_smtpdcmd} ${smtpfront_postsmtpd}
 smtpfront_cdb()
 {
 	@ECHO@ "Reloading @PKG_SYSCONFDIR@/tcp.smtp."
-	@PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.smtp.cdb @PKG_SYSCONFDIR@/tcp.smtp.tmp < @PKG_SYSCONFDIR@/tcp.smtp
-	@CHMOD@ 644 @PKG_SYSCONFDIR@/tcp.smtp.cdb
+	cd @PKG_SYSCONFDIR@
+	@PREFIX@/bin/tcprules tcp.smtp.cdb tcp.smtp.tmp < tcp.smtp
+	@CHMOD@ 644 tcp.smtp.cdb
 }
 
 if [ -f /etc/rc.subr ]; then