From b6b29c7737147bf683eb61bdbc93ad712a228ca7 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Tue, 11 Feb 2014 19:17:33 +0100 Subject: gnu: curl, gnurl: Fix failing testcase 172. * gnu/packages/patches/curl-fix-test172.patch: New file. * gnu-system.am (dist_patch_DATA): Add the patch file. * gnu/packages/gnunet.scm (gnurl): Apply the patch file. * gnu/packages/curl.scm (curl): Apply the patch file. Signed-off-by: Andreas Enge --- gnu/packages/curl.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 7072ed3878..a9bfa76aa0 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -22,6 +22,7 @@ (define-module (gnu packages curl) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages gnutls) #:use-module (gnu packages groff) @@ -42,7 +43,11 @@ (define-public curl version ".tar.lzma")) (sha256 (base32 - "13bhfs41yf60ys2hrikqxjwfzaj0gm91kqzsgc5fr4grzmpm38nx")))) + "13bhfs41yf60ys2hrikqxjwfzaj0gm91kqzsgc5fr4grzmpm38nx")) + (patches + ;; This patch fixes testcase 172 which uses a hardcoded cookie + ;; expiration value which is expired as of Feb 1, 2014. + (list (search-patch "curl-fix-test172.patch"))))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls) ("gss" ,gss) -- cgit v1.2.3 From 2977b307ef0035773d47285855cdbc8f2bade490 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Tue, 18 Feb 2014 21:45:57 +0100 Subject: gnu: curl: Update to 7.35.0. * gnu/packages/curl.scm (curl): Update to 7.35.0. Signed-off-by: Andreas Enge --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a9bfa76aa0..ea7dbf6e21 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -36,14 +36,14 @@ (define-module (gnu packages curl) (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. -- cgit v1.2.3 From c0e57fb876b1bc996b3d30648f427dbf23bc99b4 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Tue, 18 Feb 2014 21:45:58 +0100 Subject: gnu: curl: Fix tests. * gnu/packages/curl.scm (curl): Add a new phase and python-2 to native-inputs. Signed-off-by: Andreas Enge --- gnu/packages/curl.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index ea7dbf6e21..7309da61e6 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -31,6 +31,7 @@ (define-module (gnu packages curl) #: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,18 @@ (define-public curl `(("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 _ + (substitute* "tests/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, -- cgit v1.2.3