[arename] 01/04: Add upstream patch for perl 5.26 compatibility.

gregor herrmann gregoa at debian.org
Mon Jul 31 18:55:35 UTC 2017


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository arename.

commit e14aae77925bc43319e86fb1c8a34201eaf96415
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jul 31 14:46:44 2017 -0400

    Add upstream patch for perl 5.26 compatibility.
    
    Thanks: Steve Langasek for the bug report and patch.
    Closes: #870234
---
 ...nce-Unescaped-left-brace-in-regex-warning.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/0001-Silence-Unescaped-left-brace-in-regex-warning.patch b/debian/patches/0001-Silence-Unescaped-left-brace-in-regex-warning.patch
new file mode 100644
index 0000000..54d96d8
--- /dev/null
+++ b/debian/patches/0001-Silence-Unescaped-left-brace-in-regex-warning.patch
@@ -0,0 +1,52 @@
+From ad2e74cd77ed75d6a8c84013f9fa8ffd512bbaa0 Mon Sep 17 00:00:00 2001
+From: Frank Terbeck <ft at bewatermyfriend.org>
+Date: Tue, 5 Jan 2016 14:37:26 +0100
+Subject: [PATCH] Silence "Unescaped left brace in regex" warning
+
+Using [\] character class to do it. Passes the test suite.
+
+Signed-off-by: Frank Terbeck <ft at bewatermyfriend.org>
+
+Bugs-Debian: https://bugs.debian.org/870234
+
+---
+ ARename.pm.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/ARename.pm.in
++++ b/ARename.pm.in
+@@ -957,7 +957,7 @@
+         # Now for stuff we can read at once:
+ 
+         # The complex and simple sized expression types.
+-        } elsif (!$nest && ($in =~ m/\G\&{([\d\w]+\[\d+\])}/gc ||
++        } elsif (!$nest && ($in =~ m/\G\&[{]([\d\w]+\[\d+\])[}]/gc ||
+                             $in =~ m/\G\&([\d\w]+\[\d+\])/gc))
+         {
+             my ($match, $more) = ($1, $EMPTY);
+@@ -971,7 +971,7 @@
+             $buf = $EMPTY;
+ 
+         # The trivial expression (the complex-looking one and the real deal).
+-        } elsif (!$nest && ($in =~ m/\G\&{([\d\w]+)}/gc ||
++        } elsif (!$nest && ($in =~ m/\G\&[{]([\d\w]+)[}]/gc ||
+                             $in =~ m/\G\&([\d\w]+)/gc))
+         {
+             push @{ $out }, [ 'LITERAL', $buf ] if ($buf ne $EMPTY);
+@@ -982,14 +982,14 @@
+         # here on out needs to be copied literally until the matching
+         # "}" is found. That is why the token-handling above looks
+         # at `$nest', too.
+-        } elsif (!$nest && $in =~ m/\G\&{/gc) {
++        } elsif (!$nest && $in =~ m/\G\&[{]/gc) {
+             $nest++;
+             push @{ $out }, [ 'LITERAL', $buf ] if ($buf ne $EMPTY);
+             $buf = $EMPTY;
+ 
+         # When we're looking at a nested expression already, we need
+         # to read the "&{" literally.
+-        } elsif ($nest && $in =~ m/\G\&{/gc) {
++        } elsif ($nest && $in =~ m/\G\&[{]/gc) {
+             $nest++;
+             $buf .= q<&{>;
+             $cplxbuf .= q<&{>;
diff --git a/debian/patches/series b/debian/patches/series
index 146d4b7..a5fdd8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ VERSION.patch
 unsilent-pod2man.patch
 cope-with-slashes-in-tag-names.patch
 possible-precedence-issue-with-control-flow-operator.patch
+0001-Silence-Unescaped-left-brace-in-regex-warning.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/arename.git



More information about the Pkg-perl-cvs-commits mailing list