base: Update grep + sed to latest stable.

base: Update grep + sed to latest stable.

[contact.ng0]

the hurd patch in sed was upstreamed, it is now obsolete.

[PATCH 1/2] gnu: grep: Update to 3.0.

[contact.ng0]

From: ng0 <contact.ng0@cryptolab.net>

* gnu/packages/base.scm (grep): Update to 3.0.
---
 gnu/packages/base.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c75e03828..dc11b1a32 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -78,14 +79,14 @@ command-line arguments, multiple languages, and so on.")
 (define-public grep
   (package
    (name "grep")
-   (version "2.25")
+   (version "3.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/grep/grep-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "0c38b67cnwchwzv4wq2gpz6smkhdxrac2hhssv8f0l04qnx867p2"))
+              "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72"))
             (patches (search-patches "grep-timing-sensitive-test.patch"))))
    (build-system gnu-build-system)
    (native-inputs `(("perl" ,perl)))             ;some of the tests require it
-- 
2.11.1

Re: [PATCH 1/2] gnu: grep: Update to 3.0.

[Leo Famulari]

On Sat, Feb 11, 2017 at 05:18:01PM +0000, contact.ng0@cryptolab.net wrote:
> From: ng0 <contact.ng0@cryptolab.net>
> 
> * gnu/packages/base.scm (grep): Update to 3.0.

This is on core-updates as f3a79f88e51d367c5e5668bfbf7fb433260b1fd6.

[PATCH 2/2] gnu: sed: Update to 4.4.

[contact.ng0]

From: ng0 <contact.ng0@cryptolab.net>

* gnu/packages/base.scm (sed): Update to 4.4.
[source]: Change to "tar.xz" source,
remove obsolete patch 'sed-hurd-path-max.patch'.
* gnu/packages/patches/sed-hurd-path-max.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                 |  1 -
 gnu/packages/base.scm                        |  7 +++---
 gnu/packages/patches/sed-hurd-path-max.patch | 34 ----------------------------
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 gnu/packages/patches/sed-hurd-path-max.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 25fb3b44f..c93e9e1ab 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -885,7 +885,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ruby-puma-ignore-broken-test.patch       \
   %D%/packages/patches/ruby-rack-ignore-failing-test.patch      \
   %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
-  %D%/packages/patches/sed-hurd-path-max.patch			\
   %D%/packages/patches/scheme48-tests.patch			\
   %D%/packages/patches/scotch-test-threading.patch		\
   %D%/packages/patches/sdl-libx11-1.6.patch			\
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index dc11b1a32..deaa5b698 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -119,15 +119,14 @@ including, for example, recursive directory searching.")
 (define-public sed
   (package
    (name "sed")
-   (version "4.2.2")
+   (version "4.4")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/sed/sed-" version
-                                ".tar.bz2"))
+                                ".tar.xz"))
             (sha256
              (base32
-              "1myvrmh99jsvk7v3d7crm0gcrq51hmmm1r2kjyyci152in1x2j7h"))
-            (patches (search-patches "sed-hurd-path-max.patch"))))
+              "0fv88bcnraixc8jvpacvxshi30p5x9m7yb8ns1hfv07hmb2ypmnb"))))
    (build-system gnu-build-system)
    (synopsis "Stream editor")
    (arguments
diff --git a/gnu/packages/patches/sed-hurd-path-max.patch b/gnu/packages/patches/sed-hurd-path-max.patch
deleted file mode 100644
index 5226cba4c..000000000
--- a/gnu/packages/patches/sed-hurd-path-max.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-7bb8d35d0330161a5af5341471d0c183a067e8c2
-Author: Jose E. Marchesi <jemarch@gnu.org>
-Date:   Sun Oct 6 14:43:38 2013 +0200
-
-    Set PATH_MAX to some constant in case it is not defined in system
-    headers.
-    
-    2013-10-06  Jose E. Marchesi  <jemarch@gnu.org>
-    
-    	* basicdefs.h (PATH_MAX): Defined to some constant in case it is
-    	not defined by system headers.
-    	* sed/utils.c: Do not include pathmax.h anymore.
-    	* bootstrap.conf (gnulib_modules): Do not use the gnulib module
-    	pathmax.
-
-diff --git a/basicdefs.h b/basicdefs.h
-index 0d28a97..09f5beb 100644
---- a/basicdefs.h
-+++ b/basicdefs.h
-@@ -40,6 +41,13 @@ typedef unsigned long countT;
- #define obstack_chunk_alloc  ck_malloc
- #define obstack_chunk_free   free
- 
-+/* MAX_PATH is not defined in some platforms, most notably GNU/Hurd.
-+   In that case we define it here to some constant.  Note however that
-+   this relies in the fact that sed does reallocation if a buffer
-+   needs to be larger than PATH_MAX.  */
-+#ifndef PATH_MAX
-+# define PATH_MAX 200
-+#endif
- 
- /* handle misdesigned <ctype.h> macros (snarfed from lib/regex.c) */
- /* Jim Meyering writes:
- 
-- 
2.11.1

Re: [PATCH 2/2] gnu: sed: Update to 4.4.

[Leo Famulari]

On Sat, Feb 11, 2017 at 05:18:02PM +0000, contact.ng0@cryptolab.net wrote:
> From: ng0 <contact.ng0@cryptolab.net>
> 
> * gnu/packages/base.scm (sed): Update to 4.4.
> [source]: Change to "tar.xz" source,
> remove obsolete patch 'sed-hurd-path-max.patch'.
> * gnu/packages/patches/sed-hurd-path-max.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): Remove it.

This change is on core-updates as a combination of
d6592d84ca754d65d821d2a22179da690054e58c and earlier commits.

Re: [PATCH 2/2] gnu: sed: Update to 4.4.

[ng0]

On 17-02-11 13:56:14, Leo Famulari wrote:
> On Sat, Feb 11, 2017 at 05:18:02PM +0000, contact.ng0@cryptolab.net wrote:
> > From: ng0 <contact.ng0@cryptolab.net>
> > 
> > * gnu/packages/base.scm (sed): Update to 4.4.
> > [source]: Change to "tar.xz" source,
> > remove obsolete patch 'sed-hurd-path-max.patch'.
> > * gnu/packages/patches/sed-hurd-path-max.patch: Delete file.
> > * gnu/local.mk (dist_patch_DATA): Remove it.
> 
> This change is on core-updates as a combination of
> d6592d84ca754d65d821d2a22179da690054e58c and earlier commits.

Oh. When in doubt, check core-updates and staging first I guess...
Thanks!
-- 
ng0 -- https://www.inventati.org/patternsinthechaos/