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.
This commit is contained in:
parent
6de3ef0d5e
commit
9d349afaa1
@ -1,5 +1,5 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; 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 © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
|
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
|
||||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||||
@ -535,9 +535,9 @@ own. This helper makes it easier to deal with \"tar bombs\"."
|
|||||||
#~(begin
|
#~(begin
|
||||||
(use-modules (guix build utils))
|
(use-modules (guix build utils))
|
||||||
(mkdir #$output)
|
(mkdir #$output)
|
||||||
(setenv "PATH" (string-append #$gzip "/bin"))
|
(setenv "PATH" (string-append #+gzip "/bin"))
|
||||||
(chdir #$output)
|
(chdir #$output)
|
||||||
(invoke (string-append #$tar "/bin/tar")
|
(invoke (string-append #+tar "/bin/tar")
|
||||||
"xf" #$drv)))
|
"xf" #$drv)))
|
||||||
#:system system
|
#:system system
|
||||||
#:guile-for-build guile
|
#:guile-for-build guile
|
||||||
@ -574,7 +574,7 @@ own. This helper makes it easier to deal with \"zip bombs\"."
|
|||||||
(use-modules (guix build utils))
|
(use-modules (guix build utils))
|
||||||
(mkdir #$output)
|
(mkdir #$output)
|
||||||
(chdir #$output)
|
(chdir #$output)
|
||||||
(invoke (string-append #$unzip "/bin/unzip")
|
(invoke (string-append #+unzip "/bin/unzip")
|
||||||
#$drv)))
|
#$drv)))
|
||||||
#:system system
|
#:system system
|
||||||
#:guile-for-build guile
|
#:guile-for-build guile
|
||||||
|
Loading…
Reference in New Issue
Block a user