ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: unzip: Incorporate grafted changes.

Browse source 
* gnu/packages/compression.scm (unzip)[replacement]: Remove.
[source](patches): Add unzip-CVE-2022-0529+CVE-2022-0530.patch.
(unzip/fixed): Remove variable.
This commit is contained in:
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 @@ (define-public unzip
(package (inherit zip)
(name "unzip")
(version "6.0")
(replacement unzip/fixed)
(source
(origin
(method url-fetch)
@ -1795,7 +1794,9 @@ (define-public unzip
"unzip-zipbomb-part3.patch"
;; 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)
;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO
(arguments
@ -1840,15 +1841,6 @@ (define-public unzip
(license (license:non-copyleft "file://LICENSE"
"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
(let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc")
(revision "0"))