01/02: gnu: grep: Update to 2.22.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 9eb681a02dc7bc675576cce00c4ad56615ef71f0
Author: Ludovic Courtès <address@hidden>
Date:   Sat Nov 7 22:01:04 2015 +0100

    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.
---
 gnu-system.am                                 |    1 -
 gnu/packages/base.scm                         |    5 ++---
 gnu/packages/patches/grep-CVE-2015-1345.patch |   17 -----------------
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index c481066..d43358d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -482,7 +482,6 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   gnu/packages/patches/gobject-introspection-cc.patch          \
   gnu/packages/patches/gobject-introspection-girepository.patch        \
-  gnu/packages/patches/grep-CVE-2015-1345.patch                        \
   gnu/packages/patches/grub-gets-undeclared.patch              \
   gnu/packages/patches/grub-freetype.patch                     \
   gnu/packages/patches/gsl-poly-test-fix-pt1.patch             \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f951e28..179d535 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -73,15 +73,14 @@ command-line arguments, multiple languages, and so on.")
 (define-public grep
   (package
    (name "grep")
-   (version "2.21")
+   (version "2.22")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/grep/grep-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j"))
-            (patches (list (search-patch "grep-CVE-2015-1345.patch")))))
+              "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa"))))
    (build-system gnu-build-system)
    (synopsis "Print lines matching a pattern")
    (description
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 b0d0c8e..0000000
--- 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 <address@hidden>.
-
-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;
-                   }
-               }
-           }