From 7d9ca5c4b55a22da249ff2afec07e0d0f7a623f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 19:45:27 +0100 Subject: gnu: curl: Remove graft for 7.64.0. * gnu/packages/curl.scm (curl): Update to 7.64.0. (curl-7.64.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 12a82d1bb7..2e14e05c2c 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (replacement curl-7.64.0) - (version "7.63.0") + (version "7.64.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1i38v49233jirzlfqd8fy6jyf80assa953hk7w6qmysbg562604n")))) + "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -142,19 +141,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.64.0 - (package - (inherit curl) - (version "7.64.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))))) - (define-public kurly (package (name "kurly") -- cgit 1.4.1 From 1ec290e27a52f92373d06b76afb0b677ea5d4aa0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:08:36 +0200 Subject: gnu: curl: Update to 7.64.1. * gnu/packages/curl.scm (curl): Update to 7.64.1. --- 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 c8c1b0ca0d..32b120541d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,14 +51,14 @@ (define-public curl (package (name "curl") - (version "7.64.0") + (version "7.64.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))) + "1cwg2skp953cqxbwn9ychy0lv4p3l38bsy3zz9xy6747gwm36llj")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit 1.4.1 From 828d3765a71ce1b74d1ab122c84d5c16eabf98b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 17:16:25 +0100 Subject: gnu: curl: Build against MIT Kerberos instead of GSS. * gnu/packages/curl.scm (curl)[inputs]: Change from GSS to MIT-KRB5. [arguments]: Adjust accordingly. --- gnu/packages/curl.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 32b120541d..a83760adc1 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -37,8 +37,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages golang) #:use-module (gnu packages groff) - #:use-module (gnu packages gsasl) #:use-module (gnu packages guile) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libidn) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -63,7 +63,6 @@ (outputs '("out" "doc")) ;1.2 MiB of man3 pages (inputs `(("gnutls" ,gnutls) - ("gss" ,gss) ("libidn" ,libidn) ;; TODO XXX ;; Curl doesn't actually use or refer to libssh2 because the build @@ -71,6 +70,7 @@ ;; a mass rebuild is appropriate (e.g. core-updates). ("libssh2" ,libssh2-1.8.0) ("openldap" ,openldap) + ("mit-krb5" ,mit-krb5) ("nghttp2" ,nghttp2 "lib") ("zlib" ,zlib))) (native-inputs @@ -89,8 +89,10 @@ (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi" - "--disable-static") + `(#:configure-flags (list "--with-gnutls" + (string-append "--with-gssapi=" + (assoc-ref %build-inputs "mit-krb5")) + "--disable-static") ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl #:phases (modify-phases %standard-phases -- cgit 1.4.1 From 52cb7748cbdb61b87e5c2bbc99e12284f21a304d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 May 2019 20:08:36 +0200 Subject: gnu: curl: Remove unused input. * gnu/packages/curl.scm (curl)[inputs]: Remove LIBSSH2-1.8.0. * gnu/packages/ssh.scm (libssh2-1.8.0): Remove variable. --- gnu/packages/curl.scm | 5 ----- gnu/packages/ssh.scm | 18 ------------------ 2 files changed, 23 deletions(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a83760adc1..9a13815e3d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -64,11 +64,6 @@ "doc")) ;1.2 MiB of man3 pages (inputs `(("gnutls" ,gnutls) ("libidn" ,libidn) - ;; TODO XXX - ;; Curl doesn't actually use or refer to libssh2 because the build - ;; is not configured with '--with-libssh2'. Remove this input when - ;; a mass rebuild is appropriate (e.g. core-updates). - ("libssh2" ,libssh2-1.8.0) ("openldap" ,openldap) ("mit-krb5" ,mit-krb5) ("nghttp2" ,nghttp2 "lib") diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index e887cd7e70..a763c6aba2 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -143,24 +143,6 @@ a server that supports the SSH-2 protocol.") (license license:bsd-3) (home-page "https://www.libssh2.org/"))) -;; XXX A hidden special obsolete libssh2 for temporary use in the curl package. -;; -(define-public libssh2-1.8.0 - (hidden-package - (package - (inherit libssh2) - (version "1.8.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.libssh2.org/download/libssh2-" - version ".tar.gz")) - (sha256 - (base32 - "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) - (patches - (search-patches "libssh2-fix-build-failure-with-gcrypt.patch"))))))) - (define-public openssh (package (name "openssh") -- cgit 1.4.1 From 74659ebef1f6da73eac2ac1bf357c85e8add1118 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 May 2019 00:30:09 +0200 Subject: gnu: curl: Remove graft for 7.65.0. * gnu/packages/curl.scm (curl): Update to 7.65.0. (curl-7.65.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 338d26d2e3..5be31ff73e 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,15 +51,14 @@ (define-public curl (package (name "curl") - (replacement curl-7.65.0) - (version "7.64.1") + (version "7.65.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1cwg2skp953cqxbwn9ychy0lv4p3l38bsy3zz9xy6747gwm36llj")))) + "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -144,19 +143,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.65.0 - (package - (inherit curl) - (version "7.65.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))))) - (define-public kurly (package (name "kurly") -- cgit 1.4.1 From 1b4c3faff4a412e8478184bc7b41fa23c78c4320 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 May 2019 18:16:45 +0200 Subject: gnu: curl: Remove unused module import. This is a follow-up to commit 52cb7748cbdb61b87e5c2bbc99e12284f21a304d. * gnu/packages/curl.scm: Don't import (gnu packages ssh). --- gnu/packages/curl.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 5be31ff73e..6d1ab81d07 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages web)) -- cgit 1.4.1 From 755e81aba157b720b2c9d32100adb239cd96b5ec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:54:48 +0200 Subject: gnu: curl: Update to 7.65.1. * gnu/packages/curl.scm (curl): Update to 7.65.1. --- 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 6d1ab81d07..8605c12124 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,14 +50,14 @@ (define-public curl (package (name "curl") - (version "7.65.0") + (version "7.65.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))) + "0ym7b741hp4mgrvgp2z5ia7kb0pfqzdmfc65qzmml8vzhxs21hpn")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit 1.4.1 From 53ffc043af88920063c161d0a4c3c9617df4a502 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:55:52 +0200 Subject: gnu: cURL: Build against Python 3. * gnu/packages/curl.scm (curl)[native-inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/curl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 8605c12124..24932c9f99 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -72,7 +72,7 @@ ;; to enable the --manual option and make test 1026 pass ("groff" ,groff) ("pkg-config" ,pkg-config) - ("python" ,python-2))) + ("python" ,python-wrapper))) (native-search-paths ;; Note: This search path is respected by the `curl` command-line tool only. ;; Ideally we would bake this into libcurl itself so other users can benefit, -- cgit 1.4.1 From 888940c2d3ad81826741f4fcdf0b330c7c7799f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:29:16 +0200 Subject: gnu: curl: Update to 7.65.3. * gnu/packages/curl.scm (curl): Update to 7.65.3. --- 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 24932c9f99..5e1e7eb400 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,14 +50,14 @@ (define-public curl (package (name "curl") - (version "7.65.1") + (version "7.65.3") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "0ym7b741hp4mgrvgp2z5ia7kb0pfqzdmfc65qzmml8vzhxs21hpn")))) + "1sjz4fq7jg96mpmpqq82nd61njna6jp3c4m9yrbx2j1rh5a8ingj")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit 1.4.1