Date: Mon, 14 Jan 2019 22:08:45 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> 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 Message-ID: <201901142208.x0EM8jXw031558@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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++; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901142208.x0EM8jXw031558>