From owner-svn-ports-head@freebsd.org Mon Jan 14 22:08:47 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6B541489586; Mon, 14 Jan 2019 22:08:46 +0000 (UTC) (envelope-from flo@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 575648039A; Mon, 14 Jan 2019 22:08:46 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 393109057; Mon, 14 Jan 2019 22:08:46 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0EM8keu031560; Mon, 14 Jan 2019 22:08:46 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0EM8jXw031558; Mon, 14 Jan 2019 22:08:45 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201901142208.x0EM8jXw031558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Mon, 14 Jan 2019 22:08:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490317 - in head/security/amavisd-new: . files X-SVN-Group: ports-head X-SVN-Commit-Author: flo X-SVN-Commit-Paths: in head/security/amavisd-new: . files X-SVN-Commit-Revision: 490317 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 575648039A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.946,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2019 22:08:47 -0000 Author: flo Date: Mon Jan 14 22:08:45 2019 New Revision: 490317 URL: https://svnweb.freebsd.org/changeset/ports/490317 Log: Add a missing backslash-escape to left brace in a regexp Perl 5.28 introduced a warning about unescaped left brace in a regexp, resulting in a warning issued during amavisd startup: Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.32), passed through in regex; marked by <-- HERE in m/ ( { <-- HERE } (?: / \* )? | \* ) / at (eval 112) line 830. Currently the warning is harmless although annoying, but will become a fatal error with the next version of perl. PR: 234173 Submitted by: Mark.Martinec@ijs.si Modified: head/security/amavisd-new/Makefile head/security/amavisd-new/files/patch-amavisd Modified: head/security/amavisd-new/Makefile ============================================================================== --- head/security/amavisd-new/Makefile Mon Jan 14 21:46:10 2019 (r490316) +++ head/security/amavisd-new/Makefile Mon Jan 14 22:08:45 2019 (r490317) @@ -2,6 +2,7 @@ PORTNAME= amavisd-new PORTVERSION= 2.11.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ Modified: head/security/amavisd-new/files/patch-amavisd ============================================================================== --- head/security/amavisd-new/files/patch-amavisd Mon Jan 14 21:46:10 2019 (r490316) +++ head/security/amavisd-new/files/patch-amavisd Mon Jan 14 22:08:45 2019 (r490317) @@ -1,4 +1,4 @@ ---- amavisd.orig 2016-12-10 16:31:50 UTC +--- amavisd.orig 2019-01-14 21:47:08 UTC +++ amavisd @@ -22814,6 +22814,7 @@ sub process_smtp_request($$$$) { } @@ -8,6 +8,15 @@ $msginfo->client_addr($cl_ip); # ADDR $msginfo->client_port($cl_port); # PORT +@@ -28857,7 +28857,7 @@ sub run_av(@) { + my $f = $bare_fnames->[$k]; my $multi = 0; + if ($one_at_a_time) { # glob templates may be substrings anywhere + local($1); @query_expanded = @query_template; # start afresh +- s{ ( {} (?: / \* )? | \* ) } ++ s{ ( \{\} (?: / \* )? | \* ) } + { $1 eq '{}' ? "$tempdir/parts" + : $1 eq '{}/*' ? ($multi=1,"$tempdir/parts/$f") + : $1 eq '*' ? ($multi=1,$f) : $1 @@ -34357,6 +34358,7 @@ sub collect_some_dkim_info($) { $sig_ind++; }