[PATCH] gnu: sed: Update to 4.3.

[PATCH] gnu: sed: Update to 4.3.

[Marius Bakke]

* gnu/packages/base.scm (sed): Update to 4.3.
[source]: Use xz tarball. Remove upstreamed patch.
[home-page]: Use https.
[native-inputs]: Add perl.
* 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                        | 11 +++++----
 gnu/packages/patches/sed-hurd-path-max.patch | 34 ----------------------------
 3 files changed, 6 insertions(+), 40 deletions(-)
 delete mode 100644 gnu/packages/patches/sed-hurd-path-max.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 860d16d91..e6528e96f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -841,7 +841,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ruby-rack-ignore-failing-test.patch      \
   %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
   %D%/packages/patches/ruby-yard-fix-skip-of-markdown-tests.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 cfc1a6591..a1172037b 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -118,15 +118,14 @@ including, for example, recursive directory searching.")
 (define-public sed
   (package
    (name "sed")
-   (version "4.2.2")
+   (version "4.3")
    (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"))))
+              "1anhdgah8h423hlmn9hwzxzr7hjbqjm6hxq3z1p7p7nf8640vhj7"))))
    (build-system gnu-build-system)
    (synopsis "Stream editor")
    (arguments
@@ -143,6 +142,8 @@ including, for example, recursive directory searching.")
                     (("/bin/sh")
                      (string-append bash "/bin/bash")))
                   #t)))))))
+   (native-inputs
+    `(("perl" ,perl))) ; for help2man
    (description
     "Sed is a non-interactive, text stream editor.  It receives a text
 input from a file or from standard input and it then applies a series of text
@@ -150,7 +151,7 @@ editing commands to the stream and prints its output to standard output.  It
 is often used for substituting text patterns in a stream.  The GNU
 implementation offers several extensions over the standard utility.")
    (license gpl3+)
-   (home-page "http://www.gnu.org/software/sed/")))
+   (home-page "https://www.gnu.org/software/sed/")))
 
 (define-public tar
   (package
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.0

Re: [PATCH] gnu: sed: Update to 4.3.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]

On Wed, Jan 04, 2017 at 05:01:34PM +0100, Marius Bakke wrote:
> * gnu/packages/base.scm (sed): Update to 4.3.
> [source]: Use xz tarball. Remove upstreamed patch.
> [home-page]: Use https.
> [native-inputs]: Add perl.
> * gnu/packages/patches/sed-hurd-path-max.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): Remove it.

Thanks!

We should make sure that the built package doesn't retain a reference to
Perl.

It's interesting that `guix refresh -l sed` doesn't show the full impact
of this change:

$ guix refresh -l sed
Building the following 4 packages would ensure 4 dependent packages are rebuilt: password-store-1.6.5 hydra-20151030.1ff48da bamm-1.7.3 roary-3.7.0

Also, this part of the package definition is incorrect:

(substitute* '("testsuite/bsd.sh"
               "testsuite/bug-regex9.c")
  (("/bin/sh")
   (string-append bash "/bin/bash")))
#t)))))))

Bash and sh behave differently; the replacement string should refer to
'/bin/sh'.

Feel free to correct this in your patch, or I will do it in a later
commit. Let me know what you decide.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] gnu: sed: Update to 4.3.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

On Wed, Jan 04, 2017 at 03:16:38PM -0500, Leo Famulari wrote:
> On Wed, Jan 04, 2017 at 05:01:34PM +0100, Marius Bakke wrote:
> > * gnu/packages/base.scm (sed): Update to 4.3.
> > [source]: Use xz tarball. Remove upstreamed patch.
> > [home-page]: Use https.
> > [native-inputs]: Add perl.
> > * gnu/packages/patches/sed-hurd-path-max.patch: Delete file.
> > * gnu/local.mk (dist_patch_DATA): Remove it.
> 
> Thanks!
> 
> We should make sure that the built package doesn't retain a reference to
> Perl.

I tested it; no Perl reference :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] gnu: sed: Update to 4.3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1195 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Wed, Jan 04, 2017 at 05:01:34PM +0100, Marius Bakke wrote:
>> * gnu/packages/base.scm (sed): Update to 4.3.
>> [source]: Use xz tarball. Remove upstreamed patch.
>> [home-page]: Use https.
>> [native-inputs]: Add perl.
>> * gnu/packages/patches/sed-hurd-path-max.patch: Delete file.
>> * gnu/local.mk (dist_patch_DATA): Remove it.
>
> Thanks!
>
> We should make sure that the built package doesn't retain a reference to
> Perl.

Thanks for checking (in the other email!) :-)

> It's interesting that `guix refresh -l sed` doesn't show the full impact
> of this change:
>
> $ guix refresh -l sed
> Building the following 4 packages would ensure 4 dependent packages are rebuilt: password-store-1.6.5 hydra-20151030.1ff48da bamm-1.7.3 roary-3.7.0
>
> Also, this part of the package definition is incorrect:
>
> (substitute* '("testsuite/bsd.sh"
>                "testsuite/bug-regex9.c")
>   (("/bin/sh")
>    (string-append bash "/bin/bash")))
> #t)))))))
>
> Bash and sh behave differently; the replacement string should refer to
> '/bin/sh'.

Good catch! I fixed this too and pushed to 'core-updates' as
7d7ea947f56e5080c9913f311ede71475045b9d6 .

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]