[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/33: gnu: unzip: Incorporate grafted changes.
|
From: |
guix-commits |
|
Subject: |
06/33: gnu: unzip: Incorporate grafted changes. |
|
Date: |
Sun, 9 May 2021 17:50:09 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit b7a9258941bd61be9c04234ddd0041b3fd384b47
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun May 9 22:49:27 2021 +0200
gnu: unzip: Incorporate grafted changes.
* gnu/packages/compression.scm (unzip)[replacement]: Remove.
[source](patches): Add patches from UNZIP/FIXED.
(unzip/fixed): Remove variable.
---
gnu/packages/compression.scm | 79 +++++++++++++++-----------------------------
1 file changed, 26 insertions(+), 53 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 0868a26..05e442a 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1606,8 +1606,32 @@ 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 +1667,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"))
- 04/33: gnu: cURL: Update to 7.76.1., (continued)
- 04/33: gnu: cURL: Update to 7.76.1., guix-commits, 2021/05/09
- 02/33: Merge branch 'master' into core-updates, guix-commits, 2021/05/09
- 03/33: gnu: Remove obsolete patches., guix-commits, 2021/05/09
- 07/33: gnu: MariaDB: Incorporate grafted changes., guix-commits, 2021/05/09
- 10/33: gnu: python-urllib3: Remove replacement package., guix-commits, 2021/05/09
- 11/33: gnu: glib: Disable SELinux support., guix-commits, 2021/05/09
- 14/33: gnu: elfutils: Omit static libraries., guix-commits, 2021/05/09
- 12/33: gnu: Python: Update to 3.9.5., guix-commits, 2021/05/09
- 13/33: gnu: elfutils: Update to 0.183., guix-commits, 2021/05/09
- 05/33: gnu: c-ares: Remove replacement package., guix-commits, 2021/05/09
- 06/33: gnu: unzip: Incorporate grafted changes.,
guix-commits <=
- 08/33: gnu: OpenLDAP: Remove replacement package., guix-commits, 2021/05/09
- 09/33: gnu: PostgreSQL: Remove replacement package., guix-commits, 2021/05/09
- 17/33: gnu: perl: Update to 5.32.1., guix-commits, 2021/05/09
- 24/33: gnu: expat: Update to 2.3.0., guix-commits, 2021/05/09
- 18/33: gnu: linux-libre-headers: Update to 5.10.35., guix-commits, 2021/05/09
- 21/33: gnu: mit-krb5: Update to 1.19.1., guix-commits, 2021/05/09
- 28/33: gnu: libcap: Update to 2.49., guix-commits, 2021/05/09
- 29/33: gnu: kmod: Update to 28., guix-commits, 2021/05/09
- 15/33: gnu: bash: Update to 5.1.8., guix-commits, 2021/05/09
- 16/33: gnu: bison: Update to 3.7.6., guix-commits, 2021/05/09