summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-11-07 22:01:04 +0100
committerLudovic Courtès <ludo@gnu.org>2015-11-07 22:01:04 +0100
commit9eb681a02dc7bc675576cce00c4ad56615ef71f0 (patch)
tree94592cb06f4a3c9dfeadf726a42627bfe7d54070 /gnu/packages/patches
parente17d513381296b7dd93e09b52529d670ae1c5c9d (diff)
downloadguix-9eb681a02dc7bc675576cce00c4ad56615ef71f0.tar.gz
gnu: grep: Update to 2.22.
* gnu/packages/base.scm (grep): Upgrade to 2.22.  Remove
  'grep-CVE-2015-1345.patch'.
* gnu/packages/patches/grep-CVE-2015-1345.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/grep-CVE-2015-1345.patch17
1 files changed, 0 insertions, 17 deletions
diff --git a/gnu/packages/patches/grep-CVE-2015-1345.patch b/gnu/packages/patches/grep-CVE-2015-1345.patch
deleted file mode 100644
index b0d0c8e5dc..0000000000
--- a/gnu/packages/patches/grep-CVE-2015-1345.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix CVE-2015-1345.  From upstream commit
-83a95bd8c8561875b948cadd417c653dbe7ef2e2
-by Yuliy Pisetsky <ypisetsky@fb.com>.
-
-diff --git a/src/kwset.c b/src/kwset.c
-index 4003c8d..376f7c3 100644
---- a/src/kwset.c
-+++ b/src/kwset.c
-@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
-                     if (! tp)
-                       return -1;
-                     tp++;
-+                    if (ep <= tp)
-+                      break;
-                   }
-               }
-           }