From c762d09e89746025bc38299a933e7e6aa611b8b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Feb 2017 07:39:05 +0100 Subject: gnu: bash-completion: Update to 2.5. * gnu/packages/bash.scm (bash-completion): Update to 2.5. --- gnu/packages/bash.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/bash.scm') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index c121fd84d6..c3b94391e1 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -281,7 +281,7 @@ can apply to a patch-level 0 Bash." (define-public bash-completion (package (name "bash-completion") - (version "2.4") + (version "2.5") (source (origin (method url-fetch) (uri (string-append @@ -289,7 +289,7 @@ can apply to a patch-level 0 Bash." version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1xlhd09sb2w3bw8qaypxgkr0782w082mcbx8zf7yzjgy0996pxy0")) + "1kwmii1z1ljx5i4z702ynsr8jgrq64bj9w9hl3n2aa2kcl659fdh")) (patches (search-patches "bash-completion-directories.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From 6c5b56f9fa01b7fe9034bac47b20e08a2fdb2629 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 Mar 2017 23:42:13 +0100 Subject: gnu: bash: Use the bootstrap Guile in 'url-fetch/reset-patch-level'. Fixes . Reported by Sirgazil, Ricardo Wurmus, Andy Wingo, and others. * guix/download.scm (in-band-download): Always use GUILE. This reverts 9f05908fb1e3707cae593d94688748294717a546. * gnu/packages/bash.scm (url-fetch/reset-patch-level): Remove #:guile. Pass %BOOTSTRAP-GUILE as #:guile to 'url-fetch'. Remove #:guile-for-build argument in 'gexp->derivation' call. --- gnu/packages/bash.scm | 9 ++++++--- guix/download.scm | 5 +---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/bash.scm') diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index c3b94391e1..388f5271c1 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -21,6 +21,7 @@ (define-module (gnu packages bash) #:use-module (guix licenses) #:use-module (gnu packages) + #:use-module (gnu packages bootstrap) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) #:use-module (gnu packages bison) @@ -243,14 +244,17 @@ without modification.") (define* (url-fetch/reset-patch-level url hash-algo hash #:optional name - #:key (system (%current-system)) guile) + #:key (system (%current-system))) "Fetch the Bash patch from URL and reset its 'PATCHLEVEL' definition so it can apply to a patch-level 0 Bash." + ;; Note: Forcefully use %BOOTSTRAP-GUILE here to work around bootstrapping + ;; issues when using a daemon that lacks the "download" built-in. See + ;; . (mlet* %store-monad ((name -> (or name (basename url))) (patch (url-fetch url hash-algo hash (string-append name ".orig") #:system system - #:guile guile))) + #:guile %bootstrap-guile))) (gexp->derivation name (with-imported-modules '((guix build utils)) #~(begin @@ -259,7 +263,6 @@ can apply to a patch-level 0 Bash." (substitute* #$output (("PATCHLEVEL [0-6]+") "PATCHLEVEL 0")))) - #:guile-for-build guile #:system system))) (define bash/fixed ;CVE-2017-5932 (RCE with completion) diff --git a/guix/download.scm b/guix/download.scm index 86f8598812..813f51f489 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -418,10 +418,7 @@ GnuTLS itself and its dependencies. See ." ;; hash of the expected result. #:verify-certificate? #f))))) - (mlet %store-monad ((guile (package->derivation - (or guile - (@@ (gnu packages bootstrap) %bootstrap-guile)) - system))) + (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation file-name builder #:guile-for-build guile #:system system -- cgit 1.4.1