* [gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/
@ 2020-06-04 16:46 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2020-06-04 16:46 UTC (permalink / raw
To: gentoo-commits
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 <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 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_%:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/
@ 2020-07-04 18:04 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2020-07-04 18:04 UTC (permalink / raw
To: gentoo-commits
commit: fdff36839aec81790a39d14109d2bce76283c94d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 4 18:04:26 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 18:04:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdff3683
dev-libs/capstone: rely on CMAKE_INSTALL_LIBDIR
Bug: https://bugs.gentoo.org/730722
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
index 69479ce407d..056140be13d 100644
--- a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
+++ b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
@@ -6,7 +6,7 @@ https://bugs.gentoo.org/730722
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${prefix}/lib@LIBSUFFIX@
-+libdir=${prefix}/lib@LIB_SUFFIX@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/include/capstone
Name: capstone
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/
@ 2023-10-15 22:04 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2023-10-15 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 696f585b82a267b1e9b015b8a52789befe327cc0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Oct 10 18:37:52 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 22:01:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696f585b
dev-libs/capstone: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33282
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/capstone-5.0_rc2-oob-mem-access.patch | 40 ----------------------
.../files/capstone-5.0_rc2-pkgconfig.patch | 13 -------
2 files changed, 53 deletions(-)
diff --git a/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch b/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch
deleted file mode 100644
index 4e538ef4d5fb..000000000000
--- a/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Mon Aug 22 18:52:19 2022 +0200
-
- PPC: fix out of bound memory access
-
- closes #1912
-
-Bug: https://bugs.gentoo.org/865151
-Upstream: https://github.com/capstone-engine/capstone/pull/1913
-
-diff --git a/arch/PowerPC/PPCInstPrinter.c b/arch/PowerPC/PPCInstPrinter.c
-index 22eef4ee..a5a30a8b 100644
---- a/arch/PowerPC/PPCInstPrinter.c
-+++ b/arch/PowerPC/PPCInstPrinter.c
-@@ -1116,7 +1116,8 @@ static char *stripRegisterPrefix(const char *RegName)
- char *name = cs_strdup(RegName + 2);
-
- // also strip the last 2 letters
-- name[strlen(name) - 2] = '\0';
-+ if(strlen(name) > 2)
-+ name[strlen(name) - 2] = '\0';
-
- return name;
- }
-diff --git a/suite/cstest/issues.cs b/suite/cstest/issues.cs
-index e4fb6cfa..3183f43f 100644
---- a/suite/cstest/issues.cs
-+++ b/suite/cstest/issues.cs
-@@ -1,3 +1,11 @@
-+!# issue 1912 PPC register name
-+!# CS_ARCH_PPC, CS_MODE_BIG_ENDIAN, None
-+0x2d,0x03,0x00,0x80 == cmpwi cr2, r3, 0x80
-+
-+!# issue 1912 PPC no register name
-+!# CS_ARCH_PPC, CS_MODE_BIG_ENDIAN, CS_OPT_SYNTAX_NOREGNAME
-+0x2d,0x03,0x00,0x80 == cmpwi 2, 3, 0x80
-+
- !# issue 1839 AArch64 Incorrect detailed disassembly of ldr
- !# CS_ARCH_ARM64, CS_MODE_ARM, CS_OPT_DETAIL
- 0x41,0x00,0x40,0xf9 == ldr x1, [x2] ; operands[0].access: WRITE ; operands[1].access: READ
diff --git a/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch b/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch
deleted file mode 100644
index 015220a138e8..000000000000
--- a/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/capstone.pc.in b/capstone.pc.in
-index 1b559eac..1ffcd354 100644
---- a/capstone.pc.in
-+++ b/capstone.pc.in
-@@ -5,7 +5,7 @@ includedir=${prefix}/include
-
- Name: capstone
- Description: Capstone disassembly engine
--Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
-+Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@
- URL: http://www.capstone-engine.org
- archive=${libdir}/libcapstone.a
- Libs: -L${libdir} -lcapstone
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-15 22:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-04 16:46 [gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2020-07-04 18:04 Sergei Trofimovich
2023-10-15 22:04 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox