commit: 025eabb3583fc387c4a4c5187da6fc161b5b164f Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Jun 3 18:18:44 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Thu Jun 4 16:46:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025eabb3
dev-libs/capstone: remove unused patch(es) Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16058 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../files/capstone-3.0.5_rc2-CVE-2017-6952.patch | 41 ---------------------- .../capstone/files/capstone-3.0.5_rc2-FLAGS.patch | 16 --------- dev-libs/capstone/files/capstone-4.0-FLAGS.patch | 20 ----------- .../files/capstone-4.0-double-DESTDIR.patch | 12 ------- .../files/capstone-4.0-no-fuzz-tests.patch | 10 ------ 5 files changed, 99 deletions(-) diff --git a/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch b/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch deleted file mode 100644 index ba16126f741..00000000000 --- a/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 6fe86eef621b9849f51a5e1e5d73258a93440403 -Author: Quang Nguyễn <quangn...@users.noreply.github.com> -Date: Mon Mar 13 22:34:48 2017 +0700 - - provide a validity check to prevent against Integer overflow conditions (#870) - - * provide a validity check to prevent against Integer overflow conditions - - * fix some style issues. - -diff --git a/windows/winkernel_mm.c b/windows/winkernel_mm.c -index c127da3a..ecdc1ca2 100644 ---- a/windows/winkernel_mm.c -+++ b/windows/winkernel_mm.c -@@ -3,6 +3,7 @@ - - #include "winkernel_mm.h" - #include <ntddk.h> -+#include <Ntintsafe.h> - - // A pool tag for memory allocation - static const ULONG CS_WINKERNEL_POOL_TAG = 'kwsC'; -@@ -33,8 +34,16 @@ void * CAPSTONE_API cs_winkernel_malloc(size_t size) - - // FP; a use of NonPagedPool is required for Windows 7 support - #pragma prefast(suppress : 30030) // Allocating executable POOL_TYPE memory -- CS_WINKERNEL_MEMBLOCK *block = (CS_WINKERNEL_MEMBLOCK *)ExAllocatePoolWithTag( -- NonPagedPool, size + sizeof(CS_WINKERNEL_MEMBLOCK), CS_WINKERNEL_POOL_TAG); -+ size_t number_of_bytes = 0; -+ CS_WINKERNEL_MEMBLOCK *block = NULL; -+ // A specially crafted size value can trigger the overflow. -+ // If the sum in a value that overflows or underflows the capacity of the type, -+ // the function returns NULL. -+ if (!NT_SUCCESS(RtlSizeTAdd(size, sizeof(CS_WINKERNEL_MEMBLOCK), &number_of_bytes))) { -+ return NULL; -+ } -+ block = (CS_WINKERNEL_MEMBLOCK *)ExAllocatePoolWithTag( -+ NonPagedPool, number_of_bytes, CS_WINKERNEL_POOL_TAG); - if (!block) { - return NULL; - } diff --git a/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch b/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch deleted file mode 100644 index 4be2ed4ba0e..00000000000 --- a/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add support for user overridden CFLAGS and LDFLAGS -diff --git a/cstool/Makefile b/cstool/Makefile -index 450ac1b..3cf2a81 100644 ---- a/cstool/Makefile -+++ b/cstool/Makefile -@@ -3,2 +3,3 @@ - include ../functions.mk -+include ../config.mk - -@@ -8,4 +9,4 @@ LIBNAME = capstone - --CFLAGS = -I../include --LDFLAGS = -O3 -Wall -L.. -l$(LIBNAME) -+CFLAGS += -I../include -+LDFLAGS += -Wall -L.. -l$(LIBNAME) - diff --git a/dev-libs/capstone/files/capstone-4.0-FLAGS.patch b/dev-libs/capstone/files/capstone-4.0-FLAGS.patch deleted file mode 100644 index 66e855c0c34..00000000000 --- a/dev-libs/capstone/files/capstone-4.0-FLAGS.patch +++ /dev/null @@ -1,20 +0,0 @@ -Drop -O3 and allow user to specify their optimizations. - ---- a/cstool/Makefile -+++ b/cstool/Makefile -@@ -1,13 +1,14 @@ - # Makefile for Cstool of Capstone Disassembly Engine - - include ../functions.mk -+include ../config.mk - - .PHONY: clean all - - LIBNAME = capstone - - CFLAGS += -I../include -I. --LDFLAGS += -O3 -Wall -L.. -l$(LIBNAME) -+LDFLAGS += -Wall -L.. -l$(LIBNAME) - - TARGET = cstool - SOURCES := $(wildcard *.c) diff --git a/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch b/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch deleted file mode 100644 index 46aca725e40..00000000000 --- a/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://github.com/aquynh/capstone/issues/1311 - -Avoid double DESTDIR in install. ---- a/Makefile -+++ b/Makefile -@@ -75,4 +75,4 @@ LIBDIRARCH ?= lib - #LIBDIRARCH ?= lib64 --LIBDIR = $(DESTDIR)$(PREFIX)/$(LIBDIRARCH) --BINDIR = $(DESTDIR)$(PREFIX)/bin -+LIBDIR = $(PREFIX)/$(LIBDIRARCH) -+BINDIR = $(PREFIX)/bin - diff --git a/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch b/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch deleted file mode 100644 index ae412e9b233..00000000000 --- a/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ -https://github.com/aquynh/capstone/issues/1310 - -fuzz tests are missing ---- a/Makefile -+++ b/Makefile -@@ -463,3 +463,3 @@ TESTS += test_systemz.static test_x86.static test_xcore.static test_m680x.static - TESTS += test_skipdata test_skipdata.static test_iter.static test_evm.static --check: $(TESTS) fuzztest fuzzallcorp -+check: $(TESTS) fuzztest # fuzzallcorp - test_%:
