Date: Thu, 24 Sep 2020 16:08:35 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549925 - in head: devel/py-archinfo devel/py-cle devel/py-cle/files math/py-claripy security/py-ailment security/py-angr security/py-angr/files security/py-pyvex security/py-pyvex/files Message-ID: <202009241608.08OG8Zsj019551@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: 0mp Date: Thu Sep 24 16:08:34 2020 New Revision: 549925 URL: https://svnweb.freebsd.org/changeset/ports/549925 Log: Update the angr project ports to 9.0.4378 This patch introduces security/py-angr/Makefile.version file, which stores the shared version of all the angr ports (as ANGR_VERSION). It also stores the tagname of a distribution file, which is required for testing (ANGR_BINARIES_TAGNAME). Added: head/security/py-angr/Makefile.version (contents, props changed) Deleted: head/devel/py-cle/files/ head/security/py-angr/files/ Modified: head/devel/py-archinfo/Makefile head/devel/py-archinfo/distinfo head/devel/py-cle/Makefile head/devel/py-cle/distinfo head/math/py-claripy/Makefile head/math/py-claripy/distinfo head/security/py-ailment/Makefile head/security/py-ailment/distinfo head/security/py-angr/Makefile head/security/py-angr/distinfo head/security/py-pyvex/Makefile head/security/py-pyvex/distinfo head/security/py-pyvex/files/patch-pyvex__c_Makefile Modified: head/devel/py-archinfo/Makefile ============================================================================== --- head/devel/py-archinfo/Makefile Thu Sep 24 15:42:12 2020 (r549924) +++ head/devel/py-archinfo/Makefile Thu Sep 24 16:08:34 2020 (r549925) @@ -1,11 +1,10 @@ # $FreeBSD$ PORTNAME= archinfo -DISTVERSION= 8.20.1.7 +DISTVERSIONPREFIX= v +DISTVERSION= ${ANGR_VERSION} CATEGORIES= devel python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Classes with architecture-specific information useful to other projects @@ -13,19 +12,19 @@ COMMENT= Classes with architecture-specific informatio LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyvex>0:security/py-pyvex@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR} -USES= python:3.5+ -USE_GITHUB= nodefault -GH_TUPLE= angr:${PORTNAME}:fa979436bd07b4178877d31a5166d28063a89807:tests +USES= python:3.6+ +USE_GITHUB= yes +GH_ACCOUNT= angr USE_PYTHON= autoplist distutils NO_ARCH= yes -pre-test: - @${LN} -Fs ${WRKSRC_tests}/tests ${WRKSRC}/tests - do-test: - @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) + @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) +.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include <bsd.port.mk> Modified: head/devel/py-archinfo/distinfo ============================================================================== --- head/devel/py-archinfo/distinfo Thu Sep 24 15:42:12 2020 (r549924) +++ head/devel/py-archinfo/distinfo Thu Sep 24 16:08:34 2020 (r549925) @@ -1,5 +1,5 @@ -TIMESTAMP = 1583534717 -SHA256 (archinfo-8.20.1.7.tar.gz) = fc0cf661c7c416701cc0947566ad162823dd4ed8039619201f854887dcc6709a -SIZE (archinfo-8.20.1.7.tar.gz) = 43408 -SHA256 (angr-archinfo-fa979436bd07b4178877d31a5166d28063a89807_GH0.tar.gz) = 031a284e357c8890b9523e8420a9c3b54e98c21f3d6e3a995b7e77d06415fa09 -SIZE (angr-archinfo-fa979436bd07b4178877d31a5166d28063a89807_GH0.tar.gz) = 47444 +TIMESTAMP = 1600424364 +SHA256 (angr-archinfo-v9.0.4378_GH0.tar.gz) = 11ab18738981801697c9c6e4e8783f2aa1680fda7aec6af82a10c7697909092a +SIZE (angr-archinfo-v9.0.4378_GH0.tar.gz) = 49134 +SHA256 (angr-archinfo-v9.0.4378_GH0.tar.gz) = 11ab18738981801697c9c6e4e8783f2aa1680fda7aec6af82a10c7697909092a +SIZE (angr-archinfo-v9.0.4378_GH0.tar.gz) = 49134 Modified: head/devel/py-cle/Makefile ============================================================================== --- head/devel/py-cle/Makefile Thu Sep 24 15:42:12 2020 (r549924) +++ head/devel/py-cle/Makefile Thu Sep 24 16:08:34 2020 (r549925) @@ -1,12 +1,10 @@ # $FreeBSD$ PORTNAME= cle -DISTVERSION= 8.20.1.7 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= ${ANGR_VERSION} CATEGORIES= devel python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Pythonic interface to analyze binary formats @@ -17,24 +15,24 @@ 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:devel/py-pyelftools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyvex>=${DISTVERSION}:security/py-pyvex@${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+ -USE_GITHUB= nodefault -GH_TUPLE= angr:${PORTNAME}:18f073190e37310737ee2d79ba52f72a481b4a9f:tests \ - angr:binaries:f2de6d7a0474d22130ffadd042327536a6fda114:binaries +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_tests}/tests ${WRKSRC}/tests @${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries do-test: - @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) + @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) +.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include <bsd.port.mk> Modified: head/devel/py-cle/distinfo ============================================================================== --- head/devel/py-cle/distinfo Thu Sep 24 15:42:12 2020 (r549924) +++ head/devel/py-cle/distinfo Thu Sep 24 16:08:34 2020 (r549925) @@ -1,7 +1,5 @@ -TIMESTAMP = 1583533671 -SHA256 (cle-8.20.1.7.tar.gz) = 56909340143c929c1388f10bf6ca8b8ac731d586a679e0a9a75edad84af86e06 -SIZE (cle-8.20.1.7.tar.gz) = 94407 -SHA256 (angr-cle-18f073190e37310737ee2d79ba52f72a481b4a9f_GH0.tar.gz) = 4d60da85f6793f8ffe7c7f43508774fc904843f62303db452c6e6f9c3b593f16 -SIZE (angr-cle-18f073190e37310737ee2d79ba52f72a481b4a9f_GH0.tar.gz) = 110973 -SHA256 (angr-binaries-f2de6d7a0474d22130ffadd042327536a6fda114_GH0.tar.gz) = 7bdc710d10db37d3105038eb4efda1b39e9d1149ecfaf35b1157381fe7275a4a -SIZE (angr-binaries-f2de6d7a0474d22130ffadd042327536a6fda114_GH0.tar.gz) = 56385140 +TIMESTAMP = 1600434236 +SHA256 (angr-cle-v9.0.4378_GH0.tar.gz) = b82dc94674e67786920a1f8335e99130f064f5fadc624fd5d2d8b94727022a00 +SIZE (angr-cle-v9.0.4378_GH0.tar.gz) = 128267 +SHA256 (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 2c6f5130f5ee51e4cd8d891a137a347141cf155a6b2dbb248b02ac7cf11c2631 +SIZE (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 56723730 Modified: head/math/py-claripy/Makefile ============================================================================== --- head/math/py-claripy/Makefile Thu Sep 24 15:42:12 2020 (r549924) +++ head/math/py-claripy/Makefile Thu Sep 24 16:08:34 2020 (r549925) @@ -1,12 +1,10 @@ # $FreeBSD$ PORTNAME= claripy -DISTVERSION= 8.20.1.7 -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= ${ANGR_VERSION} CATEGORIES= math devel python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Abstraction layer for constraint solvers @@ -22,17 +20,15 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>0:devel TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ z3>4.8.5.0:math/z3 -USES= python:3.5+ -USE_GITHUB= nodefault -GH_TUPLE= angr:${PORTNAME}:ea20bb80a84aab942f89cffbf035675dc0cf1af4:tests +USES= python:3.6+ +USE_GITHUB= yes +GH_ACCOUNT= angr USE_PYTHON= autoplist distutils NO_ARCH= yes -pre-test: - @${LN} -Fs ${WRKSRC_tests}/tests ${WRKSRC}/tests - do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) +.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include <bsd.port.mk> Modified: head/math/py-claripy/distinfo ============================================================================== --- head/math/py-claripy/distinfo Thu Sep 24 15:42:12 2020 (r549924) +++ head/math/py-claripy/distinfo Thu Sep 24 16:08:34 2020 (r549925) @@ -1,5 +1,3 @@ -TIMESTAMP = 1583538744 -SHA256 (claripy-8.20.1.7.tar.gz) = cfdc3e33560eb639e7188f44e316fe8515d47a21f5720d3acd29c5c65bc44f14 -SIZE (claripy-8.20.1.7.tar.gz) = 121785 -SHA256 (angr-claripy-ea20bb80a84aab942f89cffbf035675dc0cf1af4_GH0.tar.gz) = db1bc947e2990b2683a64fa5826deaa28f071a1c30d9dd67a6dd7549d84e7a3d -SIZE (angr-claripy-ea20bb80a84aab942f89cffbf035675dc0cf1af4_GH0.tar.gz) = 149530 +TIMESTAMP = 1600434330 +SHA256 (angr-claripy-v9.0.4378_GH0.tar.gz) = 240aa874816adb41041ac0ee2f1ce9f2127bbc3c97e0d66811aa915cf031a23a +SIZE (angr-claripy-v9.0.4378_GH0.tar.gz) = 150355 Modified: head/security/py-ailment/Makefile ============================================================================== --- head/security/py-ailment/Makefile Thu Sep 24 15:42:12 2020 (r549924) +++ head/security/py-ailment/Makefile Thu Sep 24 16:08:34 2020 (r549925) @@ -1,36 +1,36 @@ # $FreeBSD$ PORTNAME= ailment -DISTVERSION= 8.20.1.7 +DISTVERSIONPREFIX= v +DISTVERSION= ${ANGR_VERSION} CATEGORIES= security devel python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= 0mp@FreeBSD.org COMMENT= AIL, the angr Intermediate Language LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}angr>=${DISTVERSION}:security/py-angr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}archinfo>=${DISTVERSION}:devel/py-archinfo@${PY_FLAVOR} \ +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>=${DISTVERSION}:security/py-pyvex@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \ z3>0:math/z3 -USES= gmake localbase python -USE_GITHUB= nodefault -GH_TUPLE= angr:${PORTNAME}:c696edc9f31ecccaaa36b1e40ca1bed6c9715242:tests \ - angr:binaries:f2de6d7a0474d22130ffadd042327536a6fda114:binaries +USES= 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_tests}/tests ${WRKSRC}/tests @${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 <bsd.port.mk> Modified: head/security/py-ailment/distinfo ============================================================================== --- head/security/py-ailment/distinfo Thu Sep 24 15:42:12 2020 (r549924) +++ head/security/py-ailment/distinfo Thu Sep 24 16:08:34 2020 (r549925) @@ -1,7 +1,5 @@ -TIMESTAMP = 1583702768 -SHA256 (ailment-8.20.1.7.tar.gz) = 1fc110705f9dd1cfeca66876fbd87fbecea005a1d35554492c45052a2d5aa652 -SIZE (ailment-8.20.1.7.tar.gz) = 10548 -SHA256 (angr-ailment-c696edc9f31ecccaaa36b1e40ca1bed6c9715242_GH0.tar.gz) = bc6b54f62665f715c7d092ec236a4447d9135612331fa5f1d10ab073f12002f8 -SIZE (angr-ailment-c696edc9f31ecccaaa36b1e40ca1bed6c9715242_GH0.tar.gz) = 12549 -SHA256 (angr-binaries-f2de6d7a0474d22130ffadd042327536a6fda114_GH0.tar.gz) = 7bdc710d10db37d3105038eb4efda1b39e9d1149ecfaf35b1157381fe7275a4a -SIZE (angr-binaries-f2de6d7a0474d22130ffadd042327536a6fda114_GH0.tar.gz) = 56385140 +TIMESTAMP = 1600433830 +SHA256 (angr-ailment-v9.0.4378_GH0.tar.gz) = 6b4c379265510a3b8e1478e63f8e8f6c7e613ea50dd77137949731ac51d6da58 +SIZE (angr-ailment-v9.0.4378_GH0.tar.gz) = 10399 +SHA256 (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 2c6f5130f5ee51e4cd8d891a137a347141cf155a6b2dbb248b02ac7cf11c2631 +SIZE (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 56723730 Modified: head/security/py-angr/Makefile ============================================================================== --- head/security/py-angr/Makefile Thu Sep 24 15:42:12 2020 (r549924) +++ head/security/py-angr/Makefile Thu Sep 24 16:08:34 2020 (r549925) @@ -1,11 +1,15 @@ # $FreeBSD$ PORTNAME= angr -DISTVERSION= 8.20.1.7 +DISTVERSIONPREFIX= v +DISTVERSION= ${ANGR_VERSION} CATEGORIES= security devel python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +PATCH_SITES= https://github.com/angr/angr/pull/ +PATCHFILES= 2332.patch:-p1 \ + 2333.patch:-p1 \ + 2334.patch:-p1 \ + 2335.patch:-p1 MAINTAINER= 0mp@FreeBSD.org COMMENT= Multi-architecture binary analysis toolkit @@ -13,37 +17,41 @@ COMMENT= Multi-architecture binary analysis toolkit LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyvex>=${DISTVERSION}:security/py-pyvex@${PY_FLAVOR} \ +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 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ailment>=${DISTVERSION}:security/py-ailment@${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.7.0:devel/py-cffi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}claripy>=${DISTVERSION}:math/py-claripy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cle>=${DISTVERSION}:devel/py-cle@${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>=0:devel/py-protobuf@${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} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keystone-engine>=0:devel/py-keystone-engine@${PY_FLAVOR} \ - z3>=0:math/z3 + ${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 python:3.5+ -USE_GITHUB= nodefault -GH_TUPLE= ${PORTNAME}:${PORTNAME}:6b1a0825cbe156e2d32c577ba47ff50920f005aa:tests \ - ${PORTNAME}:binaries:f2de6d7a0474d22130ffadd042327536a6fda114:binaries +USES= 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}" +TEST_ENV= ${MAKE_ENV} \ + NOSE_EXCLUDE="${_NOSE_EXCLUDE}" # Problem: the following tests require PySoot: https://github.com/angr/pysoot _EXCLUDED_TESTS+= test_simple1 @@ -72,26 +80,22 @@ _EXCLUDED_TESTS+= test_similarity_fauxware _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. -_NOSE_EXCLUDE= (${_EXCLUDED_TESTS:S, ,|,gW}) +# Create a regular expression out of the excluded tests, +# but first remove double spaces. +_NOSE_EXCLUDE= (${_EXCLUDED_TESTS:S, , ,g:S, ,|,gW}) -post-patch: - @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' \ - -e 's|%%CXX%%|${CXX}|g' \ - -e 's|%%CFLAGS%%|${CFLAGS}|g' \ - -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ - -e 's|%%LIBS%%|${LIBS}|g' \ - ${WRKSRC}/native/Makefile - post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/lib/angr_native.so pre-test: - @${LN} -Fs ${WRKSRC_tests}/tests ${WRKSRC}/tests @${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries do-test: @(cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} -v) +.include "${.CURDIR}/Makefile.version" .include <bsd.port.mk> Added: head/security/py-angr/Makefile.version ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-angr/Makefile.version Thu Sep 24 16:08:34 2020 (r549925) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +ANGR_VERSION= 9.0.4378 +ANGR_BINARIES_TAGNAME= 9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff Modified: head/security/py-angr/distinfo ============================================================================== --- head/security/py-angr/distinfo Thu Sep 24 15:42:12 2020 (r549924) +++ head/security/py-angr/distinfo Thu Sep 24 16:08:34 2020 (r549925) @@ -1,7 +1,13 @@ -TIMESTAMP = 1583576024 -SHA256 (angr-8.20.1.7.tar.gz) = f6c67806240b5ee5e309ec7565ef756107afb11f62d5424e474e0b0cc0637cea -SIZE (angr-8.20.1.7.tar.gz) = 894100 -SHA256 (angr-angr-6b1a0825cbe156e2d32c577ba47ff50920f005aa_GH0.tar.gz) = ff0156bd839d02ad4b11351cf5747b59b9a419f58ca79ef4ab4ab49bab197925 -SIZE (angr-angr-6b1a0825cbe156e2d32c577ba47ff50920f005aa_GH0.tar.gz) = 1228522 -SHA256 (angr-binaries-f2de6d7a0474d22130ffadd042327536a6fda114_GH0.tar.gz) = 7bdc710d10db37d3105038eb4efda1b39e9d1149ecfaf35b1157381fe7275a4a -SIZE (angr-binaries-f2de6d7a0474d22130ffadd042327536a6fda114_GH0.tar.gz) = 56385140 +TIMESTAMP = 1600962369 +SHA256 (angr-angr-v9.0.4378_GH0.tar.gz) = 7f24aabe4d8e65afacc80cf7488d627909f59361ed59db61d6766f6ce1383026 +SIZE (angr-angr-v9.0.4378_GH0.tar.gz) = 1174851 +SHA256 (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 2c6f5130f5ee51e4cd8d891a137a347141cf155a6b2dbb248b02ac7cf11c2631 +SIZE (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 56723730 +SHA256 (2332.patch) = e83d490c3c4437935a0b338ac985620f91c94e8470c722c21360b29a9d792e74 +SIZE (2332.patch) = 923 +SHA256 (2333.patch) = c61fd9b25b7dd73bdd37fdd21328896713d9fa81d86f9f41a4f7fcd26425626a +SIZE (2333.patch) = 647 +SHA256 (2334.patch) = ff442c4be2b1f0273bc678ab37e09f0fa52c7c7016b71c1547b7cb613d6f25de +SIZE (2334.patch) = 1080 +SHA256 (2335.patch) = dbbd8ad6b3fd576ae99934d82d77d37936a8dafc50b8b99d8261594809f385b4 +SIZE (2335.patch) = 2619 Modified: head/security/py-pyvex/Makefile ============================================================================== --- head/security/py-pyvex/Makefile Thu Sep 24 15:42:12 2020 (r549924) +++ head/security/py-pyvex/Makefile Thu Sep 24 16:08:34 2020 (r549925) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pyvex -DISTVERSION= 8.20.1.7 -PORTREVISION= 1 +DISTVERSION= ${ANGR_VERSION} CATEGORIES= security devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -33,8 +32,9 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-n USES= gmake localbase python:3.5+ USE_CSTD= c99 USE_GITHUB= nodefault -GH_TUPLE= angr:${PORTNAME}:4fa68d58618a7635b281c9d06263c75fb9bf357f:tests \ - angr:binaries:f2de6d7a0474d22130ffadd042327536a6fda114:binaries +GH_TUPLE= angr:${PORTNAME}:v${DISTVERSION}:tests \ + angr:binaries:9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff:binaries +USE_LDCONFIG= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/lib USE_PYTHON= autoplist distutils MAKE_ENV= EXTRA_CFLAGS="${CFLAGS}" @@ -56,6 +56,7 @@ pre-test: @${LN} -Fs ${WRKSRC_binaries} ${WRKDIR}/binaries do-test: - @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) + @(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} nosetests-${PYTHON_VER} tests/*) +.include "${.CURDIR}/../../security/py-angr/Makefile.version" .include <bsd.port.mk> Modified: head/security/py-pyvex/distinfo ============================================================================== --- head/security/py-pyvex/distinfo Thu Sep 24 15:42:12 2020 (r549924) +++ head/security/py-pyvex/distinfo Thu Sep 24 16:08:34 2020 (r549925) @@ -1,7 +1,7 @@ -TIMESTAMP = 1584020289 -SHA256 (pyvex-8.20.1.7.tar.gz) = 16d84ffb61d70d735861599d9f8cb21c33a22cbc9852de4acaa6569991a2e1ce -SIZE (pyvex-8.20.1.7.tar.gz) = 1729320 -SHA256 (angr-pyvex-4fa68d58618a7635b281c9d06263c75fb9bf357f_GH0.tar.gz) = 33e76741d598319c00a8d0c70d8e7151985e3e397cd97d45c5f64c8cb548dbb1 -SIZE (angr-pyvex-4fa68d58618a7635b281c9d06263c75fb9bf357f_GH0.tar.gz) = 85478 -SHA256 (angr-binaries-f2de6d7a0474d22130ffadd042327536a6fda114_GH0.tar.gz) = 7bdc710d10db37d3105038eb4efda1b39e9d1149ecfaf35b1157381fe7275a4a -SIZE (angr-binaries-f2de6d7a0474d22130ffadd042327536a6fda114_GH0.tar.gz) = 56385140 +TIMESTAMP = 1600418542 +SHA256 (pyvex-9.0.4378.tar.gz) = c74bcdb35886115a9c20233f051d37c6b16da670281a95d2b8efd3ce10b02eac +SIZE (pyvex-9.0.4378.tar.gz) = 1784570 +SHA256 (angr-pyvex-v9.0.4378_GH0.tar.gz) = 3d8b6cc73b55e87c7ed4029af23b8214699b239fb675057b44152941a372d647 +SIZE (angr-pyvex-v9.0.4378_GH0.tar.gz) = 86531 +SHA256 (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 2c6f5130f5ee51e4cd8d891a137a347141cf155a6b2dbb248b02ac7cf11c2631 +SIZE (angr-binaries-9bf9c59002c2fb751ae2357f08fb9f4f8171a4ff_GH0.tar.gz) = 56723730 Modified: head/security/py-pyvex/files/patch-pyvex__c_Makefile ============================================================================== --- head/security/py-pyvex/files/patch-pyvex__c_Makefile Thu Sep 24 15:42:12 2020 (r549924) +++ head/security/py-pyvex/files/patch-pyvex__c_Makefile Thu Sep 24 16:08:34 2020 (r549925) @@ -1,8 +1,8 @@ ---- pyvex_c/Makefile.orig 2019-04-16 21:08:49 UTC +--- pyvex_c/Makefile.orig 2020-09-17 20:10:23 UTC +++ pyvex_c/Makefile @@ -4,6 +4,11 @@ ifeq ($(UNAME), Darwin) STATIC_LIBRARY_FILE=libpyvex.a - LDFLAGS=-Wl,-install_name,$(LIBRARY_FILE) + LDFLAGS=-Wl,-install_name,@rpath/$(LIBRARY_FILE) endif +ifeq ($(UNAME), FreeBSD) + LIBRARY_FILE=libpyvex.so @@ -12,16 +12,9 @@ ifeq ($(UNAME), Linux) LIBRARY_FILE=libpyvex.so STATIC_LIBRARY_FILE=libpyvex.a -@@ -22,15 +27,13 @@ endif - - # deeply evil - # https://www.cmcrossroads.com/article/gnu-make-meets-file-names-spaces-them --sp := --sp += --qs = $(subst ?,$(sp),$1) --sq = $(subst $(sp),?,$1) -+qs = $(subst ?,\ ,$1) -+sq = $(subst \ ,?,$1) +@@ -26,10 +31,10 @@ sp =$(null) $(null) + qs = $(subst ?,$(sp),$1) + sq = $(subst $(sp),?,$1) -CC=gcc -AR=ar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009241608.08OG8Zsj019551>