02/02: gnu: grep: Update to 3.1.

[Efraim Flashner]

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

commit 63adf0fd676f0a3522baf66532aa2266f166b1b4
Author: Efraim Flashner <address@hidden>
Date:   Wed Aug 30 07:21:38 2017 +0300

    gnu: grep: Update to 3.1.
    
    * gnu/packages/base.scm (grep): Update to 3.1.
    [source]: Remove patch.
    * gnu/packages/patches/grep-gnulib-lock.patch: Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                |  1 -
 gnu/packages/base.scm                       |  7 +++----
 gnu/packages/patches/grep-gnulib-lock.patch | 32 -----------------------------
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index fe43a79..d588a70 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -678,7 +678,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/graphicsmagick-CVE-2017-12936.patch     \
   %D%/packages/patches/graphicsmagick-CVE-2017-12937.patch     \
   %D%/packages/patches/graphite2-ffloat-store.patch            \
-  %D%/packages/patches/grep-gnulib-lock.patch                   \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
   %D%/packages/patches/groff-source-date-epoch.patch           \
   %D%/packages/patches/gsl-test-i686.patch                     \
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1ccff1f..532bb3e 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -81,16 +81,15 @@ command-line arguments, multiple languages, and so on.")
 (define-public grep
   (package
    (name "grep")
-   (version "3.0")
+   (version "3.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/grep/grep-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72"))
-            (patches (search-patches "grep-timing-sensitive-test.patch"
-                                     "grep-gnulib-lock.patch"))))
+              "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv"))
+            (patches (search-patches "grep-timing-sensitive-test.patch"))))
    (build-system gnu-build-system)
    (native-inputs `(("perl" ,perl)))             ;some of the tests require it
    (arguments
diff --git a/gnu/packages/patches/grep-gnulib-lock.patch 
b/gnu/packages/patches/grep-gnulib-lock.patch
deleted file mode 100644
index 68c33f1..0000000
--- a/gnu/packages/patches/grep-gnulib-lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This patch fix error on 'gnulib' library required to build
-'grep' package on GNU/Hurd.
-The patch was adapted from upstream source repository:
-'<http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=4084b3a1094372b960ce4a97634e08f4538c8bdd>'
-
-Commit: 4084b3a1094372b960ce4a97634e08f4538c8bdd
-
-diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c
-index 061562b..afc86f4 100644
---- a/lib/glthread/lock.c
-+++ b/lib/glthread/lock.c
-@@ -30,7 +30,7 @@
- 
- /* ------------------------- gl_rwlock_t datatype ------------------------- */
- 
--# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || 
(__GNU_LIBRARY__ > 1))
-+# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || 
(defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ 
> 1)))
- 
- #  ifdef PTHREAD_RWLOCK_INITIALIZER
- 
-diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h
-index ec16d39..67932aa 100644
---- a/lib/glthread/lock.h
-+++ b/lib/glthread/lock.h
-@@ -179,7 +179,7 @@ typedef pthread_mutex_t gl_lock_t;
- 
- /* ------------------------- gl_rwlock_t datatype ------------------------- */
- 
--# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || 
(__GNU_LIBRARY__ > 1))
-+# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || 
(defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ 
> 1)))
- 
- #  ifdef PTHREAD_RWLOCK_INITIALIZER