git: 13d2c5e0aec3 - 2022Q4 - devel/zydis: update to 3.2.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Oct 2022 06:16:36 UTC
The branch 2022Q4 has been updated by fernape:
URL: https://cgit.FreeBSD.org/ports/commit/?id=13d2c5e0aec3dba44720c86b7cdd74f66d70279e
commit 13d2c5e0aec3dba44720c86b7cdd74f66d70279e
Author: Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2022-10-04 05:27:53 +0000
Commit: Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-10-04 06:12:58 +0000
devel/zydis: update to 3.2.1
ChangeLog: https://github.com/zyantific/zydis/releases/tag/v3.2.1
Fixed a bug where an internal formatter structure wasn't properly initialized.
PR: 266766
Reported by: freebsd@sysctl.cz (maintainer)
MFH: 2022Q4 (security release)
Security: CVE-2021-41253
(cherry picked from commit 61392a0734a41440ae817a26016547ebd5ce0ac0)
---
devel/zydis/Makefile | 4 ++--
devel/zydis/distinfo | 10 +++++-----
.../files/patch-dependencies_zycore_include_Zycore_Defines.h | 8 ++++----
devel/zydis/files/patch-dependencies_zycore_src_Format.c | 10 +++++-----
devel/zydis/pkg-plist | 5 +++++
5 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/devel/zydis/Makefile b/devel/zydis/Makefile
index 30940257c7d1..4c2a38b94245 100644
--- a/devel/zydis/Makefile
+++ b/devel/zydis/Makefile
@@ -1,6 +1,6 @@
PORTNAME= zydis
DISTVERSIONPREFIX= v
-DISTVERSION= 3.1.0
+DISTVERSION= 3.2.1
CATEGORIES= devel
MAINTAINER= freebsd@sysctl.cz
@@ -17,7 +17,7 @@ USES= cmake cpe dos2unix localbase:ldflags
USE_GITHUB= yes
DOS2UNIX_FILES= src/String.c
GH_ACCOUNT= zyantific
-GH_TUPLE= zyantific:zycore-c:273e26a:zydis/dependencies/zycore
+GH_TUPLE= zyantific:zycore-c:7c33e13:zydis/dependencies/zycore
CPE_VENDOR= zyantific
.include <bsd.port.mk>
diff --git a/devel/zydis/distinfo b/devel/zydis/distinfo
index 7bc04d4e19a0..eb78e767e63e 100644
--- a/devel/zydis/distinfo
+++ b/devel/zydis/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1594918289
-SHA256 (zyantific-zydis-v3.1.0_GH0.tar.gz) = fc543fef03137e63be4b6153c597f413c8de5e25414a0bc35dbd6ffbc383990d
-SIZE (zyantific-zydis-v3.1.0_GH0.tar.gz) = 488696
-SHA256 (zyantific-zycore-c-273e26a_GH0.tar.gz) = 5c26133056dc10e5f18d5ca1cbcaf546af3f7fba84e2e821ed4d8dacdb544a3b
-SIZE (zyantific-zycore-c-273e26a_GH0.tar.gz) = 56388
+TIMESTAMP = 1664819353
+SHA256 (zyantific-zydis-v3.2.1_GH0.tar.gz) = 349a2d27270e54499b427051dd45f7b6064811b615588414b096cdeeaeb730ad
+SIZE (zyantific-zydis-v3.2.1_GH0.tar.gz) = 658154
+SHA256 (zyantific-zycore-c-7c33e13_GH0.tar.gz) = 629a442a6fc97d12d811e3abe9b253240d9e0fe6af221a240d2154b25ff263cc
+SIZE (zyantific-zycore-c-7c33e13_GH0.tar.gz) = 61704
diff --git a/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h b/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h
index c320cd4c421e..bb8a35746507 100644
--- a/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h
+++ b/devel/zydis/files/patch-dependencies_zycore_include_Zycore_Defines.h
@@ -1,6 +1,6 @@
---- dependencies/zycore/include/Zycore/Defines.h.orig 2022-09-29 22:15:50 UTC
+--- dependencies/zycore/include/Zycore/Defines.h.orig 2022-10-03 17:54:40 UTC
+++ dependencies/zycore/include/Zycore/Defines.h
-@@ -131,6 +131,12 @@
+@@ -134,6 +134,12 @@
# define ZYAN_AARCH64
#elif defined(_M_ARM) || defined(_M_ARMT) || defined(__arm__) || defined(__thumb__)
# define ZYAN_ARM
@@ -10,6 +10,6 @@
+# define ZYAN_PPC
+#elif defined(__riscv) && __riscv_xlen == 64
+# define ZYAN_RISCV64
- #elif defined(__EMSCRIPTEN__)
- // Nothing to do, `ZYAN_EMSCRIPTEN` is both platform and arch macro for this one.
+ #elif defined(__EMSCRIPTEN__) || defined(__wasm__) || defined(__WASM__)
+ # define ZYAN_WASM
#else
diff --git a/devel/zydis/files/patch-dependencies_zycore_src_Format.c b/devel/zydis/files/patch-dependencies_zycore_src_Format.c
index 63287a0d6ace..40d82f8e14cc 100644
--- a/devel/zydis/files/patch-dependencies_zycore_src_Format.c
+++ b/devel/zydis/files/patch-dependencies_zycore_src_Format.c
@@ -1,11 +1,11 @@
---- dependencies/zycore/src/Format.c.orig 2022-09-29 22:16:44 UTC
+--- dependencies/zycore/src/Format.c.orig 2022-10-03 17:57:52 UTC
+++ dependencies/zycore/src/Format.c
@@ -83,7 +83,7 @@ static const ZyanStringView STR_SUB = ZYAN_DEFINE_STRI
/* Decimal */
/* ---------------------------------------------------------------------------------------------- */
--#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN)
-+#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_PPC)
+-#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM)
++#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC)
ZyanStatus ZyanStringAppendDecU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length)
{
if (!string)
@@ -13,8 +13,8 @@
/* Hexadecimal */
/* ---------------------------------------------------------------------------------------------- */
--#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN)
-+#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_PPC)
+-#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM)
++#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC)
ZyanStatus ZyanStringAppendHexU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length,
ZyanBool uppercase)
{
diff --git a/devel/zydis/pkg-plist b/devel/zydis/pkg-plist
index 54a3045798bf..cb319a092c6a 100644
--- a/devel/zydis/pkg-plist
+++ b/devel/zydis/pkg-plist
@@ -24,4 +24,9 @@ include/Zydis/Status.h
include/Zydis/Utils.h
include/Zydis/Zydis.h
include/ZydisExportConfig.h
+lib/cmake/zydis/zydis-config-version.cmake
+lib/cmake/zydis/zydis-config.cmake
+lib/cmake/zydis/zydis-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/zydis/zydis-targets.cmake
lib/libZydis.a
+