From fdcbe78b14b8ef2f11b3ba8ff261d3972ca3ef90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 14 Mar 2018 06:27:07 +0100 Subject: gnu: kurly: Update to 1.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/curl.scm (kurly): Update to 1.2.1. [arguments]: Install the man page, and put README.md in its right place. Rename ‘install-readme’ to ‘install-documentation’ to match this change. --- gnu/packages/curl.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 32509fc3fc..ccff18e632 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,7 +153,7 @@ tunneling, and so on.") (define-public kurly (package (name "kurly") - (version "1.1.0") + (version "1.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -161,19 +162,24 @@ tunneling, and so on.") (file-name (git-file-name name version)) (sha256 (base32 - "1q192f457sjypgvwq7grrf8gq8w272p3zf1d5ppc20mriqm0mbc3")))) + "01kp33gvzxmk6ipz7323wqwmbc90q2mwzsjig8rzpqsm4kji5hi6")))) (build-system go-build-system) (arguments `(#:import-path "github.com/davidjpeacock/kurly" #:install-source? #f #:phases (modify-phases %standard-phases - (add-after 'install 'install-readme - (lambda* (#:key outputs import-path #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (readme (string-append "src/" import-path "/README.md")) - (misc (string-append out "/share/kurly/misc/"))) - (install-file readme misc) + (add-after 'install 'install-documentation + (lambda* (#:key import-path outputs #:allow-other-keys) + (let* ((source (string-append "src/" import-path)) + (out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (man (string-append out "/share/man/man1"))) + (with-directory-excursion source + (install-file "README.md" doc) + (mkdir-p man) + (copy-file "meta/kurly.man" + (string-append man "/kurly.1"))) #t)))))) (inputs `(("go-github-com-alsm-ioprogress" ,go-github-com-alsm-ioprogress) -- cgit v1.2.3 From 9a02dcf35a137cfd0f0591ca91c4a918735e8f1a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Mar 2018 16:26:09 +0100 Subject: gnu: curl: Update replacement to 7.59.0 [security fixes]. This fixes CVE-2018-1000120, CVE-2018-1000121, and CVE-2018-1000122. * gnu/packages/curl.scm (curl-7.58.0): Rename to ... (curl-7.59.0): ... this. Update source hash. (curl)[replacement]: Adjust accordingly. --- gnu/packages/curl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/curl.scm') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index ccff18e632..fbf177d9da 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -48,7 +48,7 @@ (package (name "curl") (version "7.57.0") - (replacement curl-7.58.0) + (replacement curl-7.59.0) (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" @@ -137,10 +137,10 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.58.0 +(define-public curl-7.59.0 (package (inherit curl) - (version "7.58.0") + (version "7.59.0") (source (origin (method url-fetch) @@ -148,7 +148,7 @@ tunneling, and so on.") version ".tar.xz")) (sha256 (base32 - "1qz303lagxidmkyym90mxiaqnqddwi2219vzydsyn29n4iski0ba")))))) + "1z310hrjm2vmbcpkyp81dcmj9rk127zkjyawpy2pah0nz6yslkp4")))))) (define-public kurly (package -- cgit v1.2.3