 @@ -1,41 +1,45 @@
-# $NetBSD: Makefile,v 1.31 2017/01/14 23:00:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.31.2.1 2017/04/17 16:12:20 bsiegert Exp $
+#
-DISTNAME=		qmail-run-20170114
+DISTNAME=		qmail-run-20170404
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 MAINTAINER=		schmonz@NetBSD.org
 COMMENT=		Configures qmail to receive and deliver mail
 LICENSE=		2-clause-bsd
 DEPENDS+=		mess822-[0-9]*:../../mail/mess822
 DEPENDS_QMAIL=		qmail>=1.03nb8:../../mail/qmail
 DEPENDS+=		${DEPENDS_QMAIL}
 CONFLICTS+=		qmail-qfilter-1.5nb1
 WRKSRC=			${WRKDIR}
 NO_BUILD=		yes
 NO_CHECKSUM=		yes
 FILES_SUBST+=		QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
 FILES_SUBST+=		QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
 FILES_SUBST+=		QMAIL_SEND_USER=${QMAIL_SEND_USER:Q}
 FILES_SUBST+=		QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
 MESSAGE_SUBST+=		PKG_SYSCONFBASE=${PKG_SYSCONFBASE}
 RCD_SCRIPTS=		qmail qmailofmipd qmailpop3d qmailqread qmailsend qmailsmtpd
 INSTALLATION_DIRS=	bin share/doc/qmail-run share/examples/qmail-run
 BUILD_DEFS+=		QMAIL_DAEMON_USER QMAIL_LOG_USER QMAIL_SEND_USER
 BUILD_DEFS+=		QMAIL_QUEUE_EXTRA
 .include "../../mk/bsd.prefs.mk"
 # Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
 # config files there and refer to them from rc.d scripts.
+#
 .if !defined(PKG_SYSCONFDIR.qmail-run)
 PKG_SYSCONFDIR.qmail-run!=						\
 	${PKG_INFO} -Q PKG_SYSCONFDIR					\
 		${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null ||		\
 	${ECHO} "PKG_SYSCONFDIR.qmail-run_not_set"
 .  if empty(PKG_SYSCONFDIR.qmail-run:M*not_set)

 @@ -1,64 +1,64 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailofmipd.sh,v 1.1 2017/01/09 04:58:09 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.1.2.1 2017/04/17 16:12:20 bsiegert Exp $
+#
 # @PKGNAME@ script to control ofmipd (SMTP submission service).
+#
 # PROVIDE: qmailofmipd mail
 # REQUIRE: qmailsend
 name="qmailofmipd"
 # User-settable rc.conf variables and their default values:
 : ${qmailofmipd_postenv:=""}
 : ${qmailofmipd_tcpflags:="-vRl0"}
 : ${qmailofmipd_tcphost:="127.0.0.1"}
 : ${qmailofmipd_tcpport:="26"}
 : ${qmailofmipd_datalimit:="146800640"}
 : ${qmailofmipd_pretcpserver:=""}
 : ${qmailofmipd_preofmipd:=""}
 : ${qmailofmipd_postofmipd:=""}
 : ${qmailofmipd_log:="YES"}
 : ${qmailofmipd_logcmd:="logger -t nb${name} -p mail.info"}
-: ${qmailofmipd_nologcmd:="/usr/pkg/bin/multilog -*"}
+: ${qmailofmipd_nologcmd:="@PREFIX@/bin/multilog -*"}
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/control/concurrencyofmip"
 required_files="${required_files} @PKG_SYSCONFDIR@/tcp.ofmip.cdb"
 required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
-command="/usr/pkg/bin/tcpserver"
+command="@PREFIX@/bin/tcpserver"
 procname=${name}
 start_precmd="qmailofmipd_precmd"
 extra_commands="stat pause cont cdb"
 stat_cmd="qmailofmipd_stat"
 pause_cmd="qmailofmipd_pause"
 cont_cmd="qmailofmipd_cont"
 cdb_cmd="qmailofmipd_cdb"
 qmailofmipd_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 "qmailofmipd".
 	if [ -f /etc/rc.subr ]; then
 		checkyesno qmailofmipd_log || qmailofmipd_logcmd=${qmailofmipd_nologcmd}
 	fi
-	command="/usr/bin/env - ${qmailofmipd_postenv} /usr/pkg/bin/softlimit -m ${qmailofmipd_datalimit} ${qmailofmipd_pretcpserver} /usr/pkg/bin/argv0 /usr/pkg/bin/tcpserver ${name} ${qmailofmipd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.ofmip.cdb -c `/usr/bin/head -1 @PKG_SYSCONFDIR@/control/concurrencyofmip` -u `/usr/bin/id -u qmaild` -g `/usr/bin/id -g qmaild` ${qmailofmipd_tcphost} ${qmailofmipd_tcpport} ${qmailofmipd_preofmipd} /usr/pkg/bin/ofmipd ${qmailofmipd_postofmipd} 2>&1 | /usr/pkg/bin/setuidgid qmaill ${qmailofmipd_logcmd}"
+	command="@SETENV@ - ${qmailofmipd_postenv} @PREFIX@/bin/softlimit -m ${qmailofmipd_datalimit} ${qmailofmipd_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailofmipd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.ofmip.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyofmip` -u `@ID@ -u @QMAIL_DAEMON_USER@` -g `@ID@ -g @QMAIL_DAEMON_USER@` ${qmailofmipd_tcphost} ${qmailofmipd_tcpport} ${qmailofmipd_preofmipd} @PREFIX@/bin/ofmipd ${qmailofmipd_postofmipd} 2>&1 | @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailofmipd_logcmd}"
 	command_args="&"
 	rc_flags=""
+}
 qmailofmipd_stat()
+{
 	run_rc_command status
+}
 qmailofmipd_pause()
+{
 	if ! statusmsg=`run_rc_command status`; then
 		echo $statusmsg
 @@ -71,25 +71,25 @@ qmailofmipd_pause()
 qmailofmipd_cont()
+{
 	if ! statusmsg=`run_rc_command status`; then
 		echo $statusmsg
 		return 1
 	fi
 	echo "Continuing ${name}."
 	kill -CONT $rc_pid
+}
 qmailofmipd_cdb()
+{
 	echo "Reloading @PKG_SYSCONFDIR@/tcp.ofmip."
-	/usr/pkg/bin/tcprules @PKG_SYSCONFDIR@/tcp.ofmip.cdb @PKG_SYSCONFDIR@/tcp.ofmip.tmp < @PKG_SYSCONFDIR@/tcp.ofmip
+	@PREFIX@/bin/tcprules @PKG_SYSCONFDIR@/tcp.ofmip.cdb @PKG_SYSCONFDIR@/tcp.ofmip.tmp < @PKG_SYSCONFDIR@/tcp.ofmip
 	/bin/chmod 644 @PKG_SYSCONFDIR@/tcp.ofmip.cdb
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	echo -n " ${name}"
 	qmailofmipd_precmd
 	eval ${command} ${qmailofmipd_flags} ${command_args}
 fi

	@@ -1,16 +1,16 @@		@@ -1,16 +1,16 @@
1	#!@RCD_SCRIPTS_SHELL@	1	#!@RCD_SCRIPTS_SHELL@
2	#	2	#
3	# $NetBSD: qmailpop3d.sh,v 1.10 2015/11/25 12:51:30 jperkin Exp $	3	# $NetBSD: qmailpop3d.sh,v 1.10.12.1 2017/04/17 16:12:20 bsiegert Exp $
4	#	4	#
5	# @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).	5	# @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
6	#	6	#
7		7
8	# PROVIDE: qmailpop3d mail	8	# PROVIDE: qmailpop3d mail
9		9
10	name="qmailpop3d"	10	name="qmailpop3d"
11		11
12	# User-settable rc.conf variables and their default values:	12	# User-settable rc.conf variables and their default values:
13	: ${qmailpop3d_postenv:=""}	13	: ${qmailpop3d_postenv:=""}
14	: ${qmailpop3d_tcpflags:="-vRHl0"}	14	: ${qmailpop3d_tcpflags:="-vRHl0"}
15	: ${qmailpop3d_tcphost:="0"}	15	: ${qmailpop3d_tcphost:="0"}
16	: ${qmailpop3d_tcpport:="110"}	16	: ${qmailpop3d_tcpport:="110"}
	@@ -38,27 +38,27 @@ extra_commands="stat pause cont cdb"		@@ -38,27 +38,27 @@ extra_commands="stat pause cont cdb"
38	stat_cmd="qmailpop3d_stat"	38	stat_cmd="qmailpop3d_stat"
39	pause_cmd="qmailpop3d_pause"	39	pause_cmd="qmailpop3d_pause"
40	cont_cmd="qmailpop3d_cont"	40	cont_cmd="qmailpop3d_cont"
41	cdb_cmd="qmailpop3d_cdb"	41	cdb_cmd="qmailpop3d_cdb"
42		42
43	qmailpop3d_precmd()	43	qmailpop3d_precmd()
44	{	44	{
45	# tcpserver(1) is akin to inetd(8), but runs one service per process.	45	# tcpserver(1) is akin to inetd(8), but runs one service per process.
46	# We want to signal only the tcpserver process responsible for POP	46	# We want to signal only the tcpserver process responsible for POP
47	# service. Use argv0(1) to set procname to "qmailpop3d".	47	# service. Use argv0(1) to set procname to "qmailpop3d".
48	if [ -f /etc/rc.subr ]; then	48	if [ -f /etc/rc.subr ]; then
49	checkyesno qmailpop3d_log \|\| qmailpop3d_logcmd=${qmailpop3d_nologcmd}	49	checkyesno qmailpop3d_log \|\| qmailpop3d_logcmd=${qmailpop3d_nologcmd}
50	fi	50	fi
51	command="@SETENV@ - ${qmailpop3d_postenv} @PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @PREFIX@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 \| @PREFIX@/bin/setuidgid qmaill ${qmailpop3d_logcmd}"	51	command="@SETENV@ - ${qmailpop3d_postenv} @PREFIX@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @PREFIX@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 \| @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailpop3d_logcmd}"
52	command_args="&"	52	command_args="&"
53	rc_flags=""	53	rc_flags=""
54	}	54	}
55		55
56	qmailpop3d_stat()	56	qmailpop3d_stat()
57	{	57	{
58	run_rc_command status	58	run_rc_command status
59	}	59	}
60		60
61	qmailpop3d_pause()	61	qmailpop3d_pause()
62	{	62	{
63	if ! statusmsg=`run_rc_command status`; then	63	if ! statusmsg=`run_rc_command status`; then
64	@ECHO@ $statusmsg	64	@ECHO@ $statusmsg

	@@ -1,16 +1,16 @@		@@ -1,16 +1,16 @@
1	#!@RCD_SCRIPTS_SHELL@	1	#!@RCD_SCRIPTS_SHELL@
2	#	2	#
3	# $NetBSD: qmailsmtpd.sh,v 1.10 2015/11/25 12:51:30 jperkin Exp $	3	# $NetBSD: qmailsmtpd.sh,v 1.10.12.1 2017/04/17 16:12:20 bsiegert Exp $
4	#	4	#
5	# @PKGNAME@ script to control qmail-smtpd (SMTP service).	5	# @PKGNAME@ script to control qmail-smtpd (SMTP service).
6	#	6	#
7		7
8	# PROVIDE: qmailsmtpd mail	8	# PROVIDE: qmailsmtpd mail
9	# REQUIRE: qmailsend	9	# REQUIRE: qmailsend
10		10
11	name="qmailsmtpd"	11	name="qmailsmtpd"
12		12
13	# User-settable rc.conf variables and their default values:	13	# User-settable rc.conf variables and their default values:
14	: ${qmailsmtpd_postenv:="QMAILQUEUE=@PREFIX@/bin/qmail-queue"}	14	: ${qmailsmtpd_postenv:="QMAILQUEUE=@PREFIX@/bin/qmail-queue"}
15	: ${qmailsmtpd_tcpflags:="-vRl0"}	15	: ${qmailsmtpd_tcpflags:="-vRl0"}
16	: ${qmailsmtpd_tcphost:="0"}	16	: ${qmailsmtpd_tcphost:="0"}
	@@ -38,27 +38,27 @@ extra_commands="stat pause cont cdb"		@@ -38,27 +38,27 @@ extra_commands="stat pause cont cdb"
38	stat_cmd="qmailsmtpd_stat"	38	stat_cmd="qmailsmtpd_stat"
39	pause_cmd="qmailsmtpd_pause"	39	pause_cmd="qmailsmtpd_pause"
40	cont_cmd="qmailsmtpd_cont"	40	cont_cmd="qmailsmtpd_cont"
41	cdb_cmd="qmailsmtpd_cdb"	41	cdb_cmd="qmailsmtpd_cdb"
42		42
43	qmailsmtpd_precmd()	43	qmailsmtpd_precmd()
44	{	44	{
45	# tcpserver(1) is akin to inetd(8), but runs one service per process.	45	# tcpserver(1) is akin to inetd(8), but runs one service per process.
46	# We want to signal only the tcpserver process responsible for SMTP	46	# We want to signal only the tcpserver process responsible for SMTP
47	# service. Use argv0(1) to set procname to "qmailsmtpd".	47	# service. Use argv0(1) to set procname to "qmailsmtpd".
48	if [ -f /etc/rc.subr ]; then	48	if [ -f /etc/rc.subr ]; then
49	checkyesno qmailsmtpd_log \|\| qmailsmtpd_logcmd=${qmailsmtpd_nologcmd}	49	checkyesno qmailsmtpd_log \|\| qmailsmtpd_logcmd=${qmailsmtpd_nologcmd}
50	fi	50	fi
51	command="@SETENV@ - ${qmailsmtpd_postenv} @PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u qmaild` -g `@ID@ -g qmaild` ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @PREFIX@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 \| @PREFIX@/bin/setuidgid qmaill ${qmailsmtpd_logcmd}"	51	command="@SETENV@ - ${qmailsmtpd_postenv} @PREFIX@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} ${qmailsmtpd_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@` ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @PREFIX@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 \| @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailsmtpd_logcmd}"
52	command_args="&"	52	command_args="&"
53	rc_flags=""	53	rc_flags=""
54	}	54	}
55		55
56	qmailsmtpd_stat()	56	qmailsmtpd_stat()
57	{	57	{
58	run_rc_command status	58	run_rc_command status
59	}	59	}
60		60
61	qmailsmtpd_pause()	61	qmailsmtpd_pause()
62	{	62	{
63	if ! statusmsg=`run_rc_command status`; then	63	if ! statusmsg=`run_rc_command status`; then
64	@ECHO@ $statusmsg	64	@ECHO@ $statusmsg

 @@ -1,16 +1,16 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: qmailqread.sh,v 1.8 2015/11/25 12:51:30 jperkin Exp $
+# $NetBSD: qmailqread.sh,v 1.8.12.1 2017/04/17 16:12:20 bsiegert Exp $
+#
 # @PKGNAME@ script to control a service providing local non-root
 # users access to see the queue. Adapted from a script by Steinar Haug.
+#
 # PROVIDE: qmailqread mail
 # REQUIRE: qmailsend
 name="qmailqread"
 # User-settable rc.conf variables and their default values:
 : ${qmailqread_log:="YES"}
 : ${qmailqread_logcmd:="logger -t nb${name} -p mail.info"}
 @@ -20,26 +20,26 @@ if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcvar=${name}
 command="@PREFIX@/bin/tcpserver"
 procname=${name}
 start_precmd="qmailqread_precmd"
 qmailqread_precmd()
+{
 	if [ -f /etc/rc.subr ]; then
 		checkyesno qmailqread_log || qmailqread_logcmd=${qmailqread_nologcmd}
 	fi
-	command="@SETENV@ - @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} -R -1 -u `@ID@ -u qmails` -g `@ID@ -g qmails` 127.0.0.1 20025 @PREFIX@/bin/qmail-qread 2>&1 | @PREFIX@/bin/setuidgid qmaill ${qmailqread_logcmd}"
+	command="@SETENV@ - @PREFIX@/bin/argv0 @PREFIX@/bin/tcpserver ${name} -R -1 -u `@ID@ -u @QMAIL_SEND_USER@` -g `@ID@ -g @QMAIL_SEND_USER@` 127.0.0.1 20025 @PREFIX@/bin/qmail-qread 2>&1 | @PREFIX@/bin/setuidgid @QMAIL_LOG_USER@ ${qmailqread_logcmd}"
 	command_args="&"
 	rc_flags=""
+}
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO_N@ " ${name}"
 	qmailqread_precmd
 	eval ${command} ${qmailqread_flags} ${command_args}
 fi

 @@ -1,3 +1,3 @@
 This package creates all the needed basic config files to run qmail,
-and provides NetBSD-style rc.d scripts and an example mailer.conf.
+provides example {mailer,spamdyke,stunnel}.conf and wrapper scripts for
-It also includes wrapper scripts for procmail and qmail-qfilter.
+procmail and qmail-qfilter, and installs NetBSD-style rc.d scripts.