summary refs log tree commit diff
path: root/gnu/packages/base.scm
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/base.scm
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/base.scm')
-rw-r--r--gnu/packages/base.scm5
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f951e28b3b..179d535f20 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