[ack-grep] 01/01: Cherry-pick 17504aa from upstream. Fixes wrong results with -l

[Axel Beckert]

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

abe pushed a commit to branch master
in repository ack-grep.

commit 1809582053027abbc7b1a970aa5f737fd2c9b3a3
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Oct 9 01:12:02 2014 +0200

    Cherry-pick 17504aa from upstream. Fixes wrong results with -l
    
    Closes: #760870
---
 debian/changelog                                    |  7 +++++++
 ...7504aa-make-sure-strings-match-along-lines.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2153b10..19906fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ack-grep (2.14-4) UNRELEASED; urgency=low
+
+  * Cherry-pick 17504aa from upstream. Fixes wrong results with
+    -l. (Closes: #760870)
+
+ -- Axel Beckert <abe at debian.org>  Thu, 09 Oct 2014 01:09:42 +0200
+
 ack-grep (2.14-3) unstable; urgency=medium
 
   * Update no-standalone-test-but-autopkgtests.patch: Mark
diff --git a/debian/patches/cherry-pick-17504aa-make-sure-strings-match-along-lines.patch b/debian/patches/cherry-pick-17504aa-make-sure-strings-match-along-lines.patch
new file mode 100644
index 0000000..5b018ab
--- /dev/null
+++ b/debian/patches/cherry-pick-17504aa-make-sure-strings-match-along-lines.patch
@@ -0,0 +1,21 @@
+Origin: commit 17504aa361eef269c57f43c21e16d1705cd1e7c0
+Author: Rob Hoelz <rob at hoelz.ro>
+Bug-Debian: https://bugs.debian.org/760870
+Bug: https://github.com/petdance/ack2/issues/491
+Bug: https://github.com/petdance/ack2/issues/498
+Description: Make sure strings match along lines
+ This is redundant for most usages of ack, but fixes a bug when using -l.
+
+diff --git a/ack b/ack
+index e66f73a..852ec1c 100644
+--- a/ack
++++ b/ack
+@@ -331,7 +331,7 @@ sub build_regex {
+         $str = "(?i)$str";
+     }
+ 
+-    my $re = eval { qr/$str/ };
++    my $re = eval { qr/$str/m };
+     if ( !$re ) {
+         die "Invalid regex '$str':\n  $@";
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 0e70a34..098f30a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no-standalone-test-but-autopkgtests.patch
+cherry-pick-17504aa-make-sure-strings-match-along-lines.patch

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