[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: download: 'url-fetch/tarbomb' and 'url-fetch/zipbomb' refer to na
From: |
guix-commits |
Subject: |
03/06: download: 'url-fetch/tarbomb' and 'url-fetch/zipbomb' refer to native tools. |
Date: |
Fri, 5 Mar 2021 05:46:44 -0500 (EST) |
civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.
commit 0ac434a083dc7f3b33e5a4e84ebb53914b3a3355
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Mar 5 09:41:40 2021 +0100
download: 'url-fetch/tarbomb' and 'url-fetch/zipbomb' refer to native tools.
* guix/download.scm (url-fetch/tarbomb, url-fetch/zipbomb): Use
'ungexp-native' instead of 'ungexp' when referring to the decompression
tools.
---
guix/download.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/download.scm b/guix/download.scm
index 4948258..579996f 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic
Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@ -535,9 +535,9 @@ own. This helper makes it easier to deal with \"tar
bombs\"."
#~(begin
(use-modules (guix build utils))
(mkdir #$output)
- (setenv "PATH" (string-append #$gzip "/bin"))
+ (setenv "PATH" (string-append #+gzip "/bin"))
(chdir #$output)
- (invoke (string-append #$tar "/bin/tar")
+ (invoke (string-append #+tar "/bin/tar")
"xf" #$drv)))
#:system system
#:guile-for-build guile
@@ -574,7 +574,7 @@ own. This helper makes it easier to deal with \"zip
bombs\"."
(use-modules (guix build utils))
(mkdir #$output)
(chdir #$output)
- (invoke (string-append #$unzip "/bin/unzip")
+ (invoke (string-append #+unzip "/bin/unzip")
#$drv)))
#:system system
#:guile-for-build guile
- branch wip-build-systems-gexp updated (b1da83b -> 063beaa), guix-commits, 2021/03/05
- 01/06: gexp: Honor #:target in 'compiled-modules'., guix-commits, 2021/03/05
- 03/06: download: 'url-fetch/tarbomb' and 'url-fetch/zipbomb' refer to native tools.,
guix-commits <=
- 02/06: packages: '%standard-patch-inputs' is not influenced by '%current-target-system'., guix-commits, 2021/03/05
- 05/06: squash! build-system: Rewrite using gexps, guix-commits, 2021/03/05
- 06/06: tests: Refer to '%derivation-cache' in the right module., guix-commits, 2021/03/05
- 04/06: squash! packages: Core procedures are written in monadic style., guix-commits, 2021/03/05