rekahsoft/guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: squashfs-tools: Update to 4.6.1. [security fixes]

Browse Source 
This fixes CVE-2021-40153 and CVE-2021-41072.

* gnu/packages/compression.scm (squashfs-tools): Update to 4.6.1.
[arguments]: Improve style.
<#:make-flags>: Add INSTALL_MANPAGES_DIR value.
<#:phases>: Remove phase 'install-documentation. Add phase
'patch-generated-source-shebangs.
[native-inputs]: Add coreutils-minimal, help2man, which.
[inputs]: Remove labels.

Change-Id: I095427f071ad0f8d1d2609cfc4dd3ed719ece812
This commit is contained in:
Nicolas Graves 2024-11-03 17:02:09 +01:00 committed by Zheng Junjie
parent dde8ec55b7
commit 99bac834ea
No known key found for this signature in database
GPG Key ID: 3B5AA993E1A2DFF0
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gnu/packages/compression.scm
View File

@ -1023,7 +1023,7 @@ (define-public lz4
(define-public squashfs-tools (define-public squashfs-tools
(package (package
(name "squashfs-tools") (name "squashfs-tools")
(version "4.5") (version "4.6.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1032,34 +1032,34 @@ (define-public squashfs-tools
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "18d4nwa22vgb8j2badngjngw63f0lj501cvlh3920wqy2mqxwav6")))) (base32 "14nisidxx2d2qivyv7xfcg59qkj4fjiniir7nvymazdsng63gcr1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no check target (list
#:make-flags #:tests? #f ; no check target
(list (string-append "CC=" ,(cc-for-target)) #:make-flags
"XZ_SUPPORT=1" #~(list
"LZO_SUPPORT=1" (string-append "CC=" #$(cc-for-target))
"LZ4_SUPPORT=1" "XZ_SUPPORT=1"
"ZSTD_SUPPORT=1" "LZO_SUPPORT=1"
(string-append "INSTALL_DIR=" (assoc-ref %outputs "out") "/bin")) "LZ4_SUPPORT=1"
#:phases "ZSTD_SUPPORT=1"
(modify-phases %standard-phases (string-append "INSTALL_DIR=" #$output "/bin")
(replace 'configure (string-append "INSTALL_MANPAGES_DIR=" #$output "/share/man/man1"))
(lambda _ #:phases
(chdir "squashfs-tools"))) #~(modify-phases %standard-phases
(add-after 'install 'install-documentation (replace 'configure
;; Install what very little usage documentation is provided. (lambda _
(lambda* (#:key outputs #:allow-other-keys) (chdir "squashfs-tools")))
(let* ((out (assoc-ref outputs "out")) (add-after 'patch-source-shebangs 'patch-generated-source-shebangs
(doc (string-append out "/share/doc/" ,name))) (lambda _
(install-file "../USAGE" doc))))))) (substitute* (find-files "generate-manpages" "\\.sh")
(("print \"#!/bin/sh")
(string-append "print \"#!" (which "sh")))))))))
(native-inputs
(list coreutils-minimal help2man which))
(inputs (inputs
`(("lz4" ,lz4) (list lz4 lzo xz zlib `(,zstd "lib")))
("lzo" ,lzo)
("xz" ,xz)
("zlib" ,zlib)
("zstd:lib" ,zstd "lib")))
(home-page "https://github.com/plougher/squashfs-tools") (home-page "https://github.com/plougher/squashfs-tools")
(synopsis "Tools to create and extract squashfs file systems") (synopsis "Tools to create and extract squashfs file systems")
(description (description