[PATCH 0/2] Update cURL to 7.35.0 and fix its tests

[PATCH 0/2] Update cURL to 7.35.0 and fix its tests

[Sree Harsha Totakura]

The following patches update cURL to 7.35.0 and fix its test cases.

Sree Harsha Totakura (2):
  gnu: curl: Update to 7.35.0.
  gnu: curl: Fix tests.

 gnu/packages/curl.scm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

-- 
1.8.5.3

[PATCH 1/2] gnu: curl: Update to 7.35.0.

[Sree Harsha Totakura]

* gnu/packages/curl.scm (curl): Update to 7.35.0.
---
 gnu/packages/curl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index a9bfa76..ea7dbf6 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -36,14 +36,14 @@
 (define-public curl
   (package
    (name "curl")
-   (version "7.28.1")
+   (version "7.35.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "http://curl.haxx.se/download/curl-"
                                 version ".tar.lzma"))
             (sha256
              (base32
-              "13bhfs41yf60ys2hrikqxjwfzaj0gm91kqzsgc5fr4grzmpm38nx"))
+              "14w5cwh6b1426lxkq6kp6h4vxryr4n7wfrrwhny1r4123q7n8ab9"))
             (patches
              ;; This patch fixes testcase 172 which uses a hardcoded cookie
              ;; expiration value which is expired as of Feb 1, 2014.
-- 
1.8.5.3

[PATCH 2/2] gnu: curl: Fix tests.

[Sree Harsha Totakura]

* gnu/packages/curl.scm (curl): Add a new phase and python-2 to native-inputs.
---
 gnu/packages/curl.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index ea7dbf6..747535d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages ssh))
 
 (define-public curl
@@ -59,9 +60,20 @@
      `(("perl" ,perl)
        ;; to enable the --manual option and make test 1026 pass
        ("groff" ,groff)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-2)))
    (arguments
-    `(#:configure-flags '("--with-gnutls" "--with-gssapi")))
+    `(#:configure-flags '("--with-gnutls" "--with-gssapi")
+      ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
+      #:phases
+      (alist-cons-before
+       'check 'patch-runtests
+       (lambda _
+         (with-directory-excursion "tests"
+           (substitute* "runtests.pl"
+             (("/bin/sh")
+              (which "sh")))))
+       %standard-phases)))
    (synopsis "curl, command line tool for transferring data with URL syntax")
    (description
     "curl is a command line tool for transferring data with URL syntax,
-- 
1.8.5.3

Re: [PATCH 0/2] Update cURL to 7.35.0 and fix its tests

[Andreas Enge]

On Tue, Feb 18, 2014 at 09:45:56PM +0100, Sree Harsha Totakura wrote:
> The following patches update cURL to 7.35.0 and fix its test cases.

Thanks, also pushed! The patch that you could remove for gnurl is still
needed for curl? Did you make a bug report?

Andreas

Re: [PATCH 0/2] Update cURL to 7.35.0 and fix its tests

[Sree Harsha Totakura]

On 02/18/2014 11:39 PM, Andreas Enge wrote:
> Thanks, also pushed! The patch that you could remove for gnurl is still
> needed for curl? Did you make a bug report?

Yes, it is still needed.  It has been fixed by cURL upstream though, so
we can remove it after the next release.

Sree