diff --git a/devel/py-archinfo/Makefile b/devel/py-archinfo/Makefile index 13b42bac8030..5736063f72bb 100644 --- a/devel/py-archinfo/Makefile +++ b/devel/py-archinfo/Makefile @@ -1,28 +1,23 @@ PORTNAME= archinfo DISTVERSIONPREFIX= v DISTVERSION= ${ANGR_VERSION} CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Classes with architecture-specific information useful to other projects LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyvex>0:security/py-pyvex@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyvex>0:security/py-pyvex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR} -USES= python:3.6+ +USES= angr:nose python:3.6+ USE_GITHUB= yes GH_ACCOUNT= angr USE_PYTHON= autoplist distutils NO_ARCH= yes -do-test: - @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) - -.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include diff --git a/devel/py-cle/Makefile b/devel/py-cle/Makefile index e14b601098d6..1ed0b16991e7 100644 --- a/devel/py-cle/Makefile +++ b/devel/py-cle/Makefile @@ -1,36 +1,27 @@ PORTNAME= cle DISTVERSIONPREFIX= v DISTVERSION= ${ANGR_VERSION} CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Pythonic interface to analyze binary formats LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}minidump>0:devel/py-minidump@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pefile>0:devel/py-pefile@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyelftools>0.25:devel/py-pyelftools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2.0:devel/py-sortedcontainers@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} -USES= python:3.6+ +USES= angr:binaries,nose python:3.6+ USE_GITHUB= yes GH_ACCOUNT= angr -GH_TUPLE= angr:binaries:${ANGR_BINARIES_TAGNAME}:binaries USE_PYTHON= autoplist distutils NO_ARCH= yes -pre-test: - @${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries - -do-test: - @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) - -.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include diff --git a/math/py-claripy/Makefile b/math/py-claripy/Makefile index e07e421a2192..5282676942c8 100644 --- a/math/py-claripy/Makefile +++ b/math/py-claripy/Makefile @@ -1,32 +1,27 @@ PORTNAME= claripy DISTVERSIONPREFIX= v DISTVERSION= ${ANGR_VERSION} CATEGORIES= math devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Abstraction layer for constraint solvers LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>0:devel/py-cachetools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysmt>0:math/py-pysmt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}z3-solver>4.8.5.0:math/py-z3-solver@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ - z3>4.8.5.0:math/z3 +TEST_DEPENDS= z3>4.8.5.0:math/z3 -USES= python:3.6+ +USES= angr:nose python:3.6+ USE_GITHUB= yes GH_ACCOUNT= angr USE_PYTHON= autoplist distutils NO_ARCH= yes -do-test: - @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) - -.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include diff --git a/security/py-ailment/Makefile b/security/py-ailment/Makefile index 6701468ac479..c36bfbe58a59 100644 --- a/security/py-ailment/Makefile +++ b/security/py-ailment/Makefile @@ -1,34 +1,25 @@ PORTNAME= ailment DISTVERSIONPREFIX= v DISTVERSION= ${ANGR_VERSION} CATEGORIES= security devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= 0mp@FreeBSD.org COMMENT= AIL, the angr Intermediate Language LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}angr>=${ANGR_VERSION}:security/py-angr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}archinfo>=${ANGR_VERSION}:devel/py-archinfo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \ z3>0:math/z3 -USES= gmake localbase python:3.6+ +USES= angr:binaries,nose gmake localbase python:3.6+ USE_GITHUB= yes GH_ACCOUNT= angr -GH_TUPLE= angr:binaries:${ANGR_BINARIES_TAGNAME}:binaries USE_PYTHON= autoplist distutils NO_ARCH= yes -pre-test: - @${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries - -do-test: - @(cd ${TEST_WRKSRC}/tests && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER}) - -.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include diff --git a/security/py-angr/Makefile b/security/py-angr/Makefile index 6c60d4343227..6ccfc8d1b26f 100644 --- a/security/py-angr/Makefile +++ b/security/py-angr/Makefile @@ -1,95 +1,90 @@ PORTNAME= angr DISTVERSIONPREFIX= v DISTVERSION= ${ANGR_VERSION} PORTREVISION= 1 CATEGORIES= security devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Multi-architecture binary analysis toolkit LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR} LIB_DEPENDS= libunicorn.so:emulators/unicorn \ libz3.so:math/z3 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ailment>=${ANGR_VERSION}:security/py-ailment@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cachetools>=0:devel/py-cachetools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.5:devel/py-capstone@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cffi>=1.14.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}claripy>=${ANGR_VERSION}:math/py-claripy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cle>=${ANGR_VERSION}:devel/py-cle@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cppheaderparser>=0:devel/py-cppheaderparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dpkt>=0:net/py-dpkt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gitpython>=0:devel/py-gitpython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}itanium_demangler>=0:devel/py-itanium_demangler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mulpyplexer>=0:devel/py-mulpyplexer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.0:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}progressbar2>=0:misc/py-progressbar2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.12.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycparser>2.18:devel/py-pycparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystone-engine>=0:devel/py-keystone-engine@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} -USES= gmake localbase:ldflags python:3.6+ +USES= angr:binaries gmake localbase:ldflags python:3.6+ USE_GITHUB= yes -GH_TUPLE= ${PORTNAME}:binaries:${ANGR_BINARIES_TAGNAME}:binaries USE_PYTHON= autoplist distutils TEST_ENV= ${MAKE_ENV} \ NOSE_EXCLUDE="${_NOSE_EXCLUDE}" # Problem: the following tests require PySoot: https://github.com/angr/pysoot _EXCLUDED_TESTS+= test_simple1 _EXCLUDED_TESTS+= test_simple2 _EXCLUDED_TESTS+= test_fauxware _EXCLUDED_TESTS+= test_cmd_line_args _EXCLUDED_TESTS+= test_jni_version_information _EXCLUDED_TESTS+= test_jni_global_and_local_refs _EXCLUDED_TESTS+= test_jni_object_operations _EXCLUDED_TESTS+= test_jni_string_operations _EXCLUDED_TESTS+= test_jni_field_access _EXCLUDED_TESTS+= test_jni_method_calls _EXCLUDED_TESTS+= test_jni_primitive_datatypes _EXCLUDED_TESTS+= test_jni_object_arrays _EXCLUDED_TESTS+= test_jni_array_operations _EXCLUDED_TESTS+= test_method_calls _EXCLUDED_TESTS+= test_array_operations _EXCLUDED_TESTS+= test_multiarray_operations _EXCLUDED_TESTS+= test_loading _EXCLUDED_TESTS+= test_toggling_of_simstate # Problem: "TypeError: %d format: a number is required, not NoneType" _EXCLUDED_TESTS+= test_fastmem.* # Problem: "angr.errors.AngrIncongruencyError: Different constraints!" _EXCLUDED_TESTS+= test_similarity_fauxware # Problem: "IndexError: list index out of range" _EXCLUDED_TESTS+= test_self_modifying_code # Problem: "Exception: Not a valid binary file: '/bin/false'" _EXCLUDED_TESTS+= test_project # Problem: the test is hanging _EXCLUDED_TESTS+= test_veritesting_a # There are far more tests which are failing at the moment... # Create a regular expression out of the excluded tests, # but first remove double spaces. _NOSE_EXCLUDE= (${_EXCLUDED_TESTS:S, , ,g:S, ,|,gW}) post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/lib/angr_native*.so -pre-test: - @${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries - do-test: @(cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} -v) -.include "${.CURDIR}/Makefile.version" .include diff --git a/security/py-angr/Makefile.version b/security/py-angr/Makefile.version deleted file mode 100644 index 57e11d9f7df6..000000000000 --- a/security/py-angr/Makefile.version +++ /dev/null @@ -1,2 +0,0 @@ -ANGR_VERSION= 9.0.5405 -ANGR_BINARIES_TAGNAME= v${ANGR_VERSION} diff --git a/security/py-pyvex/Makefile b/security/py-pyvex/Makefile index 4846ee46cc75..d82596ba229b 100644 --- a/security/py-pyvex/Makefile +++ b/security/py-pyvex/Makefile @@ -1,60 +1,54 @@ PORTNAME= pyvex DISTVERSION= ${ANGR_VERSION} CATEGORIES= security devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Python interface to libVEX and VEX IR LICENSE= BSD2CLAUSE GPLv2+ GPLv3 LICENSE_COMB= multi LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE LICENSE_FILE_GPLv2+ = ${WRKSRC}/vex/LICENSE.GPL LICENSE_FILE_GPLv3= ${WRKSRC}/pyvex_c/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386 ONLY_FOR_ARCHS_REASON= pyvex_c/pyvex.c does not support this architecture (see line 170) BUILD_DEPENDS= ${_MY_DEPENDS} RUN_DEPENDS= ${_MY_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}archinfo>=${DISTVERSION}:devel/py-archinfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycparser>0:devel/py-pycparser@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}angr>=${DISTVERSION}:security/py-angr@${PY_FLAVOR} \ z3>=0:math/z3 -USES= gmake localbase python:3.5+ +USES= angr:binaries gmake localbase python:3.5+ USE_CSTD= c99 USE_GITHUB= nodefault -GH_TUPLE= angr:${PORTNAME}:v${DISTVERSION}:tests \ - angr:binaries:9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff:binaries +GH_TUPLE= angr:${PORTNAME}:v${DISTVERSION}:tests USE_LDCONFIG= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/lib USE_PYTHON= autoplist distutils MAKE_ENV= EXTRA_CFLAGS="${CFLAGS}" _MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.3:devel/py-cffi@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|g' \ -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ ${WRKSRC}/pyvex_c/Makefile @${REINPLACE_CMD} -e 's|%%MAKE_JOBS_NUMBER%%|${MAKE_JOBS_NUMBER}|g' \ ${WRKSRC}/setup.py post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/lib/lib${PORTNAME}*.so -pre-test: - @${LN} -Fs ${WRKSRC_tests}/tests ${WRKSRC}/tests - @${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries - do-test: @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) -.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include diff --git a/security/py-pyvex/distinfo b/security/py-pyvex/distinfo index e9c3ea4a7815..53e0a8892a67 100644 --- a/security/py-pyvex/distinfo +++ b/security/py-pyvex/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1610804745 +TIMESTAMP = 1626098519 SHA256 (pyvex-9.0.5405.tar.gz) = 6d34fb801432b6c5f95ab6b86c462d3aec8c93b751544dad3b40ba7d12984c29 SIZE (pyvex-9.0.5405.tar.gz) = 1767188 SHA256 (angr-pyvex-v9.0.5405_GH0.tar.gz) = 63d3b4ca662c052a714e83e1d573ccf5865004cfd63cdbd5fb85b533864651be SIZE (angr-pyvex-v9.0.5405_GH0.tar.gz) = 87680 -SHA256 (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 2c6f5130f5ee51e4cd8d891a137a347141cf155a6b2dbb248b02ac7cf11c2631 -SIZE (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 56723730 +SHA256 (angr-binaries-v9.0.5405_GH0.tar.gz) = c6cf9e357450d485ff9f32bba6f495e7a0336178b6d8dde1bb16430da8b58efe +SIZE (angr-binaries-v9.0.5405_GH0.tar.gz) = 57764618