Sun Dec 30 19:09:05 2018 UTC ()
Require latest acceptutils and rejectutils. While here, remove ancient
chkconfig comment in the qmail rc.d script (not sure this ever worked,
and now we have rc.d-boot). Bump version.


(schmonz)
diff -r1.67 -r1.68 pkgsrc/mail/qmail-run/Makefile
diff -r1.8 -r1.9 pkgsrc/mail/qmail-run/files/qmail.sh
cvs diff -r1.67 -r1.68 pkgsrc/mail/qmail-run/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail-run/Makefile 2018/12/16 05:32:07 1.67
+++ pkgsrc/mail/qmail-run/Makefile 2018/12/30 19:09:04 1.68
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.67 2018/12/16 05:32:07 schmonz Exp $ 1# $NetBSD: Makefile,v 1.68 2018/12/30 19:09:04 schmonz Exp $
2# 2#
3 3
4DISTNAME= qmail-run-20181216 4DISTNAME= qmail-run-20181230
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10COMMENT= Configures qmail to receive and deliver mail 10COMMENT= Configures qmail to receive and deliver mail
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13DEPENDS+= greetdelay-[0-9]*:../../mail/greetdelay 13DEPENDS+= greetdelay-[0-9]*:../../mail/greetdelay
14DEPENDS+= greylisting-spp-[0-9]*:../../mail/greylisting-spp 14DEPENDS+= greylisting-spp-[0-9]*:../../mail/greylisting-spp
15DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives 15DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
16DEPENDS_QMAIL= qmail>=1.03nb42:../../mail/qmail 16DEPENDS_QMAIL= qmail>=1.03nb42:../../mail/qmail
17DEPENDS+= ${DEPENDS_QMAIL} 17DEPENDS+= ${DEPENDS_QMAIL}
18DEPENDS+= qmail-acceptutils>=20181128:../../mail/qmail-acceptutils 18DEPENDS+= qmail-acceptutils>=20181228:../../mail/qmail-acceptutils
19DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter 19DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
20DEPENDS+= qmail-rejectutils>=20181128:../../mail/qmail-rejectutils 20DEPENDS+= qmail-rejectutils>=20181230:../../mail/qmail-rejectutils
21DEPENDS+= qmail-spp-spf-[0-9]*:../../mail/qmail-spp-spf 21DEPENDS+= qmail-spp-spf-[0-9]*:../../mail/qmail-spp-spf
22 22
23WRKSRC= ${WRKDIR} 23WRKSRC= ${WRKDIR}
24NO_BUILD= yes 24NO_BUILD= yes
25NO_CHECKSUM= yes 25NO_CHECKSUM= yes
26 26
27FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q} 27FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
28FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q} 28FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
29FILES_SUBST+= QMAIL_SEND_USER=${QMAIL_SEND_USER:Q} 29FILES_SUBST+= QMAIL_SEND_USER=${QMAIL_SEND_USER:Q}
30FILES_SUBST+= PKGNAME=${PKGNAME:Q} 30FILES_SUBST+= PKGNAME=${PKGNAME:Q}
31FILES_SUBST+= UCSPI_SSL_USER=${UCSPI_SSL_USER:Q} 31FILES_SUBST+= UCSPI_SSL_USER=${UCSPI_SSL_USER:Q}
32FILES_SUBST+= UCSPI_SSL_GROUP=${UCSPI_SSL_GROUP:Q} 32FILES_SUBST+= UCSPI_SSL_GROUP=${UCSPI_SSL_GROUP:Q}
33MESSAGE_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q} 33MESSAGE_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
cvs diff -r1.8 -r1.9 pkgsrc/mail/qmail-run/files/qmail.sh (expand / switch to unified diff)

--- pkgsrc/mail/qmail-run/files/qmail.sh 2018/12/14 06:55:07 1.8
+++ pkgsrc/mail/qmail-run/files/qmail.sh 2018/12/30 19:09:05 1.9
@@ -1,24 +1,20 @@ @@ -1,24 +1,20 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: qmail.sh,v 1.8 2018/12/14 06:55:07 schmonz Exp $ 3# $NetBSD: qmail.sh,v 1.9 2018/12/30 19:09:05 schmonz Exp $
4# 4#
5# @PKGNAME@ master script for administrators to control qmail 5# @PKGNAME@ master script for administrators to control qmail
6# services. Usage resembles the qmailctl script from "Life with qmail". 6# services. Usage resembles the qmailctl script from "Life with qmail".
7# 7#
8# For Red Hat chkconfig 
9# chkconfig: - 80 30 
10# description: the qmail MTA 
11# 
12 8
13# KEYWORD: nostart 9# KEYWORD: nostart
14 10
15if [ -f /etc/rc.subr ]; then 11if [ -f /etc/rc.subr ]; then
16 . /etc/rc.subr 12 . /etc/rc.subr
17fi 13fi
18 14
19rcd_dir=`@DIRNAME@ $0` 15rcd_dir=`@DIRNAME@ $0`
20 16
21# NOTE: run_rc_command sets $rc_arg 17# NOTE: run_rc_command sets $rc_arg
22# 18#
23forward_commands() { 19forward_commands() {
24 qmailrcd $COMMAND_LIST 20 qmailrcd $COMMAND_LIST