[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/27: gnu: unzip: Incorporate grafted changes.
From: |
guix-commits |
Subject: |
26/27: gnu: unzip: Incorporate grafted changes. |
Date: |
Thu, 11 Aug 2022 18:45:12 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 749d0d96a8c4c06939b95a9b381e1440d6207326
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Aug 12 00:08:41 2022 +0200
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.
---
gnu/packages/compression.scm | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 26c151002c..9e0a132cfc 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1749,7 +1749,6 @@ Compression ratios of 2:1 to 3:1 are common for text
files.")
(package (inherit zip)
(name "unzip")
(version "6.0")
- (replacement unzip/fixed)
(source
(origin
(method url-fetch)
@@ -1795,7 +1794,9 @@ Compression ratios of 2:1 to 3:1 are common for text
files.")
"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 @@ recreates the stored directory structure by default.")
(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"))
- 07/27: gnu: inkscape/stable: Update to 1.2.1., (continued)
- 07/27: gnu: inkscape/stable: Update to 1.2.1., guix-commits, 2022/08/11
- 11/27: gnu: gtk+@2: Disable failing tests., guix-commits, 2022/08/11
- 13/27: gnu: libthai: Update to 0.1.29., guix-commits, 2022/08/11
- 16/27: gnu: graphviz: Update to 5.0.0., guix-commits, 2022/08/11
- 18/27: gnu: vala: Remove input labels., guix-commits, 2022/08/11
- 19/27: gnu: harfbuzz: Update to 5.1.0., guix-commits, 2022/08/11
- 21/27: gnu: gdl: Update to 3.40.0., guix-commits, 2022/08/11
- 22/27: gnu: libvisual: Remove input labels., guix-commits, 2022/08/11
- 25/27: gnu: aspell: Incorporate grafted changes., guix-commits, 2022/08/11
- 27/27: gnu: libtirpc: Incorporate grafted changes., guix-commits, 2022/08/11
- 26/27: gnu: unzip: Incorporate grafted changes.,
guix-commits <=