Explicitly ulimit qmailsend. Bump PKGREVISION.

NetBSD · May 19, 2020 · 62068ab · 62068ab
1 parent 23010ee
commit 62068ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2019/08/20 02:42:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.75 2020/05/19 19:45:58 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20190819
+DISTNAME=		qmail-run-20200519
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty

diff --git 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.17 2018/12/16 05:32:07 schmonz Exp $
+# $NetBSD: qmailsend.sh,v 1.18 2020/05/19 19:45:58 schmonz Exp $
 #
 # @PKGNAME@ script to control qmail-send (local and outgoing mail).
 #
@@ -13,6 +13,7 @@ name="qmailsend"
 
 # User-settable rc.conf variables and their default values:
 : ${qmailsend_postenv:="QMAILREMOTE=@PREFIX@/bin/qmail-remote"}
+: ${qmailsend_datalimit:="540000000"}
 : ${qmailsend_defaultdelivery:="`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"}
 : ${qmailsend_log:="YES"}
 : ${qmailsend_logcmd:="logger -t nbqmail/send -p mail.info"}
@@ -48,6 +49,7 @@ qmailsend_prestart() {
 	# 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@ - PATH=@PREFIX@/bin:$PATH ${qmailsend_postenv} \
+@PREFIX@/bin/softlimit -m ${qmailsend_datalimit} \
 qmail-start '$qmailsend_defaultdelivery' \
 ${qmailsend_logcmd}"
 	command_args="&"