From nobody Mon Mar 28 16:41:29 2022 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 460801A476A4; Mon, 28 Mar 2022 16:41:30 +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 4KRz3t1SP0z4SR6; Mon, 28 Mar 2022 16:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648485690; 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=R/Q4p+r/28asjIF0OxLK0nHvQq9RybT+el6zNoe2F5Y=; b=hPdatqp2usJr9jNIxpF5wVuQCaBca3Hp68noaSZz3rYUQRsT6eKgC7kt3nCCdFAq+YweHp 6icHVn2zDu2lxG7subrSmIchDf9dW5H68FhrRczvA3vKztn/x+SMmHur0VoyucCb6D4Xlg VYwcGsDdQUe4R9NmoA56EWiRAHu5H3ZJF3P429IecTGHPP/hsdugO3eykHmuDRxUQNU3rq sk8UE2wIpoBZiYKaU4EGQUY0+9CPEbZgYir/vBAYjzXhZ0slQFxpHxAnHPSuH47dYrit/G UB/XcHaZov3d/h7xQcMWFw3Z8eJrLUgOioAORHnCP+qFSRgYksOlqWbtgxN39w== 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 134C25812; Mon, 28 Mar 2022 16:41:30 +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 22SGfToV093383; Mon, 28 Mar 2022 16:41:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SGfTSV093382; Mon, 28 Mar 2022 16:41:29 GMT (envelope-from git) Date: Mon, 28 Mar 2022 16:41:29 GMT Message-Id: <202203281641.22SGfTSV093382@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 672ab3228505 - main - mail/exim: merge exiqgrep perl syntax fix from upstream 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 672ab322850511daa7bfebbee1c0b8c675b01e9e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648485690; 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=R/Q4p+r/28asjIF0OxLK0nHvQq9RybT+el6zNoe2F5Y=; b=tK0sG7FXOG787ydltSTUil2zZ2QiH/Z8g0DiJZZA3Z6wve/MmJnyR796UHzbJ6TRjM/569 Z0fAWI1KZQ1dNyU71Mm8XDjIHBUbeSjVl5NrhOE7SAfWEWIKFffCP38eLMOP99RiIttpf6 5N4VTPqw2/v0dIijzb5nkywpoQK+ZAsgaSvOoBw0cFNaIBVMdUB7IBb/+TwWFf5c8m8/O3 V0HIOkFk62r+6NUs8Zi9nBOQaPmvTAAq8dgbQ/EVLBnBIILp0PrrmGgxgy/xjAWaBtVY0v 4ppHqThIhB2mZCW9Eakg/U51X/haxpc7dLCwt0l+zSowq2VUT6bArcV9CZxvwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648485690; a=rsa-sha256; cv=none; b=wxBqYtV4A/XEnqLZ/4DBmbrJZ6DgZNAV8HXMkB3/toRKd/2/QCWdr9VDG0KD2v7ZuxxL4/ V56XhXXW1jUAQtmTOfNalsNLFilqYx3nFRmXZEElH5EbrnlX+0fvAKrF3uZS6qO6IcR6sx aInRyYlfNXi/X1ESRlppDrkk4GR35licTrMuvZFQhASB0W4fX8s0B8PThwU1zSdnv4EyxM l7P4ARubG6S4F2f7xbbCzdqN598i9JUS1dn+znYZSqJxWALaj9gxcfivKAvgbygU1KSDqC zqx9DvfnD8nHtAlECm/2vPMmwhWdZ+jUy99+uMSBG6WSiBTETudm4RgTD1+kGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=672ab322850511daa7bfebbee1c0b8c675b01e9e commit 672ab322850511daa7bfebbee1c0b8c675b01e9e Author: Dima Panov AuthorDate: 2022-03-28 16:39:29 +0000 Commit: Dima Panov CommitDate: 2022-03-28 16:39:29 +0000 mail/exim: merge exiqgrep perl syntax fix from upstream Reported by: David Siebörger Sponsored by: Netzkommune GmbH --- mail/exim/Makefile | 2 +- ...5_35-Exiqgrep-check-arg-parsing.-Bug-2821.patch | 25 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 9cd6deadcc29..614fd1f88b0a 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -2,7 +2,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= mail MASTER_SITES= EXIM:exim MASTER_SITE_SUBDIR= /exim4/:exim \ diff --git a/mail/exim/files/debian/75_35-Exiqgrep-check-arg-parsing.-Bug-2821.patch b/mail/exim/files/debian/75_35-Exiqgrep-check-arg-parsing.-Bug-2821.patch index ec056eec9b79..c226354d5e8e 100644 --- a/mail/exim/files/debian/75_35-Exiqgrep-check-arg-parsing.-Bug-2821.patch +++ b/mail/exim/files/debian/75_35-Exiqgrep-check-arg-parsing.-Bug-2821.patch @@ -11,15 +11,32 @@ diff --git a/src/exiqgrep.src b/src/exiqgrep.src index c8762df47..04602da68 100644 --- a/src/exiqgrep.src +++ b/src/exiqgrep.src -@@ -53,7 +53,7 @@ if ($ARGV[0] eq '--version') { +@@ -53,12 +53,14 @@ if ($ARGV[0] eq '--version') { exit 0; } -getopts('hf:r:y:o:s:C:zxlibRcaG:',\%opt); -+if (!getopts('hf:r:y:o:s:C:zxlibRcaG:',\%opt) { &help; exit;} - if ($ARGV[0]) { &help; exit;} - if ($opt{h}) { &help; exit;} +-if ($ARGV[0]) { &help; exit;} +-if ($opt{h}) { &help; exit;} ++if (!getopts('hf:r:y:o:s:C:zxlibRcaG:E:',\%opt)) { &help; exit; } ++if ($opt{h}) { &help; exit; } ++if ($ARGV[0] || !($opt{f} || $opt{r} || $opt{s} || $opt{y} || $opt{o} || $opt{z} || $opt{x} || $opt{c})) ++ { &help; exit(1); } if ($opt{a}) { $eargs = '-bp'; } + if ($opt{C} && -e $opt{C} && -f $opt{C} && -R $opt{C}) { $eargs .= ' -C '.$opt{C}; } + if ($opt{G}) { $eargs .= ' -qG'.$opt{G}; } ++if ($opt{E}) { $exim = $opt{E}; } + + # Read message queue output into hash + &collect(); +@@ -75,6 +77,7 @@ Exim message queue display utility. + + -h This help message. + -C Specify which exim.conf to use. ++ -E Specify exim binary to use. + + Selection criteria: + -f Match sender address sender (field is "< >" wrapped) -- 2.34.1