diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2024-10-08 08:19:26 +0200 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-10-11 13:40:57 +0100 |
| commit | e347386a7ff96fce644894ba2a0889d273500e11 (patch) | |
| tree | 674bc80f537ec25c3ef0b122136e74b483a95bf6 /gnu/packages | |
| parent | 74b012310f22836db05cd63d9ac2d88c1d4b9efe (diff) | |
| download | guix-e347386a7ff96fce644894ba2a0889d273500e11.tar guix-e347386a7ff96fce644894ba2a0889d273500e11.tar.gz | |
gnu: toybox: Update to 0.8.11. [security fixes]
This fixes CVE-2022-32298.
* gnu/packages/busybox.scm (toybox): Update to 0.8.11.
[arguments]<#:phases>: Adjust phase 'fix-or-skip-broken-tests.
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/busybox.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index a8b775b944..f811a7175f 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -130,7 +130,7 @@ any small or embedded system.") (define-public toybox (package (name "toybox") - (version "0.8.7") + (version "0.8.11") (source (origin (method url-fetch) (uri (string-append @@ -138,7 +138,7 @@ any small or embedded system.") version ".tar.gz")) (sha256 (base32 - "150lvp7hf9ndafvmr42kb8xi86hxjd2zj4binwwhgjw2dwrvy25m")))) + "1p37zqxhj48klwwxl8jc2hw1x7pr2w39bfb1nx6qghaf5y1kzahm")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -154,11 +154,15 @@ any small or embedded system.") (lambda _ ;; Some tests expect $USER to magically be the current user. (setenv "USER" (passwd:name (getpwnam (geteuid)))) + ;; This uses /bin/sh. + (substitute* "tests/timeout.test" + (("/bin/sh") (which "bash"))) ;; This expects directories to be exactly 4K. They aren't! (delete-file "tests/du.test") ;; Delete tests that expect a root or 0 user to exist. (substitute* "tests/id.test" - (("^testing .*[ \\(]root.*") "")))) + (("^testing .*[ \\(]root.*") "")) + (delete-file "tests/tar.test"))) (add-after 'install 'remove-usr-directory (lambda* (#:key outputs #:allow-other-keys) (delete-file-recursively (string-append #$output "/usr"))))) |