Bug#826471: intltool: Unescaped left brace in regex is deprecated at /usr/bin/intltool-update line 1070

[gregor herrmann]

On Sun, 23 Jul 2017 00:43:26 +0200, Michael Biebl wrote:

> > Building the inkscape 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/\${ <-- HERE ?PACKAGE_NAME}?/ at 
> > /usr/bin/intltool-update line 1070, <CONF> line 1213.
> > 
> 
> I can't find an upstream bug report for this issue, but there is
> https://git.archlinux.org/svntogit/packages.git/tree/trunk/intltool-0.51.0-perl-5.26.patch?h=packages/intltool

Most of these changes are already in perl5.22-regex-fixes.patch but
one was missing.

Debdiff attached; with this change mate-themes builds.


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: Rolling Stones: Shake-roll

diff -Nru intltool-0.51.0/debian/changelog intltool-0.51.0/debian/changelog
--- intltool-0.51.0/debian/changelog	2016-09-21 23:45:39.000000000 +0200
+++ intltool-0.51.0/debian/changelog	2017-07-23 16:16:05.000000000 +0200
@@ -1,3 +1,13 @@
+intltool (0.51.0-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "Unescaped left brace in regex is deprecated at
+    /usr/bin/intltool-update line 1070":
+    update perl5.22-regex-fixes.patch: escape another literal left brace.
+    (Closes: #826471)
+
+ -- gregor herrmann <gre...@debian.org>  Sun, 23 Jul 2017 16:16:05 +0200
+
 intltool (0.51.0-3) unstable; urgency=medium
 
   * Convert from cdbs to dh.
diff -Nru intltool-0.51.0/debian/patches/perl5.22-regex-fixes.patch intltool-0.51.0/debian/patches/perl5.22-regex-fixes.patch
--- intltool-0.51.0/debian/patches/perl5.22-regex-fixes.patch	2016-09-21 23:26:07.000000000 +0200
+++ intltool-0.51.0/debian/patches/perl5.22-regex-fixes.patch	2017-07-23 16:16:05.000000000 +0200
@@ -7,7 +7,7 @@
 ===================================================================
 --- a/intltool-update.in
 +++ b/intltool-update.in
-@@ -1061,7 +1061,7 @@
+@@ -1061,13 +1061,13 @@
  	}
      }
  
@@ -16,6 +16,13 @@
      {
  	my $rest = $3;
  	my $untouched = $1;
+ 	my $sub = "";
+         # Ignore recursive definitions of variables
+-        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
++        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
+ 
+ 	return SubstituteVariable ("$untouched$sub$rest");
+     }
 @@ -1189,10 +1189,10 @@
  	$name    =~ s/\(+$//g;
  	$version =~ s/\(+$//g;

signature.asc
Description: Digital Signature