diff options
-rw-r--r-- | mail/qmail-run/INSTALL | 28 | ||||
-rw-r--r-- | mail/qmail-run/Makefile | 9 | ||||
-rw-r--r-- | mail/qmail-run/files/qmailsend.sh | 6 |
3 files changed, 7 insertions, 36 deletions
diff --git a/mail/qmail-run/INSTALL b/mail/qmail-run/INSTALL index a15a6937df7..4b9f4658bc4 100644 --- a/mail/qmail-run/INSTALL +++ b/mail/qmail-run/INSTALL @@ -1,34 +1,6 @@ -QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@ - -psmsg='# -# This file was auto-generated by pkgsrc.' - case ${STAGE} in POST-INSTALL) - cd ${PREFIX}/share/qmail/setup && ./config-fast-pkgsrc `./hostname` - - cd ${PKG_SYSCONFDIR}/.pkgsrc-defaults-do-not-edit - for i in locals rcpthosts; do - ${SORT} -u ${i} > ${i}.tmp && ${MV} ${i}.tmp ${i} - done - - cd ${PKG_SYSCONFDIR} - for i in defaultdomain locals me plusdomain rcpthosts; do - [ -f control/${i} ] \ - || ${CP} .pkgsrc-defaults-do-not-edit/${i} control - done - - cd ${PKG_SYSCONFDIR}/alias - for i in postmaster mailer-daemon root; do - ${TOUCH} .qmail-${i} - ${CHMOD} 644 .qmail-${i} - done - if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then - ${ECHO} "$psmsg" >> .qmail-${QMAIL_QUEUE_EXTRA} - ${CHMOD} 644 .qmail-${QMAIL_QUEUE_EXTRA} - fi - cd ${PKG_SYSCONFDIR} for i in ofmip pop3 smtp; do ${CHMOD} 644 tcp.${i} diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index 232c552ba12..603b3748748 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.61 2018/11/28 16:22:41 schmonz Exp $ +# $NetBSD: Makefile,v 1.62 2018/12/04 17:00:59 schmonz Exp $ # -DISTNAME= qmail-run-20181128 +DISTNAME= qmail-run-20181204 CATEGORIES= mail MASTER_SITES= # empty DISTFILES= # empty @@ -13,7 +13,7 @@ LICENSE= 2-clause-bsd DEPENDS+= greetdelay-[0-9]*:../../mail/greetdelay DEPENDS+= greylisting-spp-[0-9]*:../../mail/greylisting-spp DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives -DEPENDS_QMAIL= qmail>=1.03nb41:../../mail/qmail +DEPENDS_QMAIL= qmail>=1.03nb42:../../mail/qmail DEPENDS+= ${DEPENDS_QMAIL} DEPENDS+= qmail-acceptutils>=20181128:../../mail/qmail-acceptutils DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter @@ -26,7 +26,6 @@ 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} FILES_SUBST+= UCSPI_SSL_USER=${UCSPI_SSL_USER:Q} FILES_SUBST+= UCSPI_SSL_GROUP=${UCSPI_SSL_GROUP:Q} @@ -55,7 +54,7 @@ CONF_FILES+= ${PREFIX}/${EGDIR}/greylist-${f} \ INSTALLATION_DIRS= bin share/doc/qmail-run ${EGDIR} BUILD_DEFS+= QMAIL_DAEMON_USER QMAIL_LOG_USER QMAIL_SEND_USER -BUILD_DEFS+= QMAIL_QMAIL_GROUP QMAIL_QUEUE_EXTRA PKG_SYSCONFBASE +BUILD_DEFS+= QMAIL_QMAIL_GROUP PKG_SYSCONFBASE BUILD_DEFS+= UCSPI_SSL_USER UCSPI_SSL_GROUP .include "../../mk/bsd.prefs.mk" diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh index bdceb4c3f53..9a1443c9249 100644 --- a/mail/qmail-run/files/qmailsend.sh +++ b/mail/qmail-run/files/qmailsend.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailsend.sh,v 1.13 2018/11/03 17:08:26 schmonz Exp $ +# $NetBSD: qmailsend.sh,v 1.14 2018/12/04 17:00:59 schmonz Exp $ # # @PKGNAME@ script to control qmail-send (local and outgoing mail). # @@ -12,7 +12,7 @@ name="qmailsend" # User-settable rc.conf variables and their default values: -: ${qmailsend_postenv:="PATH=@PREFIX@/bin:$PATH"} +: ${qmailsend_postenv:="QMAILREMOTE=@PREFIX@/bin/qmail-remote"} : ${qmailsend_defaultdelivery:="`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"} : ${qmailsend_log:="YES"} : ${qmailsend_logcmd:="logger -t nbqmail/send -p mail.info"} @@ -47,7 +47,7 @@ qmailsend_prestart() fi # qmail-start(8) starts the various qmail processes, then execs # qmail-send(8). That's the process we want to signal later. - command="@PREFIX@/bin/pgrphack @SETENV@ - ${qmailsend_postenv} + command="@PREFIX@/bin/pgrphack @SETENV@ - PATH=@PREFIX@/bin:$PATH ${qmailsend_postenv} qmail-start '$qmailsend_defaultdelivery' ${qmailsend_logcmd}" command_args="&" |