me
/
guix
Archived
1
0
Fork 0
Code

gnu: unzip: Incorporate grafted changes. 

* gnu/packages/compression.scm (unzip)[replacement]: Remove.
[source](patches): Add unzip-CVE-2022-0529+CVE-2022-0530.patch.
(unzip/fixed): Remove variable.
master
Marius Bakke 2022-08-12 00:08:41 +02:00
parent 22b6eb8740
commit 749d0d96a8
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/compression.scm
View File

@ -1749,7 +1749,6 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
(package (inherit zip) (package (inherit zip)
(name "unzip") (name "unzip")
(version "6.0") (version "6.0")
(replacement unzip/fixed)
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1795,7 +1794,9 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
"unzip-zipbomb-part3.patch" "unzip-zipbomb-part3.patch"
;; https://github.com/madler/unzip/issues/2 ;; https://github.com/madler/unzip/issues/2
"unzip-32bit-zipbomb-fix.patch")))) "unzip-32bit-zipbomb-fix.patch"
"unzip-CVE-2022-0529+CVE-2022-0530.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO
(arguments (arguments
@ -1840,15 +1841,6 @@ recreates the stored directory structure by default.")
(license (license:non-copyleft "file://LICENSE" (license (license:non-copyleft "file://LICENSE"
"See LICENSE in the distribution.")))) "See LICENSE in the distribution."))))
(define unzip/fixed
(package (inherit unzip)
(source
(origin
(inherit (package-source unzip))
(patches (append
(origin-patches (package-source unzip))
(search-patches "unzip-CVE-2022-0529+CVE-2022-0530.patch")))))))
(define-public ziptime (define-public ziptime
(let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc") (let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc")
(revision "0")) (revision "0"))