summary refs log tree commit diff
path: root/gnu/packages/zip.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-10-22 17:10:41 -0400
committerMark H Weaver <mhw@netris.org>2015-10-22 17:10:41 -0400
commit2442e69e4182b592757dad473c8c7b1c48ca8284 (patch)
tree7180454106c234d84cfe2e720550db826c091f72 /gnu/packages/zip.scm
parentc46c931ecfe7fd4a5cbd979263d28d3f1e02bcca (diff)
downloadguix-2442e69e4182b592757dad473c8c7b1c48ca8284.tar.gz
Revert "gnu: unzip: Reorganize security fixes for improved clarity."
This reverts commit c46c931ecfe7fd4a5cbd979263d28d3f1e02bcca.
Diffstat (limited to 'gnu/packages/zip.scm')
-rw-r--r--gnu/packages/zip.scm4
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
index b7bed0e86d..83c452778c 100644
--- a/gnu/packages/zip.scm
+++ b/gnu/packages/zip.scm
@@ -85,13 +85,11 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
                                    "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-fix-overflows-and-infloop.patch"
                                    "unzip-format-secure.patch"
                                    "unzip-overflow-long-fsize.patch")))))
     (build-system gnu-build-system)