diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /dev-libs/capstone | |
parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) |
gentoo resync : 13.06.2020
Diffstat (limited to 'dev-libs/capstone')
-rw-r--r-- | dev-libs/capstone/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch | 41 | ||||
-rw-r--r-- | dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch | 16 | ||||
-rw-r--r-- | dev-libs/capstone/files/capstone-4.0-FLAGS.patch | 20 | ||||
-rw-r--r-- | dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch | 12 | ||||
-rw-r--r-- | dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch | 10 |
6 files changed, 0 insertions, 104 deletions
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest index cf279342ef95..ef93f084bf85 100644 --- a/dev-libs/capstone/Manifest +++ b/dev-libs/capstone/Manifest @@ -1,8 +1,3 @@ -AUX capstone-3.0.5_rc2-CVE-2017-6952.patch 1565 BLAKE2B cd3436d2eba405b354baa2289538c9563f66595cf3a9f0d0a510a70af82bcafd5b4145676e627ab491562b10304c6fe2927bda0135d67123c18173ad871af739 SHA512 1f4f24bdede4439811b077502b227474827a455921eb183455c31e7de142d3f3f7e9f19869aac87b92a768be34a7e5ad040f0d68e8125b590d14dfec7af5b407 -AUX capstone-3.0.5_rc2-FLAGS.patch 398 BLAKE2B 40cdebbdd64e057982af6d7b4cce44821eba5799666c626d8a4afb8a798ebca7c6e211e7956b2824411deae671fd917f3d4c01ec903f47b514ac6cb5d0c9726a SHA512 95fb22a680e20f5b19936bd65ceadb9e29a8ed1f3de831379cfc0e650bfd4af7214b97efa97ed894a10d83541e0e49c60ff1a0cb501cd63a9af8f40460909975 -AUX capstone-4.0-FLAGS.patch 418 BLAKE2B 425d12eeeca7d4ca2d350d0ec821c6861c0fd7df7021be44c3c371837ab27e22af83d0af1627ae6c920628619d780608863d6f4d41ec6f79a18ea37251b82915 SHA512 c423d0f827afd4b11979ac6fbf4f8972df10670dec113f4a08f1860229cd3e1c5b61f3f6fc7195f457f29eeb46580e18213e9195acae821ca57b63372af07564 -AUX capstone-4.0-double-DESTDIR.patch 307 BLAKE2B 91fad2475b7289311c8eeceaec962a9b1cf735cb13835de19eeed208a20c2b4f8b3cf59683ff72bc726b83ca41d696f3889b7019e2751d79c8d4fba48f736018 SHA512 92d839aad1a576ae550c618ffda3cd070419b72b105583f3861d47df0a57f29fbf8b4e1727c7768199fa650e1c734726f7cc8bd0ef913da336ed16d6d77feda4 -AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df449ea6a8fe9e6e58c43438f37c63edce46d4f64db953322ac74c54fc1077f35b0d86d732685533cfe7d495a235afebc40ef SHA512 2abc022678214a09869c728e1cb83a4a69213d977d1ad752cda415e5861b83d4af2ca2fa80377dee1322d8bfad6fb5d1d12e23cdc30285ebe83c3eca91110279 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e EBUILD capstone-4.0.2-r1.ebuild 1325 BLAKE2B 09988c2ae5ef6401220570c2ecee7ae39106a30c35489ee9330b078233e3551a05dde3ad82b3eae93007c4f279ad1910eedc1495ed68c58e37ed90079ab00c34 SHA512 02f30417e3de309847bd26ca97f5a3e1df99366f78d533a78e2d551a41e3d24b4ea1b5acf9e6c7cd6bb8025474c3016717432dc67265ab6bca880902d61de25c MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269 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 ba16126f7411..000000000000 --- 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 <quangnh89@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 4be2ed4ba0e6..000000000000 --- 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 66e855c0c34d..000000000000 --- 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 46aca725e40c..000000000000 --- 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 ae412e9b233c..000000000000 --- 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_%: |