Control: tag -1 + patch On Mon, 31 Jul 2017 03:14:40 +0300, Adrian Bunk wrote:
> Start 12: pj_validate_simu-mardi
> 1/12 Test #4: pj_dump_native_paje ..............***Failed 0.10 sec
> Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in
> m/\${ <-- HERE (\w+)(?::[=-][^}]*)?}/ at
> /build/1st/pajeng-1.3.4/obj-x86_64-linux-gnu/bin/tesh line 235.
Here's a patch that escapes the curlies.
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
`-
diff -Nru pajeng-1.3.4/debian/changelog pajeng-1.3.4/debian/changelog --- pajeng-1.3.4/debian/changelog 2016-12-01 03:10:15.000000000 -0500 +++ pajeng-1.3.4/debian/changelog 2017-07-31 17:05:06.000000000 -0400 @@ -1,3 +1,12 @@ +pajeng (1.3.4-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix "pajeng FTBFS with perl 5.26": + add a patch to escape the literal left braces in regexps. + (Closes: #870213) + + -- gregor herrmann <gre...@debian.org> Mon, 31 Jul 2017 17:05:06 -0400 + pajeng (1.3.4-2) unstable; urgency=medium * Add libfl-dev to the Build-deps (Closes: #846446). diff -Nru pajeng-1.3.4/debian/patches/perl-5.26 pajeng-1.3.4/debian/patches/perl-5.26 --- pajeng-1.3.4/debian/patches/perl-5.26 1969-12-31 19:00:00.000000000 -0500 +++ pajeng-1.3.4/debian/patches/perl-5.26 2017-07-31 17:05:06.000000000 -0400 @@ -0,0 +1,34 @@ +Description: Fix "Unescaped left brace in regex is illegal here" errors with perl 5.26 +Origin: vendor +Bug: https://github.com/schnorr/pajeng/issues/24 +Bug-Debian: https://bugs.debian.org/870213 +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2017-07-31 + +--- a/tests/scripts/tesh ++++ b/tests/scripts/tesh +@@ -60,12 +60,12 @@ + sub var_subst { + my ($text, $name, $value) = @_; + if ($value) { +- $text =~ s/\${$name(?::[=-][^}]*)?}/$value/g; ++ $text =~ s/\$\{$name(?::[=-][^}]*)?}/$value/g; + $text =~ s/\$$name(\W|$)/$value$1/g; + } + else { +- $text =~ s/\${$name:=([^}]*)}/$1/g; +- $text =~ s/\${$name}//g; ++ $text =~ s/\$\{$name:=([^}]*)}/$1/g; ++ $text =~ s/\$\{$name}//g; + $text =~ s/\$$name(\W|$)/$1/g; + } + return $text; +@@ -232,7 +232,7 @@ + $cmd{'cmd'} = var_subst($cmd{'cmd'}, $key, $environ{$key}); + } + # substitute remaining variables, if any +- while ($cmd{'cmd'} =~ /\${(\w+)(?::[=-][^}]*)?}/) { ++ while ($cmd{'cmd'} =~ /\$\{(\w+)(?::[=-][^}]*)?}/) { + $cmd{'cmd'} = var_subst($cmd{'cmd'}, $1, ""); + } + while ($cmd{'cmd'} =~ /\$(\w+)/) { diff -Nru pajeng-1.3.4/debian/patches/series pajeng-1.3.4/debian/patches/series --- pajeng-1.3.4/debian/patches/series 2016-12-01 03:10:15.000000000 -0500 +++ pajeng-1.3.4/debian/patches/series 2017-07-31 17:05:06.000000000 -0400 @@ -1,2 +1,3 @@ # drop_dependencies soname +perl-5.26
signature.asc
Description: Digital Signature
