gnurl: update and various changes to package definition

gnurl: update and various changes to package definition

[ng0]

[PATCH 1/3] gnu: gnurl: Update to 7.52.0 [fixes CVE.....

I'm aware of the warning the cURL maintainers posted and will make the gnurl release as soon as they release the version of cURL fixing whatever unknown security issue they have.

[PATCH 2/3] gnu: gnurl: Make tests more verbose.

Compare to curl.scm

[PATCH 3/3] gnu: gnurl: Split man pages to doc output.

Man pages are 1.5 MB big. Split it.

[PATCH 1/3] gnu: gnurl: Update to 7.52.0 [fixes CVE-2016-{9586, 9952, 9953}].

[ng0]

* gnu/packages/gnunet.scm (gnurl): Update to 7.52.0.
* [arguments]: Add phases to disable failing test test1026,
and re-run the bootstrap to correct distribution mistakes.
---
 gnu/packages/gnunet.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 5d1baa834..5780f5e25 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -162,7 +162,7 @@ and support for SSL3 and TLS.")
 (define-public gnurl
   (package
    (name "gnurl")
-   (version "7.51.0")
+   (version "7.52.0")
    (source (origin
             (method url-fetch)
             (uri (let ((version-with-underscores
@@ -171,13 +171,16 @@ and support for SSL3 and TLS.")
                                   name "-" version-with-underscores ".tar.bz2")))
             (sha256
              (base32
-              "1rgl4agrzghvyfz1afk1p5ryq4b9cz28lavx8ikrav6aiv9h00ig"))))
+              "0kbm73c7xl7drp4wvpg7919m8nvv0bf5q95pdacz6cpb2awwr3hb"))))
    (build-system gnu-build-system)
    (inputs `(("gnutls" ,gnutls)
              ("libidn" ,libidn)
              ("zlib" ,zlib)))
    (native-inputs
-    `(("groff" ,groff)
+    `(("autoconf" ,autoconf)
+      ("automake" ,automake)
+      ("libtool" ,libtool)
+      ("groff" ,groff)
       ("perl" ,perl)
       ("pkg-config" ,pkg-config)
       ("python" ,python-2)))
@@ -198,6 +201,16 @@ and support for SSL3 and TLS.")
       #:phases
       ;; We have to patch runtests.pl in tests/ directory
       (modify-phases %standard-phases
+        (add-before 'configure 'autoconf
+          ;; Clear artifacts left (shebangs) from release preparation.
+          (lambda _
+            (zero? (system* "./buildconf"))))
+        (add-before 'check 'disable-test1026
+          (lambda _
+            ;; It is unclear why test1026 fails, however the content of it
+            ;; suggests that it is not vital for gnurl.
+            (delete-file "tests/data/test1026")
+            #t))
         (add-before 'check 'patch-runtests
           (lambda _
             (substitute* "tests/runtests.pl"
-- 
2.11.0

[PATCH 2/3] gnu: gnurl: Make tests more verbose.

[ng0]

* gnu/packages/gnunet.scm (gnurl): Make tests more verbose.
Move [arguments](autoconf) phase into ...
new [arguments](check) phase.
[arguments](disable-test1026) phase: likewise.
---
 gnu/packages/gnunet.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 5780f5e25..941e357ce 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -205,16 +205,17 @@ and support for SSL3 and TLS.")
           ;; Clear artifacts left (shebangs) from release preparation.
           (lambda _
             (zero? (system* "./buildconf"))))
-        (add-before 'check 'disable-test1026
+        (replace 'check
           (lambda _
             ;; It is unclear why test1026 fails, however the content of it
             ;; suggests that it is not vital for gnurl.
             (delete-file "tests/data/test1026")
-            #t))
-        (add-before 'check 'patch-runtests
-          (lambda _
+
             (substitute* "tests/runtests.pl"
               (("/bin/sh") (which "sh")))
+
+            ;; Make test output more verbose.
+            (zero? (system* "make" "-C" "tests" "test"))
             #t)))))
    (synopsis "Microfork of cURL with support for the HTTP/HTTPS/GnuTLS subset of cURL")
    (description
-- 
2.11.0

[PATCH 3/3] gnu: gnurl: Split man pages to doc output.

[ng0]

* gnu/packages/gnunet.scm (gnurl): Split the man pages into the doc output.
[arguments](phases)(move-man3-pages): New phase.
---
 gnu/packages/gnunet.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 941e357ce..4e0e5c70a 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -173,6 +173,8 @@ and support for SSL3 and TLS.")
              (base32
               "0kbm73c7xl7drp4wvpg7919m8nvv0bf5q95pdacz6cpb2awwr3hb"))))
    (build-system gnu-build-system)
+   (outputs '("out"
+              "doc"))                             ; 1.5 MiB of man3 pages
    (inputs `(("gnutls" ,gnutls)
              ("libidn" ,libidn)
              ("zlib" ,zlib)))
@@ -201,6 +203,15 @@ and support for SSL3 and TLS.")
       #:phases
       ;; We have to patch runtests.pl in tests/ directory
       (modify-phases %standard-phases
+        (add-after 'install 'move-man3-pages
+          (lambda* (#:key outputs #:allow-other-keys)
+            ;; Move section 3 man pages to "doc".
+            (let ((out (assoc-ref outputs "out"))
+                  (doc (assoc-ref outputs "doc")))
+              (mkdir-p (string-append doc "/share/man"))
+              (rename-file (string-append out "/share/man/man3")
+                           (string-append doc "/share/man/man3"))
+              #t)))
         (add-before 'configure 'autoconf
           ;; Clear artifacts left (shebangs) from release preparation.
           (lambda _
-- 
2.11.0

Re: gnurl: update and various changes to package definition

[ng0]

ng0 <ng0@libertad.pw> writes:

> [PATCH 1/3] gnu: gnurl: Update to 7.52.0 [fixes CVE.....
>
> I'm aware of the warning the cURL maintainers posted and will make the gnurl release as soon as they release the version of cURL fixing whatever unknown security issue they have.

In my opinion, we can wait until I have released the version
which fixes whatever is so insecure in cURL at the moment. I will
rebase this patchset and send again then, skipping the version
released on 2016-12-21.

What do you think?

> [PATCH 2/3] gnu: gnurl: Make tests more verbose.
>
> Compare to curl.scm
>
> [PATCH 3/3] gnu: gnurl: Split man pages to doc output.
>
> Man pages are 1.5 MB big. Split it.
>
>

-- 
♥Ⓐ  ng0  | PGP keys and more: https://n0is.noblogs.org/
         |                    http://ng0.chaosnet.org

gnurl, update to 7.52.1 (and: more verbose tests + split man pages to "doc")

[ng0]

Following the release of cURL 7.52.1 today, I just released gnurl 7.52.1
still haven't had the time to adapt the maketgz or make dist for GuixSD, so following my own advice I re-run ./buildconf

Upstream info: https://gnunet.org/node/2642


Thanks for your review

[PATCH 1/3] gnu: gnurl: Update to 7.52.1 [fixes CVE-2016-{9586, 9952, 9953, 9594}].

[ng0]

* gnu/packages/gnunet.scm (gnurl): Update to 7.52.1.
* [arguments]: Add phases to disable failing test test1026,
and re-run the bootstrap to correct distribution mistakes.
---
 gnu/packages/gnunet.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 5d1baa834..fb72540dc 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -162,7 +162,7 @@ and support for SSL3 and TLS.")
 (define-public gnurl
   (package
    (name "gnurl")
-   (version "7.51.0")
+   (version "7.52.1")
    (source (origin
             (method url-fetch)
             (uri (let ((version-with-underscores
@@ -171,13 +171,16 @@ and support for SSL3 and TLS.")
                                   name "-" version-with-underscores ".tar.bz2")))
             (sha256
              (base32
-              "1rgl4agrzghvyfz1afk1p5ryq4b9cz28lavx8ikrav6aiv9h00ig"))))
+              "1gn6mvab2vhfj9637ykg1zjzb23fngfnyd24wlgxmjhf49pn334h"))))
    (build-system gnu-build-system)
    (inputs `(("gnutls" ,gnutls)
              ("libidn" ,libidn)
              ("zlib" ,zlib)))
    (native-inputs
-    `(("groff" ,groff)
+    `(("autoconf" ,autoconf)
+      ("automake" ,automake)
+      ("libtool" ,libtool)
+      ("groff" ,groff)
       ("perl" ,perl)
       ("pkg-config" ,pkg-config)
       ("python" ,python-2)))
@@ -198,6 +201,16 @@ and support for SSL3 and TLS.")
       #:phases
       ;; We have to patch runtests.pl in tests/ directory
       (modify-phases %standard-phases
+        (add-before 'configure 'autoconf
+          ;; Clear artifacts left (shebangs) from release preparation.
+          (lambda _
+            (zero? (system* "./buildconf"))))
+        (add-before 'check 'disable-test1026
+          (lambda _
+            ;; It is unclear why test1026 fails, however the content of it
+            ;; suggests that it is not vital for gnurl.
+            (delete-file "tests/data/test1026")
+            #t))
         (add-before 'check 'patch-runtests
           (lambda _
             (substitute* "tests/runtests.pl"
-- 
2.11.0

[PATCH 2/3] gnu: gnurl: Make tests more verbose.

[ng0]

* gnu/packages/gnunet.scm (gnurl): Make tests more verbose.
Move [arguments](autoconf) phase into ...
new [arguments](check) phase.
[arguments](disable-test1026) phase: likewise.
---
 gnu/packages/gnunet.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index fb72540dc..495a7de88 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -205,16 +205,17 @@ and support for SSL3 and TLS.")
           ;; Clear artifacts left (shebangs) from release preparation.
           (lambda _
             (zero? (system* "./buildconf"))))
-        (add-before 'check 'disable-test1026
+        (replace 'check
           (lambda _
             ;; It is unclear why test1026 fails, however the content of it
             ;; suggests that it is not vital for gnurl.
             (delete-file "tests/data/test1026")
-            #t))
-        (add-before 'check 'patch-runtests
-          (lambda _
+
             (substitute* "tests/runtests.pl"
               (("/bin/sh") (which "sh")))
+
+            ;; Make test output more verbose.
+            (zero? (system* "make" "-C" "tests" "test"))
             #t)))))
    (synopsis "Microfork of cURL with support for the HTTP/HTTPS/GnuTLS subset of cURL")
    (description
-- 
2.11.0

[PATCH 3/3] gnu: gnurl: Split man pages to doc output.

[ng0]

* gnu/packages/gnunet.scm (gnurl): Split the man pages into the doc output.
[arguments](phases)(move-man3-pages): New phase.
---
 gnu/packages/gnunet.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 495a7de88..27e1ffb4e 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -173,6 +173,8 @@ and support for SSL3 and TLS.")
              (base32
               "1gn6mvab2vhfj9637ykg1zjzb23fngfnyd24wlgxmjhf49pn334h"))))
    (build-system gnu-build-system)
+   (outputs '("out"
+              "doc"))                             ; 1.5 MiB of man3 pages
    (inputs `(("gnutls" ,gnutls)
              ("libidn" ,libidn)
              ("zlib" ,zlib)))
@@ -201,6 +203,15 @@ and support for SSL3 and TLS.")
       #:phases
       ;; We have to patch runtests.pl in tests/ directory
       (modify-phases %standard-phases
+        (add-after 'install 'move-man3-pages
+          (lambda* (#:key outputs #:allow-other-keys)
+            ;; Move section 3 man pages to "doc".
+            (let ((out (assoc-ref outputs "out"))
+                  (doc (assoc-ref outputs "doc")))
+              (mkdir-p (string-append doc "/share/man"))
+              (rename-file (string-append out "/share/man/man3")
+                           (string-append doc "/share/man/man3"))
+              #t)))
         (add-before 'configure 'autoconf
           ;; Clear artifacts left (shebangs) from release preparation.
           (lambda _
-- 
2.11.0