[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/15: gnu: unzip: Absorb grafted replacement.
|
From: |
guix-commits |
|
Subject: |
09/15: gnu: unzip: Absorb grafted replacement. |
|
Date: |
Mon, 17 May 2021 14:12:29 -0400 (EDT) |
lfam pushed a commit to branch wip-ungrafting
in repository guix.
commit 42a3ec8e185fb99eafc06bc90f5195df52a684f5
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Mon May 17 11:45:59 2021 -0400
gnu: unzip: Absorb grafted replacement.
* gnu/packages/compression.scm (unzip)[source]: Add patches from grafted
replacement unzip/fixed.
[replacement]: Remove field.
(unzip/fixed): Remove variable.
---
gnu/packages/compression.scm | 80 +++++++++++++++-----------------------------
1 file changed, 27 insertions(+), 53 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 454612f..5bbf8c1 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1606,8 +1606,33 @@ Compression ratios of 2:1 to 3:1 are common for text
files.")
"unzip-attribs-overflow.patch"
"unzip-overflow-on-invalid-input.patch"
"unzip-format-secure.patch"
- "unzip-overflow-long-fsize.patch"))))
- (replacement unzip/fixed)
+ "unzip-overflow-long-fsize.patch"
+
+ ;; From Fedora
+ "unzip-alt-iconv-utf8.patch"
+ "unzip-alt-iconv-utf8-print.patch"
+ "unzip-fix-recmatch.patch"
+ "unzip-case-insensitive.patch"
+ "unzip-close.patch"
+ "unzip-COVSCAN-fix-unterminated-string.patch"
+ "unzip-CVE-2016-9844.patch"
+ "unzip-CVE-2018-1000035.patch"
+ "unzip-CVE-2018-18384.patch"
+ "unzip-exec-shield.patch"
+ "unzip-manpage-fix.patch"
+ "unzip-overflow.patch"
+ "unzip-timestamp.patch"
+ "unzip-valgrind.patch"
+ "unzip-x-option.patch"
+ ;; CVE-2019-13232
+ "unzip-zipbomb-manpage.patch"
+ "unzip-zipbomb-part1.patch"
+ "unzip-zipbomb-part2.patch"
+ "unzip-zipbomb-part3.patch"
+
+ ;; https://github.com/madler/unzip/issues/2
+ "unzip-32bit-zipbomb-fix.patch"
+ ))))
(build-system gnu-build-system)
;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO
(arguments
@@ -1643,57 +1668,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)
- (version "6.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/infozip"
-
"/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"))
- (sha256
- (base32
- "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"))
- (patches (search-patches "unzip-CVE-2014-8139.patch"
- "unzip-CVE-2014-8140.patch"
- "unzip-CVE-2014-8141.patch"
- "unzip-CVE-2014-9636.patch"
- "unzip-CVE-2015-7696.patch"
- "unzip-CVE-2015-7697.patch"
- "unzip-allow-greater-hostver-values.patch"
- "unzip-initialize-symlink-flag.patch"
- "unzip-remove-build-date.patch"
- "unzip-attribs-overflow.patch"
- "unzip-overflow-on-invalid-input.patch"
- "unzip-format-secure.patch"
- "unzip-overflow-long-fsize.patch"
-
- ;; From Fedora
- "unzip-alt-iconv-utf8.patch"
- "unzip-alt-iconv-utf8-print.patch"
- "unzip-fix-recmatch.patch"
- "unzip-case-insensitive.patch"
- "unzip-close.patch"
- "unzip-COVSCAN-fix-unterminated-string.patch"
- "unzip-CVE-2016-9844.patch"
- "unzip-CVE-2018-1000035.patch"
- "unzip-CVE-2018-18384.patch"
- "unzip-exec-shield.patch"
- "unzip-manpage-fix.patch"
- "unzip-overflow.patch"
- "unzip-timestamp.patch"
- "unzip-valgrind.patch"
- "unzip-x-option.patch"
- ;; CVE-2019-13232
- "unzip-zipbomb-manpage.patch"
- "unzip-zipbomb-part1.patch"
- "unzip-zipbomb-part2.patch"
- "unzip-zipbomb-part3.patch"
-
- ;; https://github.com/madler/unzip/issues/2
- "unzip-32bit-zipbomb-fix.patch"))))))
-
(define-public ziptime
(let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc")
(revision "0"))
- branch wip-ungrafting created (now fb36e9c), guix-commits, 2021/05/17
- 01/15: gnu: postgresql: Absorb grafted replacement., guix-commits, 2021/05/17
- 05/15: gnu: glib: Absorb grafted replacement., guix-commits, 2021/05/17
- 03/15: gnu: zstd: Absorb grafted replacement., guix-commits, 2021/05/17
- 04/15: gnu: zziplib: Absorb grafted replacement., guix-commits, 2021/05/17
- 06/15: gnu: libtiff: Absorb grafted replacement., guix-commits, 2021/05/17
- 13/15: gnu: python-urllib3: Absorb grafted replacement., guix-commits, 2021/05/17
- 02/15: gnu: OpenLDAP: Absorb grafted replacement., guix-commits, 2021/05/17
- 09/15: gnu: unzip: Absorb grafted replacement.,
guix-commits <=
- 07/15: gnu: libx11: Absorb grafted replacement., guix-commits, 2021/05/17
- 08/15: gnu: c-ares: Absorb grafted replacement., guix-commits, 2021/05/17
- 10/15: gnu: curl: Absorb grafted replacement., guix-commits, 2021/05/17
- 15/15: gnu: SQLite: Absorb grafted replacement., guix-commits, 2021/05/17
- 12/15: gnu: Graphviz: Absorb grafted replacement., guix-commits, 2021/05/17
- 14/15: gnu: python-pygments: Absorb grafted replacement., guix-commits, 2021/05/17
- 11/15: gnu: MariaDB: Absorb grafted replacement., guix-commits, 2021/05/17