diff options
| author | Leo Famulari <leo@famulari.name> | 2018-07-16 14:24:59 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-07-16 15:03:31 -0400 |
| commit | 36bbac734f2b7adda39bbda4ff8f5498347adfd3 (patch) | |
| tree | 5d489759f1d4d86cef64457902133bbae7ee3d3f /gnu | |
| parent | 8bbb79cf95a07a40950448a8a09d888254404ed4 (diff) | |
| download | guix-36bbac734f2b7adda39bbda4ff8f5498347adfd3.tar guix-36bbac734f2b7adda39bbda4ff8f5498347adfd3.tar.gz | |
gnu: Remove leftover patch.
* gnu/packages/patches/file-CVE-2017-1000249.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.patch'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/file-CVE-2017-1000249.patch | 27 |
2 files changed, 0 insertions, 28 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d273b1c743..64e71a84f8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -671,7 +671,6 @@ dist_patch_DATA = \ %D%/packages/patches/fcgi-2.4.0-poll.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ - %D%/packages/patches/file-CVE-2017-1000249.patch \ %D%/packages/patches/findutils-localstatedir.patch \ %D%/packages/patches/findutils-test-xargs.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ diff --git a/gnu/packages/patches/file-CVE-2017-1000249.patch b/gnu/packages/patches/file-CVE-2017-1000249.patch deleted file mode 100644 index 505acf1592..0000000000 --- a/gnu/packages/patches/file-CVE-2017-1000249.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/file/file/commit/35c94dc6acc418f1ad7f6241a6680e5327495793.patch -http://openwall.com/lists/oss-security/2017/09/05/3 - -The patch is minorly modified to apply to file-5.30 - -From 35c94dc6acc418f1ad7f6241a6680e5327495793 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -Date: Sun, 27 Aug 2017 07:55:02 +0000 -Subject: [PATCH] Fix always true condition (Thomas Jarosch) - ---- - src/readelf.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/readelf.c b/src/readelf.c -index 81451827..5f425c97 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -511,7 +511,7 @@ do_bid_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, - size_t noff, size_t doff, int *flags) - { - if (namesz == 4 && strcmp((char *)&nbuf[noff], "GNU") == 0 && -- type == NT_GNU_BUILD_ID && (descsz >= 4 || descsz <= 20)) { -+ type == NT_GNU_BUILD_ID && (descsz >= 4 && descsz <= 20)) { - uint8_t desc[20]; - const char *btype; - uint32_t i; |