From 7f0980839e4d9d3c7e06301bcbb2eb292bd7dbee Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 7 Jul 2017 16:34:10 +0200
Subject: gnu: wget: Fix compilation with Perl 5.26; skip faulty tests.

* gnu/packages/wget.scm (wget)[arguments]: New field.
[source](patches): Add "wget-perl-5.26.patch".
* gnu/packages/patches/wget-perl-5.26.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/packages/wget.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/wget.scm')

diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm
index a73c68004d..58a1a4b885 100644
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -41,11 +41,23 @@
       (uri (string-append "mirror://gnu/wget/wget-"
                           version ".tar.xz"))
       (patches (search-patches "wget-CVE-2017-6508.patch"
-                               "wget-fix-504-test-timeout.patch"))
+                               "wget-fix-504-test-timeout.patch"
+                               "wget-perl-5.26.patch"))
       (sha256
        (base32
         "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c"))))
     (build-system gnu-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'check 'disable-https-tests
+                    (lambda _
+                      ;; XXX: Skip TLS tests, which fail with "The
+                      ;; certificate's owner does not match hostname" for
+                      ;; obscure reasons reported at:
+                      ;; <https://lists.gnu.org/archive/html/bug-wget/2017-06/msg00009.html>.
+                      (substitute* "testenv/Makefile"
+                        (("SSL_TESTS=1") ""))
+                      #t)))))
     (inputs
      `(("gnutls" ,gnutls)
        ("libidn2" ,libidn2)
-- 
cgit v1.2.3


From 3512bd4d1ca5946cda44854bf0d526c6c288ad4c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 8 Jul 2017 16:39:45 +0200
Subject: gnu: wget: Update comment about test failures.

* gnu/packages/wget.scm (wget)[arguments]: Update comment.
---
 gnu/packages/wget.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/wget.scm')

diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm
index 58a1a4b885..3673ad5cc4 100644
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -52,9 +52,13 @@
                   (add-before 'check 'disable-https-tests
                     (lambda _
                       ;; XXX: Skip TLS tests, which fail with "The
-                      ;; certificate's owner does not match hostname" for
-                      ;; obscure reasons reported at:
-                      ;; <https://lists.gnu.org/archive/html/bug-wget/2017-06/msg00009.html>.
+                      ;; certificate's owner does not match hostname" as
+                      ;; reported at:
+                      ;; <https://lists.gnu.org/archive/html/bug-wget/2017-07/msg00012.html>.
+                      ;; The problem appears to be due to a change in GnuTLS
+                      ;; 3.5.12, whereby 'gnutls_x509_crt_check_hostname2' no
+                      ;; longer matches IP address against the 'CN' or
+                      ;; 'DNSname' fields of certificates.
                       (substitute* "testenv/Makefile"
                         (("SSL_TESTS=1") ""))
                       #t)))))
-- 
cgit v1.2.3