summaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-11-22 12:24:41 +0100
committerLudovic Courtès <ludo@gnu.org>2014-11-22 12:24:41 +0100
commit0253ab39794ce5d9cf051ac70c632c378a732d8e (patch)
tree9ba07487b9a549d931a254389374cffffdc9e267 /gnu/packages/patches
parenta5b60e3c6bfec96092a7854edb0c74fb46eed647 (diff)
downloadguix-patches-0253ab39794ce5d9cf051ac70c632c378a732d8e.tar
guix-patches-0253ab39794ce5d9cf051ac70c632c378a732d8e.tar.gz
gnu: file: Update to 5.20.
* gnu/packages/file.scm (file): Update to 5.20. (file-5.20): Remove. * gnu/packages/patches/file-CVE-2014-3587.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. * gnu/packages/patchutils.scm (quilt): Use FILE instead of FILE-5.20. * gnu/packages/version-control.scm (aegis): Ditto.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/file-CVE-2014-3587.patch16
1 files changed, 0 insertions, 16 deletions
diff --git a/gnu/packages/patches/file-CVE-2014-3587.patch b/gnu/packages/patches/file-CVE-2014-3587.patch
deleted file mode 100644
index cf88bf5f3e..0000000000
--- a/gnu/packages/patches/file-CVE-2014-3587.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixes CVE-2014-3587. Copied from upstream commit
-0641e56be1af003aa02c7c6b0184466540637233.
-
---- file-5.19/src/cdf.c.orig 2014-06-09 09:04:37.000000000 -0400
-+++ file-5.19/src/cdf.c 2014-08-26 11:55:23.887118898 -0400
-@@ -824,6 +824,10 @@
- q = (const uint8_t *)(const void *)
- ((const char *)(const void *)p + ofs
- - 2 * sizeof(uint32_t));
-+ if (q < p) {
-+ DPRINTF(("Wrapped around %p < %p\n", q, p));
-+ goto out;
-+ }
- if (q > e) {
- DPRINTF(("Ran of the end %p > %p\n", q, e));
- goto out;