24/29: download: 'url-fetch/tarbomb' and 'url-fetch/zipbomb' refer to native tools.

[guix-commits]

civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.

commit 29a9e619c98ae8e7e10713bb064868f9a596df91
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