Control: tag -1 + patch

On Sun, 02 Jul 2017 17:54:07 +0300, Niko Tyni wrote:

> On Sun, Jun 05, 2016 at 10:43:28PM +0300, Niko Tyni wrote:
> > Building this package triggers deprecation warnings with Perl 5.24
> > (currently in experimental), and probably with Perl 5.22 (current sid)
> > too.
> > 
> >   Unescaped left brace in regex is deprecated, passed through in regex; 
> > marked by <-- HERE in m/\%PRE{ <-- HERE (.+?)}ERP\%/ at 
> > main/Configuration/Preprocessor.pm line 168.
> >   Unescaped left brace in regex is deprecated, passed through in regex; 
> > marked by <-- HERE in m/\%CODE{ <-- HERE (. *?)}EDOC\%/ at 
> > main/Configuration/Block.pm line 143.
> 
> This is fatal in Perl 5.26 (currently in experimental), making
> the debian/handle_version.pl invocation fail. It doesn't make
> the build fail, though.
> 
> Raising to 'important', but I guess this shouldn't block the Perl 5.26
> transition.

Trivial patch attached.
 

Cheers,
gregor

-- 
 .''`.  https://info.comodo.priv.at/ - Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Bloodhound Gang: Nothing But Mammals
diff -Nru tiarra-20100212+r39209/debian/changelog tiarra-20100212+r39209/debian/changelog
--- tiarra-20100212+r39209/debian/changelog	2017-07-15 08:12:32.000000000 +0200
+++ tiarra-20100212+r39209/debian/changelog	2017-07-17 18:43:25.000000000 +0200
@@ -1,3 +1,12 @@
+tiarra (20100212+r39209-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "Unescaped left brace in regex breaks with Perl 5.26":
+    add patch to escape the opening curlies.
+    (Closes: #826506)
+
+ -- gregor herrmann <gre...@debian.org>  Mon, 17 Jul 2017 18:43:25 +0200
+
 tiarra (20100212+r39209-2) unstable; urgency=medium
 
   * debian/control
diff -Nru tiarra-20100212+r39209/debian/patches/perl-deprecations.patch tiarra-20100212+r39209/debian/patches/perl-deprecations.patch
--- tiarra-20100212+r39209/debian/patches/perl-deprecations.patch	1970-01-01 01:00:00.000000000 +0100
+++ tiarra-20100212+r39209/debian/patches/perl-deprecations.patch	2017-07-17 18:43:25.000000000 +0200
@@ -0,0 +1,28 @@
+Description: fix "Unescaped left brace in regex is illegal here in regex" errors
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/826506
+Author: gregor herrmann <gre...@debian.org>
+Last-Update: 2017-07-17
+
+--- a/main/Configuration/Block.pm
++++ b/main/Configuration/Block.pm
+@@ -140,7 +140,7 @@
+ 	}
+ 	$result;
+     };
+-    (my $evaluated = $str) =~ s/\%CODE{(.*?)}EDOC\%/$eval->($1)/eg;
++    (my $evaluated = $str) =~ s/\%CODE\{(.*?)}EDOC\%/$eval->($1)/eg;
+     $evaluated;
+ }
+ 
+--- a/main/Configuration/Preprocessor.pm
++++ b/main/Configuration/Preprocessor.pm
+@@ -165,7 +165,7 @@
+ 	}
+ 	defined $result ? $result : '';
+     };
+-    $body =~ s/\%PRE{(.+?)}ERP\%/$evaluate->($1)/seg;
++    $body =~ s/\%PRE\{(.+?)}ERP\%/$evaluate->($1)/seg;
+     $body;
+ }
+ 
diff -Nru tiarra-20100212+r39209/debian/patches/series tiarra-20100212+r39209/debian/patches/series
--- tiarra-20100212+r39209/debian/patches/series	2017-07-15 08:12:32.000000000 +0200
+++ tiarra-20100212+r39209/debian/patches/series	2017-07-17 18:43:25.000000000 +0200
@@ -1 +1,2 @@
 0001-don-t-run-svn-up-for-update.patch
+perl-deprecations.patch

Attachment: signature.asc
Description: Digital Signature

Reply via email to