summary refs log tree commit diff
path: root/gnu-system.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-10-22 14:54:43 -0400
committerMark H Weaver <mhw@netris.org>2015-10-22 14:58:03 -0400
commitc46c931ecfe7fd4a5cbd979263d28d3f1e02bcca (patch)
tree0b63ff305e6571e4cc421f31a35a7bdfb61f436d /gnu-system.am
parentdddb11b506ee9c7feca26be852d9995faf587099 (diff)
downloadguix-c46c931ecfe7fd4a5cbd979263d28d3f1e02bcca.tar.gz
gnu: unzip: Reorganize security fixes for improved clarity.
* gnu/packages/patches/unzip-fix-overflows-and-infloop.patch: Delete
  file.  Its contents are now split into the following new files:
* gnu/packages/patches/unzip-CVE-2015-7696.patch,
  gnu/packages/patches/unzip-CVE-2015-7697.patch,
  gnu/packages/patches/unzip-overflow-on-invalid-input.patch: New files.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
* gnu/packages/zip.scm (unzip)[source]: Adjust patches accordingly.
Diffstat (limited to 'gnu-system.am')
-rw-r--r--gnu-system.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am
index e62fe18c97..c4810661a2 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -647,9 +647,11 @@ dist_patch_DATA =						\
   gnu/packages/patches/unzip-CVE-2014-8140.patch		\
   gnu/packages/patches/unzip-CVE-2014-8141.patch		\
   gnu/packages/patches/unzip-CVE-2014-9636.patch		\
+  gnu/packages/patches/unzip-CVE-2015-7696.patch		\
+  gnu/packages/patches/unzip-CVE-2015-7697.patch		\
   gnu/packages/patches/unzip-allow-greater-hostver-values.patch	\
   gnu/packages/patches/unzip-attribs-overflow.patch		\
-  gnu/packages/patches/unzip-fix-overflows-and-infloop.patch	\
+  gnu/packages/patches/unzip-overflow-on-invalid-input.patch	\
   gnu/packages/patches/unzip-format-secure.patch		\
   gnu/packages/patches/unzip-initialize-symlink-flag.patch	\
   gnu/packages/patches/unzip-overflow-long-fsize.patch		\