From nobody Tue Oct 04 06:16:36 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MhSC870ylz4f15B; Tue, 4 Oct 2022 06:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MhSC86SMBz436J; Tue, 4 Oct 2022 06:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664864196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ipP+54l284+xA2IInXRzggcb5evimuUX2D+XSn/zDT8=; b=HIkCSepBnwLheUbuICM0XsPIn0fxuDsVysHEWrQn4gKk3yRCgBVcPN1AJWsMbNlJRmjnE0 lCj34ukqoKMAPhjsHJbBl7Z0dl7DaopJZSL0i14oSnEkyLaonPXtKJmHkxhEvt6Q/0+Dox 3SEYtxVq1u8mHExkAaR1LYiDniyHOB+JPz009Jmlpthr1i44f81jHIGmswAA+rjJPzWpPA bHegqeHt5XMeIg+SFJWSAJxl5tTvwK3Z/MOERGq9qJqLkk7aILuOykdlYnfkxEjbDR2Rbz MNktcwBxKmhn+I5XyZoUt8ADgySacuNM+JIZju8zy6+hNQcPmuWhI9gK3deDMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MhSC85T9xzSZg; Tue, 4 Oct 2022 06:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2946GaKg090133; Tue, 4 Oct 2022 06:16:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2946GaTa090132; Tue, 4 Oct 2022 06:16:36 GMT (envelope-from git) Date: Tue, 4 Oct 2022 06:16:36 GMT Message-Id: <202210040616.2946GaTa090132@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 13d2c5e0aec3 - 2022Q4 - devel/zydis: update to 3.2.1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 13d2c5e0aec3dba44720c86b7cdd74f66d70279e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664864196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ipP+54l284+xA2IInXRzggcb5evimuUX2D+XSn/zDT8=; b=jUYGv+f+ilrbe9+qnyF7q/3HLB/c6S3p/Nr3cmyyEuLUHTVSgbLJxvul/0cwJ/pk2eBhk2 EoS5wGG07kI6orDA7k1CDFnWcF8C2tLVWn8FO0DlePZplgxXEh4CBTnC2eV1mvbjG3MyRE dRDLzN7mkVoHaKCCYV0ESJaFaT6a1b2uwG4dK+ksESGU9/2aUQ5NZFTANqrYZA+2Z7nMVy 7J1grq9knBmWN2iplHCU226Pwt2CvVj+0BQ9+OV3CPSAmm+UF6jbzv3/EiwpZyC2OG088q bqWkGKNMmBK/eCzLYnohaPiKr86sarG6mrRI42Z1LOQ7VBTMcvJm8YVUPqk2Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664864196; a=rsa-sha256; cv=none; b=RHsFB9hKElVS6CxkyuwElRD8A7cJ8ptzq6WuawhI8oEFmZlEDOu/EGoCIumW4HF0XsuNZF E8aAoz0VVLT7xhVddJiGLxuraXCvBiZZx1WF6RBM/LLPSnZ2rnaTasNuRk0dgunHOHI7sn QNk+JzJQBlZOZGmtp4gXr9prBiv0iScDRei72Ef/pW4kDOD4SpdGB7/MQ2JMyx0/F4Ivq1 sYNYQDlzh4ywnamq6k4aq9UrMNXMCQYHCoKIUbpnTt1VvAeZ2YYE2suL/58rvV7irjNAyp F1clmKJbFF7xMIiEQX08440BuwzZgte+sa1PcXJuM66SnduVQAjOzIJoAIq7yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=13d2c5e0aec3dba44720c86b7cdd74f66d70279e commit 13d2c5e0aec3dba44720c86b7cdd74f66d70279e Author: Martin Filla AuthorDate: 2022-10-04 05:27:53 +0000 Commit: Fernando Apesteguía 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 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 +