From nobody Fri Dec 10 23:26:15 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8364118EA792; Fri, 10 Dec 2021 23:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9n8m18NBz3P1w; Fri, 10 Dec 2021 23:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06E36233B3; Fri, 10 Dec 2021 23:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BANQFXE038293; Fri, 10 Dec 2021 23:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BANQFAN038292; Fri, 10 Dec 2021 23:26:15 GMT (envelope-from git) Date: Fri, 10 Dec 2021 23:26:15 GMT Message-Id: <202112102326.1BANQFAN038292@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a8a45bdf49a9 - main - mail/mimedefang: Allow setting MX_MAX_RSS and MX_MAX_AS in rc.conf List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8a45bdf49a9f13b4dd15d986de86a29e3ea45ed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639178776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9pbpTlOMq8jxrI5JVKmXXVwvRDnBFFVZlyvHNgzmLcU=; b=ivAm3blXWnZiWkcLfRqOGhKgxRMYg82ncZU2gf04z4tZ7EF9kHpJv3C4I2k8SuDxCeWOFA 107QWhaccuc2go0w7q0NXhrzmBuYZRMFOpVKpnqVtQpOsnjIRQwuQwYt/ZzWmqtRUnb5zl +nnHQrpI/SL/dr0RQMjvugiyn3wR82xC2g0AtzUWuBGg1F7KYysbVoEVUGWfexISs7pz3v 8EUeZKaIj18SMi9n0uGofPruYLuMd1hzYGsr6o0LldouC6a5aiW6xd4SPXajNykGQ9nU26 6WsZqWUEG4XbSY4jt3t6YGJwkG/LkSfknCBFnRTl2BYLDmy9D3O3YEo91x3U7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639178776; a=rsa-sha256; cv=none; b=H7cyNTzf1CWn4lwIuyfuxZTaAyntyoKOeBb5sOhks7Wz2OoRtAC0S6AQHRD3OpHSzcefrv d1S20ThaYwlZfbbsZHWanK4xk29wgRextOFOleINXTuesqmfmss9kXJGaOWq9YVBQRkaDi zlscBWYq9Y6bxd2HUm6gCPHW7Pvktpy41Zie7P41nkOChpp4rCekoLalVHn0y8cbLxhfom TO4cjtlqoOEaXWCCjlNbnuN0gnQXxpKhvunFVNEEORwRjEUBJcd/Uvk+x5GFyBFisRszxf P3s23pQl/sz664RRxOL5CBIBv7N5SizkD4r5LhHxXDKgTh82Za3ZOVj5zWGlaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8a45bdf49a9f13b4dd15d986de86a29e3ea45ed commit a8a45bdf49a9f13b4dd15d986de86a29e3ea45ed Author: ml@netfence.it AuthorDate: 2021-12-10 23:21:13 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-12-10 23:25:57 +0000 mail/mimedefang: Allow setting MX_MAX_RSS and MX_MAX_AS in rc.conf In order to avoid DOSes due to complex MIME, MIMEDefang sets some limits on how much memory a process can use (MX_MAX_RSS and MX_MAX_AS). The provided example init script sets these variables to very low values (which probably made sense when RAM was much scarcer); the port already patches that file, increasing them, but they are still way too low in some cases, resulting in some mail messages crashing the filter and not passing. This patch, while retaining the current port defaults, allows these thresholds to be set in rc.conf. PR: 256711 Approved by: maintainer --- mail/mimedefang/Makefile | 2 + .../files/patch-examples__init-script.in | 47 ++++++++++++++-------- mail/mimedefang/files/patch-mimedefang-filter.5.in | 4 +- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index f1f60724a54d..fd19fc93f26d 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -2,6 +2,8 @@ PORTNAME= mimedefang PORTVERSION= 2.84 +PORTREVISION= 1 + CATEGORIES= mail MASTER_SITES= http://www.mimedefang.org/static/ \ http://fossies.org/linux/misc/ diff --git a/mail/mimedefang/files/patch-examples__init-script.in b/mail/mimedefang/files/patch-examples__init-script.in index 00fb159a37c1..9483e3f663d1 100644 --- a/mail/mimedefang/files/patch-examples__init-script.in +++ b/mail/mimedefang/files/patch-examples__init-script.in @@ -1,6 +1,21 @@ --- examples/init-script.in.orig 2017-09-07 17:52:24 UTC +++ examples/init-script.in -@@ -41,6 +41,12 @@ export LC_ALL +@@ -7,6 +7,14 @@ + # BEFORE: mail + # KEYWORD: shutdown + ++. /etc/rc.subr ++ ++# read settings, set default values ++load_rc_config "$name" ++ ++: ${mimedefang_mx_max_rss=100000} ++: ${mimedefang_mx_max_as=300000} ++ + RETVAL=0 + prog='mimedefang' + SPOOLDIR='@SPOOLDIR@' +@@ -41,6 +49,12 @@ export LC_ALL # The socket used by mimedefang to communicate with sendmail # SOCKET=$SPOOLDIR/mimedefang.sock @@ -13,21 +28,21 @@ # Run the multiplexor and filters as this user, not root. RECOMMENDED MX_USER=@DEFANGUSER@ -@@ -138,11 +144,11 @@ MX_MAXIMUM=10 +@@ -138,11 +152,11 @@ MX_MAXIMUM=10 # Limit worker processes' resident-set size to this many kilobytes. Default # is unlimited. -# MX_MAX_RSS=10000 -+MX_MAX_RSS=100000 ++MX_MAX_RSS=${mimedefang_mx_max_rss} # Limit total size of worker processes' memory space to this many kilobytes. # Default is unlimited. -# MX_MAX_AS=30000 -+MX_MAX_AS=300000 ++MX_MAX_AS=${mimedefang_mx_max_as} # If you want to use the "notification" facility, set the appropriate port. # See the mimedefang-notify man page for details. -@@ -189,7 +195,7 @@ then +@@ -189,7 +203,7 @@ then . /etc/rc.subr name=$prog @@ -36,7 +51,7 @@ # default to not enabled, enable in rc.conf eval $rcvar=\${$rcvar:-NO} -@@ -199,6 +205,7 @@ then +@@ -199,6 +213,7 @@ then procname=$PROGDIR/$prog-multiplexor start_cmd="start_it" stop_cmd="stop_it" @@ -44,7 +59,7 @@ sig_reload="INT" reread_cmd="reread_it" # provide both "reload", the FreeBSD default, with a direct signal to -@@ -209,6 +216,8 @@ fi +@@ -209,6 +224,8 @@ fi # Make sure required vars are set SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock} MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock} @@ -53,7 +68,7 @@ start_it() { if test -r $PID ; then -@@ -294,6 +303,29 @@ start_it() { +@@ -294,6 +311,29 @@ start_it() { kill `cat $MXPID` return 1 fi @@ -83,7 +98,7 @@ return 0 } -@@ -329,7 +361,7 @@ stop_it() { +@@ -329,7 +369,7 @@ stop_it() { rm -f $MX_SOCKET > /dev/null 2>&1 rm -f $SOCKET > /dev/null 2>&1 @@ -92,16 +107,16 @@ printf "Waiting for daemons to exit." WAITPID="" test -f $PID && WAITPID=`cat $PID` -@@ -381,6 +413,12 @@ reread_it() { +@@ -379,6 +419,12 @@ reread_it() { + echo "Could not find process-ID of $prog-multiplexor" + fi fi - } - ++} ++ +restart_it() { + stop_it wait + start_it + RETVAL=$? -+} -+ + } + if type run_rc_command > /dev/null 2>&1 - then - # NetBSD/FreeBSD compatible startup script diff --git a/mail/mimedefang/files/patch-mimedefang-filter.5.in b/mail/mimedefang/files/patch-mimedefang-filter.5.in index 90a57e1844ba..b16fc89aaded 100644 --- a/mail/mimedefang/files/patch-mimedefang-filter.5.in +++ b/mail/mimedefang/files/patch-mimedefang-filter.5.in @@ -1,6 +1,6 @@ ---- mimedefang-filter.5.in.orig 2014-05-21 13:51:21 UTC +--- mimedefang-filter.5.in.orig 2017-09-07 17:46:57 UTC +++ mimedefang-filter.5.in -@@ -622,7 +622,7 @@ and entity_contains_virus_sophie unless +@@ -634,7 +634,7 @@ and entity_contains_virus_sophie unless a socket is pr routine. .TP