From: soeren@soeren-tempel.net
To: 72393@debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@6xq.net>, Marius Bakke <marius@gnu.org>,
Munyoki Kilyungi <me@bonfacemunyoki.com>,
Sharlatan Hellseher <sharlatanus@gmail.com>,
Tanguy Le Carrour <tanguy@bioneland.org>,
jgart <jgart@dismail.de>
Subject: [bug#72393] [PATCH 02/10] gnu: python-pyvex: Update to 9.2.112.
Date: Wed, 31 Jul 2024 10:11:22 +0200 [thread overview]
Message-ID: <6922b1905f3822b69453fdad73d8507337580af4.1722412559.git.soeren@soeren-tempel.net> (raw)
In-Reply-To: <cover.1722412559.git.soeren@soeren-tempel.net>
From: Sören Tempel <soeren@soeren-tempel.net>
* gnu/packages/python-xyz.scm (python-pyvex): Update to 9.2.112.
* gnu/packages/patches/python-pyvex-remove-angr-dependency.patch:
Remove patch (merged upstream and included in new release).
---
gnu/local.mk | 1 -
.../python-pyvex-remove-angr-dependency.patch | 80 -------------------
gnu/packages/python-xyz.scm | 5 +-
3 files changed, 2 insertions(+), 84 deletions(-)
delete mode 100644 gnu/packages/patches/python-pyvex-remove-angr-dependency.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6d2b14e72d..8b00928141 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1980,7 +1980,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-pytorch-runpath.patch \
%D%/packages/patches/python-pytorch-system-libraries.patch \
%D%/packages/patches/python-pytorch-without-kineto.patch \
- %D%/packages/patches/python-pyvex-remove-angr-dependency.patch \
%D%/packages/patches/python-robotframework-atest.patch \
%D%/packages/patches/python-robotframework-source-date-epoch.patch \
%D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \
diff --git a/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch b/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch
deleted file mode 100644
index dccf22bbc6..0000000000
--- a/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-This patch removes the angr dependency from the pyvex these, thus
-resolving a circular dependency (as angr depends on pyvex). This
-patch has been taken from upstream.
-
-This patch is a squashed version of the following upstream patches:
-
-* https://github.com/angr/pyvex/commit/61fb26f223a8d8a276b702d2448a12e02c5c9c6b
-* https://github.com/angr/pyvex/commit/a1fb2a4d0826b0e43bd8bbdd00b6db032643ec95
-
-diff --git a/tests/test_spotter.py b/tests/test_spotter.py
-index 9271ccd..bed7dd4 100644
---- a/tests/test_spotter.py
-+++ b/tests/test_spotter.py
-@@ -1,6 +1,5 @@
- import os
-
--import angr
- import archinfo
-
- import pyvex
-@@ -98,53 +97,28 @@ class CortexSpotter(GymratLifter):
- register(CortexSpotter, "ARMEL")
-
-
--def test_full_binary():
-- p = angr.Project(
-- os.path.join(test_location, "armel", "RTOSDemo.axf.issue_685"),
-- arch="ARMEL",
-- auto_load_libs=False,
-- )
-- st = p.factory.call_state(0x000013CE + 1)
-- b = st.block().vex
-- simgr = p.factory.simulation_manager(st)
-- simgr.step()
-- assert b.jumpkind == "Ijk_Sys_syscall"
-- assert simgr.active[0].regs.ip_at_syscall.args[0] == 0x13FB
--
--
- def test_tmrs():
-- test_location = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../binaries/tests"))
-- p = angr.Project(
-- os.path.join(test_location, "armel", "helloworld"),
-- arch="ARMEL",
-- auto_load_libs=False,
-- )
-+ arch = archinfo.arch_from_id("ARMEL")
- ins = b"\xef\xf3\x08\x82"
-- b = pyvex.block.IRSB(ins, 1, p.arch)
-+ b = pyvex.block.IRSB(ins, 1, arch)
- assert b.jumpkind == "Ijk_Boring"
- assert type(b.statements[1].data) == pyvex.expr.Get
-- assert p.arch.register_names.get(b.statements[1].data.offset, "") == "sp"
-+ assert arch.register_names.get(b.statements[1].data.offset, "") == "sp"
- assert type(b.statements[2]) == pyvex.stmt.Put
-
-
- def test_tmsr():
-- test_location = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../binaries/tests"))
-- p = angr.Project(
-- os.path.join(test_location, "armel", "helloworld"),
-- arch="ARMEL",
-- auto_load_libs=False,
-- )
-+ arch = archinfo.arch_from_id("ARMEL")
- inss = b"\x82\xf3\x08\x88"
-- b = pyvex.block.IRSB(inss, 1, p.arch, opt_level=3)
-+ b = pyvex.block.IRSB(inss, 1, arch, opt_level=3)
- assert b.jumpkind == "Ijk_Boring"
- assert type(b.statements[1].data) == pyvex.expr.Get
-- assert p.arch.register_names.get(b.statements[1].data.offset, "") == "r2"
-+ assert arch.register_names.get(b.statements[1].data.offset, "") == "r2"
- assert type(b.statements[2]) == pyvex.stmt.Put
-
-
- if __name__ == "__main__":
- test_basic()
- test_embedded()
-- test_full_binary()
- test_tmrs()
- test_tmsr()
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a051fc02db..081801e97d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -34031,14 +34031,13 @@ (define-public python-pyvex
(package
(name "python-pyvex")
;; Must be the same version as python-angr.
- (version "9.2.46")
+ (version "9.2.112")
(source
(origin
(method url-fetch)
- (patches (search-patches "python-pyvex-remove-angr-dependency.patch"))
(uri (pypi-uri "pyvex" version))
(sha256
- (base32 "1v64rn7gxy6fg065bgsy38z6r494k5ri5r6sn4g08hjj32ihx1ka"))))
+ (base32 "0z1jiflp7h07mfc26am3v7v5z2n6mw9hkfylbs86qgpm93qcf6i3"))))
(build-system pyproject-build-system)
(arguments
(list
next prev parent reply other threads:[~2024-07-31 8:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-31 7:59 [bug#72393] [PATCH 00/10] gnu: python-angr: Update to 9.2.112 soeren
2024-07-31 8:11 ` [bug#72393] [PATCH 01/10] gnu: python-ailment: " soeren
2024-07-31 8:11 ` soeren [this message]
2024-07-31 8:11 ` [bug#72393] [PATCH 03/10] gnu: Add python-backports-strenum soeren
2024-07-31 8:11 ` [bug#72393] [PATCH 04/10] gnu: python-archinfo: Update to 9.2.112 soeren
2024-07-31 8:11 ` [bug#72393] [PATCH 05/10] gnu: Add python-cart soeren
2024-07-31 8:11 ` [bug#72393] [PATCH 06/10] gnu: python-cle: Update to 9.2.112 soeren
2024-07-31 8:11 ` [bug#72393] [PATCH 07/10] gnu: python-claripy: " soeren
2024-07-31 8:11 ` [bug#72393] [PATCH 08/10] gnu: Add python-pyformlang soeren
2024-07-31 8:11 ` [bug#72393] [PATCH 09/10] gnu: Add python-unique-log-filter soeren
2024-07-31 8:11 ` [bug#72393] [PATCH 10/10] gnu: python-angr: Update to 9.2.112 soeren
2024-09-15 10:26 ` [bug#72393] [PATCH 00/10] " Sören Tempel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6922b1905f3822b69453fdad73d8507337580af4.1722412559.git.soeren@soeren-tempel.net \
--to=soeren@soeren-tempel.net \
--cc=72393@debbugs.gnu.org \
--cc=jgart@dismail.de \
--cc=lars@6xq.net \
--cc=marius@gnu.org \
--cc=me@bonfacemunyoki.com \
--cc=sharlatanus@gmail.com \
--cc=tanguy@bioneland.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).