With this update py-claripy can finally use a recent angr-z3 version.
No other ports changes except the usual bump.
OK?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/devel/angr/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- Makefile.inc 30 Sep 2019 08:24:44 -0000 1.3
+++ Makefile.inc 5 Nov 2019 20:14:13 -0000
@@ -21,7 +21,7 @@ MODPY_PI ?= Yes
MODPY_SETUPTOOLS ?= Yes
MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION_3}
-MODPY_EGG_VERSION ?= 8.19.7.25
+MODPY_EGG_VERSION ?= 8.19.10.30
DISTNAME ?= ${ANGR_PYTHON_MODULE}-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
.endif
Index: py-ailment/distinfo
===================================================================
RCS file: /cvs/ports/devel/angr/py-ailment/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-ailment/distinfo 15 Sep 2019 13:29:50 -0000 1.2
+++ py-ailment/distinfo 5 Nov 2019 20:14:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (ailment-8.19.7.25.tar.gz) =
IM624corWR83fgs2rEElM4wvkyWCOKuY+o+AiL1T+Vo=
-SIZE (ailment-8.19.7.25.tar.gz) = 10437
+SHA256 (ailment-8.19.10.30.tar.gz) =
Vxxx4TdNDViLAI3xuAqGLYSpf81b3XQsu+H7EADIRZ0=
+SIZE (ailment-8.19.10.30.tar.gz) = 10574
Index: py-angr/Makefile
===================================================================
RCS file: /cvs/ports/devel/angr/py-angr/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- py-angr/Makefile 26 Oct 2019 12:12:24 -0000 1.3
+++ py-angr/Makefile 5 Nov 2019 20:17:52 -0000
@@ -3,7 +3,6 @@
COMMENT = multi-architecture binary analysis toolkit
ANGR_PYTHON_MODULE = angr
-REVISION = 0
HOMEPAGE = https://angr.io/
Index: py-angr/distinfo
===================================================================
RCS file: /cvs/ports/devel/angr/py-angr/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-angr/distinfo 15 Sep 2019 13:29:50 -0000 1.2
+++ py-angr/distinfo 5 Nov 2019 20:14:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (angr-8.19.7.25.tar.gz) = ih8FDRclY5fVdm69y5z1DIAaXPKP2SdVM4cMOJQmhJ8=
-SIZE (angr-8.19.7.25.tar.gz) = 876657
+SHA256 (angr-8.19.10.30.tar.gz) = KP//UAHNoiQJlQVXGmuQopXRgrhEEerDqOmrmbxTvSU=
+SIZE (angr-8.19.10.30.tar.gz) = 885334
Index: py-angr/patches/patch-angr_knowledge_plugins_functions_function_py
===================================================================
RCS file:
/cvs/ports/devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-angr_knowledge_plugins_functions_function_py
--- py-angr/patches/patch-angr_knowledge_plugins_functions_function_py 15 Sep
2019 13:29:50 -0000 1.2
+++ py-angr/patches/patch-angr_knowledge_plugins_functions_function_py 5 Nov
2019 20:21:02 -0000
@@ -5,7 +5,7 @@ Drop itanium_demangler dependency
Index: angr/knowledge_plugins/functions/function.py
--- angr/knowledge_plugins/functions/function.py.orig
+++ angr/knowledge_plugins/functions/function.py
-@@ -7,8 +7,6 @@ import pickle
+@@ -6,8 +6,6 @@ import itertools
from collections import defaultdict
from typing import Union
@@ -14,7 +14,7 @@ Index: angr/knowledge_plugins/functions/
from cle.backends.symbol import Symbol
from archinfo.arch_arm import get_real_address_if_arm
import claripy
-@@ -1370,10 +1368,12 @@ class Function(Serializable):
+@@ -1272,10 +1270,12 @@ class Function(Serializable):
@property
def demangled_name(self):
Index: py-angr/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/angr/py-angr/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- py-angr/pkg/PLIST 15 Sep 2019 13:29:50 -0000 1.2
+++ py-angr/pkg/PLIST 5 Nov 2019 20:29:34 -0000
@@ -53,7 +53,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}disassembly.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}disassembly_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}dominance_frontier.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}forward_analysis.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}girlscout.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}loop_analysis.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}loopfinder.${MODPY_PYC_MAGIC_TAG}pyc
@@ -149,7 +148,26 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/analyses/disassembly.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/disassembly_utils.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/dominance_frontier.py
-lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/${MODPY_PYCACHE}job_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/job_info.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}call_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}function_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}single_node_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/call_graph.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/function_graph.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/graph.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/loop.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/single_node_graph.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/girlscout.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/identifier/
lib/python${MODPY_VERSION}/site-packages/angr/analyses/identifier/__init__.py
@@ -240,20 +258,24 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}atoms.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}dataset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}def_use.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}definition.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}engine_ail.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}engine_vex.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}external_codeloc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}live_definitions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}reaching_definitions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}undefined.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}uses.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/atoms.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/constants.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/dataset.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/def_use.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/definition.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/engine_ail.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/engine_vex.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/external_codeloc.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/live_definitions.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/reaching_definitions.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/undefined.py
lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/uses.py
@@ -592,9 +614,11 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}function.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}function_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}function_parser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}soot_function.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/function.py
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/function_manager.py
+lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/function_parser.py
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/soot_function.py
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/indirect_jumps.py
lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/labels.py
@@ -818,6 +842,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fputs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fread.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}free.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fscanf.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fseek.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}ftell.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fwrite.${MODPY_PYC_MAGIC_TAG}pyc
@@ -874,6 +899,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fputs.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fread.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/free.py
+lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fscanf.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fseek.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/ftell.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fwrite.py
@@ -1001,6 +1027,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}accept.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}bind.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}bzero.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}close.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}closedir.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}dup.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1041,6 +1068,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}write.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/accept.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/bind.py
+lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/bzero.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/close.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/closedir.py
lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/dup.py
@@ -1259,6 +1287,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}sim_event.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}solver.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}symbolic_memory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}symbolizer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}trace_additions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}uc_manager.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}unicorn_engine.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1306,6 +1335,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/sim_event.py
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/solver.py
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/symbolic_memory.py
+lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/symbolizer.py
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/trace_additions.py
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/uc_manager.py
lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/unicorn_engine.py
Index: py-archinfo/distinfo
===================================================================
RCS file: /cvs/ports/devel/angr/py-archinfo/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-archinfo/distinfo 15 Sep 2019 13:29:50 -0000 1.2
+++ py-archinfo/distinfo 5 Nov 2019 20:14:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (archinfo-8.19.7.25.tar.gz) =
/kfLQ3659F83aOf1mY77bB/NnUfrn+aTRS9+NOKQcDk=
-SIZE (archinfo-8.19.7.25.tar.gz) = 42946
+SHA256 (archinfo-8.19.10.30.tar.gz) =
HPha6T6bh7seewkBo8KOipbDZiOQSPLndzA03XvSQcM=
+SIZE (archinfo-8.19.10.30.tar.gz) = 43824
Index: py-claripy/Makefile
===================================================================
RCS file: /cvs/ports/devel/angr/py-claripy/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- py-claripy/Makefile 23 Jul 2019 19:22:21 -0000 1.1.1.1
+++ py-claripy/Makefile 5 Nov 2019 20:17:59 -0000
@@ -4,8 +4,11 @@ COMMENT = abstraction layer for constra
ANGR_PYTHON_MODULE = claripy
-# See https://github.com/angr/claripy/issues/86 regarding py-z3-solver version.
-RUN_DEPENDS = devel/angr/py-z3-solver<4.6 \
+# tests write here
+PORTHOME = ${WRKDIR}
+
+# See https://github.com/angr/claripy/issues/86 wrt. old py-z3-solver version.
+RUN_DEPENDS = devel/angr/py-z3-solver>=4.8.6.0 \
devel/py-cachetools${MODPY_FLAVOR} \
devel/py-future${MODPY_FLAVOR} \
math/py-pysmt${MODPY_FLAVOR}
Index: py-claripy/distinfo
===================================================================
RCS file: /cvs/ports/devel/angr/py-claripy/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-claripy/distinfo 15 Sep 2019 13:29:50 -0000 1.2
+++ py-claripy/distinfo 5 Nov 2019 20:14:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (claripy-8.19.7.25.tar.gz) =
slCsI8e7hMnLpjvyTaomRr0ry/gW1prqG0smsr1HmLg=
-SIZE (claripy-8.19.7.25.tar.gz) = 119364
+SHA256 (claripy-8.19.10.30.tar.gz) =
s64h5vXloCiGzKpxR31r9jDeS15489cJ/cjsVsDBZRY=
+SIZE (claripy-8.19.10.30.tar.gz) = 121644
Index: py-cle/distinfo
===================================================================
RCS file: /cvs/ports/devel/angr/py-cle/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-cle/distinfo 15 Sep 2019 13:29:50 -0000 1.2
+++ py-cle/distinfo 5 Nov 2019 20:14:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (cle-8.19.7.25.tar.gz) = kDW3md6GyaGfK4A99zIiO+ixqH4WlrRqsd8LhtVoZ9A=
-SIZE (cle-8.19.7.25.tar.gz) = 91800
+SHA256 (cle-8.19.10.30.tar.gz) = 6/3Nd1oauhroqkTxab0PUOgVXT0xTNE3B/40xOVG8Yg=
+SIZE (cle-8.19.10.30.tar.gz) = 92981
Index: py-cle/patches/patch-cle_loader_py
===================================================================
RCS file: /cvs/ports/devel/angr/py-cle/patches/patch-cle_loader_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-cle_loader_py
--- py-cle/patches/patch-cle_loader_py 23 Jul 2019 19:22:21 -0000 1.1.1.1
+++ py-cle/patches/patch-cle_loader_py 5 Nov 2019 20:21:02 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-cle_loader_py,v 1.1.1.1
Index: cle/loader.py
--- cle/loader.py.orig
+++ cle/loader.py
-@@ -894,6 +894,9 @@ class Loader:
+@@ -895,6 +895,9 @@ class Loader:
dirs.extend(self.main_object.extra_load_path)
if sys.platform.startswith('linux'):
dirs.extend(self.main_object.arch.library_search_path())
Index: py-pyvex/Makefile
===================================================================
RCS file: /cvs/ports/devel/angr/py-pyvex/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- py-pyvex/Makefile 26 Oct 2019 12:12:24 -0000 1.2
+++ py-pyvex/Makefile 5 Nov 2019 20:18:23 -0000
@@ -3,7 +3,6 @@
COMMENT = Python interface to libVEX and VEX IR
ANGR_PYTHON_MODULE = pyvex
-REVISION = 0
USE_GMAKE = Yes
CFLAGS += -shared -fPIC -I${LOCALBASE}/include/angr-vex/
Index: py-pyvex/distinfo
===================================================================
RCS file: /cvs/ports/devel/angr/py-pyvex/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- py-pyvex/distinfo 15 Sep 2019 13:29:50 -0000 1.2
+++ py-pyvex/distinfo 5 Nov 2019 20:14:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (pyvex-8.19.7.25.tar.gz) = dGIJ1CN0L8sczvPv8oi7yH9Ljq2AJOiZe9amfe3FMm8=
-SIZE (pyvex-8.19.7.25.tar.gz) = 1727804
+SHA256 (pyvex-8.19.10.30.tar.gz) = Pb1JSHGSZrsfcB85J+YhiCqZnE1GK9bHXRdBil7m2IQ=
+SIZE (pyvex-8.19.10.30.tar.gz) = 1738924
Index: py-z3-solver/Makefile
===================================================================
RCS file: /cvs/ports/devel/angr/py-z3-solver/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- py-z3-solver/Makefile 16 Aug 2019 23:27:09 -0000 1.3
+++ py-z3-solver/Makefile 3 Oct 2019 18:28:51 -0000
@@ -3,9 +3,7 @@
COMMENT = efficient SMT solver library (angr fork)
ANGR_PYTHON_MODULE = z3-solver
-# devel/angr/py-claripy requires this exact version, newer 4.8.5.0 breaks it.
-MODPY_EGG_VERSION = 4.5.1.0.post2
-REVISION = 0
+MODPY_EGG_VERSION = 4.8.6.0
CATEGORIES += math
Index: py-z3-solver/distinfo
===================================================================
RCS file: /cvs/ports/devel/angr/py-z3-solver/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- py-z3-solver/distinfo 23 Jul 2019 19:22:23 -0000 1.1.1.1
+++ py-z3-solver/distinfo 5 Nov 2019 20:14:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (z3-solver-4.5.1.0.post2.tar.gz) =
yALb5TaHQ90w3SpoTBW4OxfDyV31S2b5dhGlmIrg9pY=
-SIZE (z3-solver-4.5.1.0.post2.tar.gz) = 3891600
+SHA256 (z3-solver-4.8.6.0.tar.gz) =
C4+6LnVopC0Xr6R1ti4ykL0vM5fmCA3EQ16ubBGuFbs=
+SIZE (z3-solver-4.8.6.0.tar.gz) = 4198038
Index: py-z3-solver/patches/patch-core_scripts_mk_util_py
===================================================================
RCS file:
/cvs/ports/devel/angr/py-z3-solver/patches/patch-core_scripts_mk_util_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-core_scripts_mk_util_py
--- py-z3-solver/patches/patch-core_scripts_mk_util_py 2 Aug 2019 12:59:51
-0000 1.2
+++ py-z3-solver/patches/patch-core_scripts_mk_util_py 3 Oct 2019 17:45:20
-0000
@@ -5,27 +5,12 @@ Remove hardcoded optimizations.
Index: core/scripts/mk_util.py
--- core/scripts/mk_util.py.orig
+++ core/scripts/mk_util.py
-@@ -2422,9 +2422,9 @@ def mk_config():
+@@ -2538,7 +2538,7 @@ def mk_config():
EXAMP_DEBUG_FLAG = '-g'
+ CPPFLAGS = '%s -DZ3DEBUG -D_DEBUG' % CPPFLAGS
else:
+- CXXFLAGS = '%s -O3' % CXXFLAGS
++ CXXFLAGS = '%s' % CXXFLAGS
if GPROF:
-- CXXFLAGS = '%s -O3 -D _EXTERNAL_RELEASE' % CXXFLAGS
-+ CXXFLAGS = '%s -D _EXTERNAL_RELEASE' % CXXFLAGS
- else:
-- CXXFLAGS = '%s -O3 -D _EXTERNAL_RELEASE
-fomit-frame-pointer' % CXXFLAGS
-+ CXXFLAGS = '%s -D _EXTERNAL_RELEASE -fomit-frame-pointer'
% CXXFLAGS
- if is_CXX_clangpp():
- CXXFLAGS = '%s -Wno-unknown-pragmas -Wno-overloaded-virtual
-Wno-unused-value' % CXXFLAGS
- sysname, _, _, _, machine = os.uname()
-@@ -2457,9 +2457,9 @@ def mk_config():
- SLIBFLAGS = '-shared'
- else:
- raise MKException('Unsupported platform: %s' % sysname)
-+ if sysname[:6] != 'CYGWIN':
-+ CXXFLAGS = '%s -fPIC' % CXXFLAGS
- if is64():
-- if sysname[:6] != 'CYGWIN':
-- CXXFLAGS = '%s -fPIC' % CXXFLAGS
- CPPFLAGS = '%s -D_AMD64_' % CPPFLAGS
- if sysname == 'Linux':
- CPPFLAGS = '%s -D_USE_THREAD_LOCAL' % CPPFLAGS
+ CXXFLAGS += '-fomit-frame-pointer'
+ CPPFLAGS = '%s -DNDEBUG -D_EXTERNAL_RELEASE' % CPPFLAGS
Index: py-z3-solver/patches/patch-core_src_util_lp_permutation_matrix_h
===================================================================
RCS file: py-z3-solver/patches/patch-core_src_util_lp_permutation_matrix_h
diff -N py-z3-solver/patches/patch-core_src_util_lp_permutation_matrix_h
--- py-z3-solver/patches/patch-core_src_util_lp_permutation_matrix_h 16 Aug
2019 23:27:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-core_src_util_lp_permutation_matrix_h,v 1.1 2019/08/16
23:27:09 cwen Exp $
-
-Unbreak with ports-gcc, from upstream:
-https://github.com/Z3Prover/z3/commit/2d5dd802386d78117d5ed9ddcbf8bc22ab3cb461
-
-Index: core/src/util/lp/permutation_matrix.h
---- core/src/util/lp/permutation_matrix.h.orig
-+++ core/src/util/lp/permutation_matrix.h
-@@ -117,7 +117,7 @@ class permutation_matrix : public tail_matrix<T, X> {
-
- unsigned size() const { return static_cast<unsigned>(m_rev.size()); }
-
-- unsigned * values() const { return m_permutation; }
-+ unsigned * values() const { return m_permutation.c_ptr(); }
-
- void resize(unsigned size) {
- unsigned old_size = m_permutation.size();
Index: py-z3-solver/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/angr/py-z3-solver/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- py-z3-solver/pkg/PLIST 23 Jul 2019 19:22:23 -0000 1.1.1.1
+++ py-z3-solver/pkg/PLIST 3 Oct 2019 18:07:32 -0000
@@ -15,16 +15,33 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/z3/${MODPY_PYCACHE}z3types.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/z3/${MODPY_PYCACHE}z3util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/z3/include/
-lib/python${MODPY_VERSION}/site-packages/z3/include/c++/
-lib/python${MODPY_VERSION}/site-packages/z3/include/c++/z3++.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_ast_map.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_ast_vector.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_context.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_datalog.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_goal.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_log_macros.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_model.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_polynomial.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_solver.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_stats.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_tactic.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_util.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3++.h
lib/python${MODPY_VERSION}/site-packages/z3/include/z3.h
lib/python${MODPY_VERSION}/site-packages/z3/include/z3_algebraic.h
lib/python${MODPY_VERSION}/site-packages/z3/include/z3_api.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_ast_containers.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_fixedpoint.h
lib/python${MODPY_VERSION}/site-packages/z3/include/z3_fpa.h
-lib/python${MODPY_VERSION}/site-packages/z3/include/z3_interp.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_logger.h
lib/python${MODPY_VERSION}/site-packages/z3/include/z3_macros.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_optimization.h
lib/python${MODPY_VERSION}/site-packages/z3/include/z3_polynomial.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_private.h
lib/python${MODPY_VERSION}/site-packages/z3/include/z3_rcf.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_replayer.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_spacer.h
lib/python${MODPY_VERSION}/site-packages/z3/include/z3_v1.h
lib/python${MODPY_VERSION}/site-packages/z3/lib/
lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so
