Control: tags 826505 + pending Dear maintainer,
I've prepared an NMU for swissknife (versioned as 1.67-1.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. 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: trio infernal: mercy mercy
diff -u swissknife-1.67/debian/changelog swissknife-1.67/debian/changelog
--- swissknife-1.67/debian/changelog
+++ swissknife-1.67/debian/changelog
@@ -1,3 +1,12 @@
+swissknife (1.67-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "FTBFS with perl 5.26: Unescaped left brace in regex":
+ apply patches from Niko Tyni which fix regexp quantifiers and regexp
+ quoting. (Closes: #826505)
+
+ -- gregor herrmann <gre...@debian.org> Fri, 14 Jul 2017 23:24:18 +0200
+
swissknife (1.67-1.1) unstable; urgency=medium
* Non-maintainer upload.
only in patch2:
unchanged:
--- swissknife-1.67.orig/lib/SWISS/BaseClass.pm
+++ swissknife-1.67/lib/SWISS/BaseClass.pm
@@ -168,7 +168,7 @@
sub addEvidenceTag {
my $self = shift;
my $tag = shift;
- unless ($self->{'evidenceTags'} =~ /[\{\,]$tag[\}\,]/) {
+ unless ($self->{'evidenceTags'} =~ /[\{\,]\Q$tag\E[\}\,]/) {
if ($self->{'evidenceTags'} eq '{}') {
$self->{'evidenceTags'} = '{' . $tag . '}';
} else {
only in patch2:
unchanged:
--- swissknife-1.67.orig/lib/SWISS/TextFunc.pm
+++ swissknife-1.67/lib/SWISS/TextFunc.pm
@@ -193,7 +193,7 @@
# of length 1 ($sepLength = 1)
my $sepLength = 1;
my $w1 = $cutPos - $sepLength;
- if ($postMatch =~ /^(\S{0,$w1}$separators[$j])/) {
+ if ($w1 >= 0 and $postMatch =~ /^(\S{0,$w1}$separators[$j])/) {
$cutPos = length($1);
last;
}
signature.asc
Description: Digital Signature
