From nobody Mon Mar 21 03:38:23 2022 X-Original-To: dev-commits-ports-main@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 64ECF1A1E87B; Mon, 21 Mar 2022 03:38:24 +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 4KML1X1tHYz3Q2K; Mon, 21 Mar 2022 03:38:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647833904; 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=1W9COBB1Hxeehx0uQtvdYz48zUa7MNl8UiQlmi0sS8U=; b=BQtog8NSrKnaWTnTYhEcHttuBKYechprkXJrZwJy/kTbQBzpADhDIeyhiEnBunrrlon2Fq NXBgafZXH/wSdjJM7QFGtWtGQn2b/vwLT+9oqebBzjIYaL+A8zNRjX0NoGHWz48PmRJY+f LsyH+M8OqfWiJQnQmm3E2p7alQjTlgpDzieewTBCPtzxlHxrCxS5PDb7p7XHfhsDKvnOju u36y72DzChk2P97m+1iN3NDtK+RyVQBELSIZJg6Uh2JwEOniuwn8oDeP+go2URJ4eykjvD SBkpZLEfKWwfiW3/UlwNLTHWcyjeUagviZA5UvHFPeFkGzGq7q6EBn+Oe61adA== 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 1647A13FC5; Mon, 21 Mar 2022 03:38:24 +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 22L3cN39022707; Mon, 21 Mar 2022 03:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22L3cNVL022706; Mon, 21 Mar 2022 03:38:23 GMT (envelope-from git) Date: Mon, 21 Mar 2022 03:38:23 GMT Message-Id: <202203210338.22L3cNVL022706@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 96352a6a134b - main - sysutils/triton: Update 0.8.1 -> 0.9 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96352a6a134b7d96b431707436fcb75bddf43a8c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647833904; 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=1W9COBB1Hxeehx0uQtvdYz48zUa7MNl8UiQlmi0sS8U=; b=PMnCCaqGQ7ZZQCjAPswRS6UgpTCnR727Brq+7t0vnQtuzedHcMdhZANrDmBrWDCVDgCYfE vkDN3og5IlRUUQUwZkh/rKPb4gCeCwVcKJCcypBvUOp4DhcvpFqrLCiX/wEk2zK9BvCl5j LCcF/CRxLoo/xrT+lozIfAN45km9OuGpV6ZcStGbMipi7nXR0qpnS+gcTCdSdUQoj1RyhU 2zN4GBBZ3cf2Fr/vzEXyMsFjC3vudXXJoP4Plgo+kVGz0wioayL2dSFtQvTFBeC3veqNm5 EdpRJWSEE6kCDugol+CRnQWJZRnKgCPelyyJ/N3zKUWuID01kBDZC1iyeh2oOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647833904; a=rsa-sha256; cv=none; b=fhN4GmZVvetf/HnlBjQ8VOdCwRhB4lW5S3POISbazY00rJPdhZFOu8xz2lsTG9qNVeJBAn q8nRzfrPliP3qEPX5b5W+BT8ipWAq1GaVAbyCkSVU0cQTCZzw+zHteP9wgtrOgEFNbeX8O Dx7KSR2qkm/XanPwv2FNtjXLVNb+MlNf/A+GP81lPtPb6WscPevcLmvjnklxd45TjqNWD8 1J5bKP6Fx7qh/mreh20S3BswSQeFMO7rBipV2IraAArB/Dvbbi/g7WXX0MQj88CO0XpSI0 sQmE5xGDzc6wnxbC7ulvknN4z7b94tQGTI1bhHfQwUT0Yy3YMA6N/G7g7PRtMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=96352a6a134b7d96b431707436fcb75bddf43a8c commit 96352a6a134b7d96b431707436fcb75bddf43a8c Author: Yuri Victorovich AuthorDate: 2022-03-21 03:37:26 +0000 Commit: Yuri Victorovich CommitDate: 2022-03-21 03:38:20 +0000 sysutils/triton: Update 0.8.1 -> 0.9 Reported by: portscout --- sysutils/triton/Makefile | 21 ++++++++--- sysutils/triton/distinfo | 6 ++-- .../files/patch-src_libtriton_CMakeLists.txt | 42 ---------------------- ...atch-src_libtriton_includes_triton_syscalls.hpp | 11 ------ .../files/patch-src_scripts_extract__syscall.py | 11 ------ sysutils/triton/pkg-plist | 30 +++++++++------- 6 files changed, 37 insertions(+), 84 deletions(-) diff --git a/sysutils/triton/Makefile b/sysutils/triton/Makefile index 9b723f2510d7..1f313c37cc72 100644 --- a/sysutils/triton/Makefile +++ b/sysutils/triton/Makefile @@ -1,6 +1,6 @@ PORTNAME= triton DISTVERSIONPREFIX= v -DISTVERSION= 0.8.1 +DISTVERSION= 0.9 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -13,13 +13,24 @@ BUILD_DEPENDS= boost-libs>0:devel/boost-libs LIB_DEPENDS= libcapstone.so:devel/capstone4 \ libz3.so:math/z3 -USES= cmake compiler:c++11-lang python:build shebangfix -SHEBANG_FILES= src/scripts/extract_syscall.py +USES= cmake compiler:c++14-lang shebangfix +USE_LDCONFIG= yes + +SHEBANG_GLOB= *.py + USE_GITHUB= yes GH_ACCOUNT= JonathanSalwan GH_PROJECT= Triton -USE_LDCONFIG= yes -CMAKE_OFF= PYTHON_BINDINGS +OPTIONS_DEFINE= PYTHON +OPTIONS_DEFAULT= PYTHON +OPTIONS_SUB= yes + +PYTHON_USES= python +PYTHON_USES_OFF= python:build +PYTHON_CMAKE_BOOL= PYTHON_BINDINGS + +post-install-PYTHON-on: + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/triton.so .include diff --git a/sysutils/triton/distinfo b/sysutils/triton/distinfo index 4586c8b30a59..27835509ef88 100644 --- a/sysutils/triton/distinfo +++ b/sysutils/triton/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588118219 -SHA256 (JonathanSalwan-Triton-v0.8.1_GH0.tar.gz) = 1e4499376787c5c922a940f6061a628bc18e171ee27d6560582a70f9147a30ba -SIZE (JonathanSalwan-Triton-v0.8.1_GH0.tar.gz) = 10391210 +TIMESTAMP = 1647827649 +SHA256 (JonathanSalwan-Triton-v0.9_GH0.tar.gz) = fea82146a6952c8cf6335e5c2ee68581729611e7b4aa853b09e5a5459bc643f7 +SIZE (JonathanSalwan-Triton-v0.9_GH0.tar.gz) = 19433967 diff --git a/sysutils/triton/files/patch-src_libtriton_CMakeLists.txt b/sysutils/triton/files/patch-src_libtriton_CMakeLists.txt deleted file mode 100644 index 234d228ae14f..000000000000 --- a/sysutils/triton/files/patch-src_libtriton_CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ ---- src/libtriton/CMakeLists.txt.orig 2019-09-30 08:16:44 UTC -+++ src/libtriton/CMakeLists.txt -@@ -50,7 +50,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID - endif() - - # 32-bits --if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - if(${ARCHITECTURE} STREQUAL "i386") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - endif() -@@ -150,9 +150,9 @@ endif() - - # Triton have to generate a syscalls table from the kernel source - # This following code tries to find the unistd_64.h or unistd_32.h header depending on the architecture. --if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -- FILE(GLOB_RECURSE syscalls32_table_files /usr/include/*unistd_32.h) -- FILE(GLOB_RECURSE syscalls64_table_files /usr/include/*unistd_64.h) -+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ FILE(GLOB_RECURSE syscalls32_table_files /usr/include/unistd.h) -+ FILE(GLOB_RECURSE syscalls64_table_files /usr/include/unistd.h) - endif() - - macro(find_osx_syscall path) -@@ -197,7 +197,7 @@ macro(gen_syscall bits) - endmacro() - - # Note: Windows ?! --if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - gen_syscall(64) - else() - add_custom_target(gen-syscall64 -@@ -206,7 +206,7 @@ else() - endif() - - # Syscall 32 is only available for linux users --if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - gen_syscall(32) - else() - add_custom_target(gen-syscall32 diff --git a/sysutils/triton/files/patch-src_libtriton_includes_triton_syscalls.hpp b/sysutils/triton/files/patch-src_libtriton_includes_triton_syscalls.hpp deleted file mode 100644 index 7b9e26acb672..000000000000 --- a/sysutils/triton/files/patch-src_libtriton_includes_triton_syscalls.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libtriton/includes/triton/syscalls.hpp.orig 2020-02-22 23:40:16 UTC -+++ src/libtriton/includes/triton/syscalls.hpp -@@ -10,7 +10,7 @@ - - #if defined(__unix__) || defined(__APPLE__) - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - #include - #elif defined(__ANDROID___) - #if defined(__aarch64__) diff --git a/sysutils/triton/files/patch-src_scripts_extract__syscall.py b/sysutils/triton/files/patch-src_scripts_extract__syscall.py deleted file mode 100644 index 273535b703a4..000000000000 --- a/sysutils/triton/files/patch-src_scripts_extract__syscall.py +++ /dev/null @@ -1,11 +0,0 @@ ---- src/scripts/extract_syscall.py.orig 2020-02-23 00:00:42 UTC -+++ src/scripts/extract_syscall.py -@@ -41,6 +41,8 @@ if __name__ == "__main__": - - if platform.system() == 'Linux': - regex = re.compile(r"#define\s+(__NR_)(\w+)\s+(\d+)") -+ elif platform.system() == 'FreeBSD': -+ regex = re.compile(r"#define\s+(__NR_)(\w+)\s+(\d+)") - elif platform.system() == 'Darwin': - regex = re.compile(r"#define\s+(SYS_)(\w+)\s+(\d+)") - else: diff --git a/sysutils/triton/pkg-plist b/sysutils/triton/pkg-plist index a917780ddeac..48e7d23df0b5 100644 --- a/sysutils/triton/pkg-plist +++ b/sysutils/triton/pkg-plist @@ -18,11 +18,11 @@ include/triton/astRepresentation.hpp include/triton/astRepresentationInterface.hpp include/triton/astSmtRepresentation.hpp include/triton/bitsVector.hpp +include/triton/bitwuzlaSolver.hpp include/triton/callbacks.hpp include/triton/callbacksEnums.hpp include/triton/comparableFunctor.hpp include/triton/config.hpp -include/triton/config.hpp.in include/triton/coreUtils.hpp include/triton/cpuInterface.hpp include/triton/cpuSize.hpp @@ -32,17 +32,18 @@ include/triton/externalLibs.hpp include/triton/immediate.hpp include/triton/instruction.hpp include/triton/irBuilder.hpp +include/triton/liftingEngine.hpp +include/triton/liftingToLLVM.hpp +include/triton/liftingToPython.hpp +include/triton/liftingToSMT.hpp +include/triton/llvmToTriton.hpp include/triton/memoryAccess.hpp include/triton/modes.hpp include/triton/modesEnums.hpp include/triton/operandWrapper.hpp +include/triton/oracleEntry.hpp include/triton/pathConstraint.hpp include/triton/pathManager.hpp -include/triton/py3c_compat.h -include/triton/pythonBindings.hpp -include/triton/pythonObjects.hpp -include/triton/pythonUtils.hpp -include/triton/pythonXFunctions.hpp include/triton/register.hpp include/triton/semanticsInterface.hpp include/triton/shortcutRegister.hpp @@ -55,19 +56,24 @@ include/triton/symbolicEnums.hpp include/triton/symbolicExpression.hpp include/triton/symbolicSimplification.hpp include/triton/symbolicVariable.hpp -include/triton/syscalls.hpp -include/triton/syscalls.hpp.orig +include/triton/synthesisResult.hpp +include/triton/synthesizer.hpp include/triton/taintEngine.hpp -include/triton/tritonToZ3Ast.hpp +include/triton/tritonToBitwuzla.hpp +include/triton/tritonToLLVM.hpp +include/triton/tritonToZ3.hpp include/triton/tritonTypes.hpp -include/triton/unix.hpp include/triton/version.hpp -include/triton/version.hpp.in include/triton/x86.spec include/triton/x8664Cpu.hpp include/triton/x86Cpu.hpp include/triton/x86Semantics.hpp include/triton/x86Specifications.hpp include/triton/z3Solver.hpp -include/triton/z3ToTritonAst.hpp +include/triton/z3ToTriton.hpp +lib/cmake/triton/tritonConfig.cmake +lib/cmake/triton/tritonConfigVersion.cmake +lib/cmake/triton/tritonTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/triton/tritonTargets.cmake lib/libtriton.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/triton.so