Received: by mail.netbsd.org (Postfix, from userid 605) id 5D54684F0F; Thu, 11 May 2023 09:53:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8716B84F04 for ; Thu, 11 May 2023 09:53:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Qbh4K2eukCai for ; Thu, 11 May 2023 09:53:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9A51184CD7 for ; Thu, 11 May 2023 09:53:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 93B10FA87; Thu, 11 May 2023 09:53:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1683798786156720" MIME-Version: 1.0 Date: Thu, 11 May 2023 09:53:06 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel/py-manticore To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20230511095306.93B10FA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1683798786156720 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu May 11 09:53:06 UTC 2023 Modified Files: pkgsrc/devel/py-manticore: Makefile PLIST distinfo pkgsrc/devel/py-manticore/patches: patch-setup.py Log Message: py-manticore: updated to 0.3.7 0.3.7 Ethereum Use crytic-compile 0.2.2 Multi-transaction analysis now uses fixed attacker and owner contracts Native [Added API] Retrieve list of unimplemented syscalls Add FXSAVE/FXRSTOR concrete support on x86 Add last_executed_pc property to CPU Support LD_LIBRARY_PATH Optional will/did_read_memory events Fixed base address handling on Linux Add ENDBR-style NOPs Support epoll-related syscalls Other [Added API] Add fork policy for providing explicit values Fixed Constant Folding Add simplifications for subtraction Parent state ID, last PC now available in state descriptors States now contain a reference to the current manticore instance fast_fail config to exit after first state exception Scaling bugfix for large solver queries Don't fork when only one solution is found for Concretize To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/py-manticore/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-manticore/PLIST cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-manticore/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-manticore/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1683798786156720 Content-Disposition: inline Content-Length: 6631 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-manticore/Makefile diff -u pkgsrc/devel/py-manticore/Makefile:1.18 pkgsrc/devel/py-manticore/Makefile:1.19 --- pkgsrc/devel/py-manticore/Makefile:1.18 Mon Nov 14 14:34:48 2022 +++ pkgsrc/devel/py-manticore/Makefile Thu May 11 09:53:06 2023 @@ -1,42 +1,39 @@ -# $NetBSD: Makefile,v 1.18 2022/11/14 14:34:48 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2023/05/11 09:53:06 adam Exp $ -.include "../../devel/py-angr/version.mk" - -DISTNAME= manticore-${GITHUB_TAG} -PKGNAME= ${PYPKGPREFIX}-${EGG_NAME} -PKGREVISION= 3 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=trailofbits/} -GITHUB_PROJECT= manticore -GITHUB_TAG= 0.3.4 +DISTNAME= manticore-0.3.7 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= devel python +MASTER_SITES= ${MASTER_SITE_PYPI:=m/manticore/} MAINTAINER= khorben@defora.org -HOMEPAGE= https://github.com/trailofbits/manticore/ +HOMEPAGE= https://github.com/trailofbits/manticore COMMENT= Symbolic execution tool for analysis of binaries and smart contracts LICENSE= gnu-agpl-v3 -DEPENDS+= ${PYPKGPREFIX}-angr>=${ANGR_VERSION}:../../devel/py-angr -DEPENDS+= ${PYPKGPREFIX}-capstone-[0-9]*:../../devel/py-capstone -DEPENDS+= ${PYPKGPREFIX}-rlp-[0-9]*:../../devel/py-rlp +DEPENDS+= ${PYPKGPREFIX}-crytic-compile>=0.2.2:../../finance/py-crytic-compile +DEPENDS+= ${PYPKGPREFIX}-intervaltree-[0-9]*:../../devel/py-intervaltree DEPENDS+= ${PYPKGPREFIX}-ply-[0-9]*:../../devel/py-ply -DEPENDS+= ${PYPKGPREFIX}-pyelftools-[0-9]*:../../devel/py-pyelftools +DEPENDS+= ${PYPKGPREFIX}-protobuf-[0-9]*:../../devel/py-protobuf +DEPENDS+= ${PYPKGPREFIX}-pyevmasm>=0.2.3:../../finance/py-pyevmasm DEPENDS+= ${PYPKGPREFIX}-pysha3-[0-9]*:../../devel/py-pysha3 -DEPENDS+= ${PYPKGPREFIX}-unicorn-[0-9]*:../../emulators/py-unicorn -DEPENDS+= ${PYPKGPREFIX}-crytic-compile-[0-9]*:../../finance/py-crytic-compile -DEPENDS+= ${PYPKGPREFIX}-pyevmasm-[0-9]*:../../finance/py-pyevmasm -DEPENDS+= ${PYPKGPREFIX}-z3solver-[0-9]*:../../math/py-z3solver -DEPENDS+= ${PYPKGPREFIX}-ptable-[0-9]*:../../textproc/py-ptable +DEPENDS+= ${PYPKGPREFIX}-prettytable-[0-9]*:../../textproc/py-prettytable +DEPENDS+= ${PYPKGPREFIX}-rlp-[0-9]*:../../devel/py-rlp DEPENDS+= ${PYPKGPREFIX}-wasm-[0-9]*:../../devel/py-wasm DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml - -PYTHON_VERSIONS_INCOMPATIBLE= 27 311 +DEPENDS+= ${PYPKGPREFIX}-z3-[0-9]*:../../math/py-z3 +# native +DEPENDS+= ${PYPKGPREFIX}-capstone>=4.0.2:../../devel/py-capstone +DEPENDS+= ${PYPKGPREFIX}-pyelftools-[0-9]*:../../devel/py-pyelftools +DEPENDS+= ${PYPKGPREFIX}-unicorn-[0-9]*:../../emulators/py-unicorn USE_PKG_RESOURCES= yes +PYTHON_VERSIONS_INCOMPATIBLE= 27 311 + post-install: -.for alternative in bin/manticore bin/manticore-verifier - ${MV} ${DESTDIR}${PREFIX}/${alternative} \ - ${DESTDIR}${PREFIX}/${alternative}-${PYVERSSUFFIX} +.for bin in manticore manticore-verifier + cd ${DESTDIR}${PREFIX}/bin && \ + ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE} .endfor .include "../../lang/python/egg.mk" Index: pkgsrc/devel/py-manticore/PLIST diff -u pkgsrc/devel/py-manticore/PLIST:1.3 pkgsrc/devel/py-manticore/PLIST:1.4 --- pkgsrc/devel/py-manticore/PLIST:1.3 Tue Sep 29 00:50:05 2020 +++ pkgsrc/devel/py-manticore/PLIST Thu May 11 09:53:06 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2020/09/29 00:50:05 khorben Exp $ +@comment $NetBSD: PLIST,v 1.4 2023/05/11 09:53:06 adam Exp $ bin/manticore-${PYVERSSUFFIX} bin/manticore-verifier-${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO @@ -55,6 +55,9 @@ ${PYSITELIB}/manticore/core/smtlib/visit ${PYSITELIB}/manticore/core/state.py ${PYSITELIB}/manticore/core/state.pyc ${PYSITELIB}/manticore/core/state.pyo +${PYSITELIB}/manticore/core/state_pb2.py +${PYSITELIB}/manticore/core/state_pb2.pyc +${PYSITELIB}/manticore/core/state_pb2.pyo ${PYSITELIB}/manticore/core/worker.py ${PYSITELIB}/manticore/core/worker.pyc ${PYSITELIB}/manticore/core/worker.pyo @@ -196,6 +199,9 @@ ${PYSITELIB}/manticore/utils/deprecated. ${PYSITELIB}/manticore/utils/emulate.py ${PYSITELIB}/manticore/utils/emulate.pyc ${PYSITELIB}/manticore/utils/emulate.pyo +${PYSITELIB}/manticore/utils/enums.py +${PYSITELIB}/manticore/utils/enums.pyc +${PYSITELIB}/manticore/utils/enums.pyo ${PYSITELIB}/manticore/utils/event.py ${PYSITELIB}/manticore/utils/event.pyc ${PYSITELIB}/manticore/utils/event.pyo Index: pkgsrc/devel/py-manticore/distinfo diff -u pkgsrc/devel/py-manticore/distinfo:1.8 pkgsrc/devel/py-manticore/distinfo:1.9 --- pkgsrc/devel/py-manticore/distinfo:1.8 Tue Oct 26 10:18:40 2021 +++ pkgsrc/devel/py-manticore/distinfo Thu May 11 09:53:06 2023 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2021/10/26 10:18:40 nia Exp $ +$NetBSD: distinfo,v 1.9 2023/05/11 09:53:06 adam Exp $ -BLAKE2s (manticore-0.3.4.tar.gz) = 41b3011f9ff0317a6cd7280ddf26b4060f2732efada65c091738f60102677836 -SHA512 (manticore-0.3.4.tar.gz) = e178dfde84f5526e4e6473ebebd238460c24fa2e2ae0a6a8b40aaf827dc148916b1c7b2501ee48f423042089fa34cadcf77a8c58ecff18e066963918380250ec -Size (manticore-0.3.4.tar.gz) = 7019961 bytes -SHA1 (patch-setup.py) = b232c08e23251f74b3e112306e60ef014ea404a6 +BLAKE2s (manticore-0.3.7.tar.gz) = 12a504cf225145371698be42b3c06edb2044a79a4b3eab4b5363017536565236 +SHA512 (manticore-0.3.7.tar.gz) = c7c87010f734ce5803637f33ce97199ab706309d112a9934a43f2a2d12769cff2541f4fc48115f133ed1e2c4240569b17d7bc667d7b394ff3a3236134afaea8b +Size (manticore-0.3.7.tar.gz) = 385451 bytes +SHA1 (patch-setup.py) = 9bf6aa446f2fdf6278e19b54b0fe455d699b08b7 Index: pkgsrc/devel/py-manticore/patches/patch-setup.py diff -u pkgsrc/devel/py-manticore/patches/patch-setup.py:1.1 pkgsrc/devel/py-manticore/patches/patch-setup.py:1.2 --- pkgsrc/devel/py-manticore/patches/patch-setup.py:1.1 Tue Sep 29 03:27:32 2020 +++ pkgsrc/devel/py-manticore/patches/patch-setup.py Thu May 11 09:53:06 2023 @@ -1,15 +1,15 @@ -$NetBSD: patch-setup.py,v 1.1 2020/09/29 03:27:32 khorben Exp $ +$NetBSD: patch-setup.py,v 1.2 2023/05/11 09:53:06 adam Exp $ -Use the ptable2 Python module to implement prettytable +Allow newer crytic-compile. ---- setup.py.orig 2020-06-27 01:54:55.000000000 +0000 +--- setup.py.orig 2023-05-11 09:50:04.000000000 +0000 +++ setup.py -@@ -54,7 +54,7 @@ setup( - install_requires=[ - "pyyaml", - "pysha3", -- "prettytable", -+ "PTable", +@@ -71,7 +71,7 @@ setup( "ply", "rlp", - "crytic-compile>=0.1.1", + "intervaltree", +- "crytic-compile==0.2.2", ++ "crytic-compile>=0.2.2", + "wasm", + "dataclasses; python_version < '3.7'", + "pyevmasm>=0.2.3", --_----------=_1683798786156720--