Control: tag -1 + patch

On Sat, 24 Jun 2017 20:35:08 +0200, gregor herrmann wrote:

> This is fatal in Perl 5.26 (currently in experimental), making the
> package fail to build from source. Raising the severity accordingly.

I'm attaching a patch to fix this issue.


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: Diana Krall: Temptation
diff -Nru metamonger-0.20150503/debian/changelog metamonger-0.20150503/debian/changelog
--- metamonger-0.20150503/debian/changelog	2015-05-03 15:19:48.000000000 +0200
+++ metamonger-0.20150503/debian/changelog	2017-06-30 00:41:37.000000000 +0200
@@ -1,3 +1,12 @@
+metamonger (0.20150503-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "Unescaped left brace in regex is deprecated":
+    add a patch to escape '{'s in regexps.
+    (Closes: #826497)
+
+ -- gregor herrmann <[email protected]>  Fri, 30 Jun 2017 00:41:37 +0200
+
 metamonger (0.20150503-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru metamonger-0.20150503/debian/patches/series metamonger-0.20150503/debian/patches/series
--- metamonger-0.20150503/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ metamonger-0.20150503/debian/patches/series	2017-06-30 00:41:37.000000000 +0200
@@ -0,0 +1 @@
+unescaped-left-brace-in-regex.patch
diff -Nru metamonger-0.20150503/debian/patches/unescaped-left-brace-in-regex.patch metamonger-0.20150503/debian/patches/unescaped-left-brace-in-regex.patch
--- metamonger-0.20150503/debian/patches/unescaped-left-brace-in-regex.patch	1970-01-01 01:00:00.000000000 +0100
+++ metamonger-0.20150503/debian/patches/unescaped-left-brace-in-regex.patch	2017-06-30 00:41:37.000000000 +0200
@@ -0,0 +1,75 @@
+Description: fix "Unescaped left brace in regex is deprecated" error
+ which is fatal in perl 5.26
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/826497
+Author: gregor herrmann <[email protected]>
+Last-Update: 2017-06-30
+
+--- a/metamonger
++++ b/metamonger
+@@ -433,7 +433,7 @@
+ sub write_metadata_to_storage {
+ 	my ($file_metadata_ref) = @_;
+ 	my $json = to_json($file_metadata_ref, {canonical => 1});
+-	$json =~ s/"metadata":{/"metadata":{\n/;
++	$json =~ s/"metadata":\{/"metadata":{\n/;
+ 	$json =~ s/},/},\n/g;
+ 	if ($file_metadata_ref->{config}{strict_json} == 0) {
+ 		$json =~ s/}}}/},\n}}\n/g;
+--- a/t/009-save-noact.t
++++ b/t/009-save-noact.t
+@@ -13,8 +13,8 @@
+ 
+ my $output = `./metamonger --config=../files/config_empty save --no-act`;
+ 
+-ok $output =~ '"001":{"atime":1337,"mode":"0775","mtime":42}';
+-ok $output =~ /"004":{\S+,"mode":"0666",\S+}/;
++ok $output =~ '"001":\{"atime":1337,"mode":"0775","mtime":42}';
++ok $output =~ /"004":\{\S+,"mode":"0666",\S+}/;
+ 
+ 
+ 
+--- a/t/200-no-dereference.t
++++ b/t/200-no-dereference.t
+@@ -37,31 +37,31 @@
+ 
+ $output = `./metamonger --config=../files/config_empty save --no-act --no-dereference`;
+ 
+-ok $output =~ '"link":{"mtime":42}';
+-ok $output =~ '"original":{"mtime":1325376000}';
++ok $output =~ '"link":\{"mtime":42}';
++ok $output =~ '"original":\{"mtime":1325376000}';
+ 
+ 
+ $output = `./metamonger --config=../files/config_empty save --no-act -P`;
+ 
+-ok $output =~ '"link":{"mtime":42}';
+-ok $output =~ '"original":{"mtime":1325376000}';
++ok $output =~ '"link":\{"mtime":42}';
++ok $output =~ '"original":\{"mtime":1325376000}';
+ 
+ 
+ $output = `./metamonger --config=../files/config_empty save --no-act --dereference`;
+ 
+-ok $output =~ '"link":{"mtime":1325376000}';
+-ok $output =~ '"original":{"mtime":1325376000}';
++ok $output =~ '"link":\{"mtime":1325376000}';
++ok $output =~ '"original":\{"mtime":1325376000}';
+ 
+ $output = `./metamonger --config=../files/config_empty save --no-act -L`;
+ 
+-ok $output =~ '"link":{"mtime":1325376000}';
+-ok $output =~ '"original":{"mtime":1325376000}';
++ok $output =~ '"link":\{"mtime":1325376000}';
++ok $output =~ '"original":\{"mtime":1325376000}';
+ 
+ 
+ $output = `./metamonger --config=../files/config_empty save --no-act`;
+ 
+-ok $output =~ '"link":{"mtime":1325376000}';
+-ok $output =~ '"original":{"mtime":1325376000}';
++ok $output =~ '"link":\{"mtime":1325376000}';
++ok $output =~ '"original":\{"mtime":1325376000}';
+ 
+ 
+ rm_rf '../etc';

Attachment: signature.asc
Description: Digital Signature

Reply via email to