From patchwork Fri Sep 27 18:34:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31520 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 67C7027BBE2; Fri, 27 Sep 2024 19:37:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4EBE027BBEA for ; Fri, 27 Sep 2024 19:37:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpm-0005cG-Dd; Fri, 27 Sep 2024 14:36:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpa-0004vq-4j for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:44 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpZ-0001uA-RU; Fri, 27 Sep 2024 14:36:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=g2lAWOMvHeOEKkVpPNLpqtZqsnzQdls5U5wK8MLq0HU=; b=IlwQaB5nrLoh2LZ9K1/qE/QeTJs4OyJsP3Aq8o2hE7Tmwz9paO4q6/IvnjgghHR1p391swcvuIRIvMXKBrl2G2aedTStRw3pMi/X4M/cYP1yzVptkxolR+pqQ1pItEn5xrg0uEQz1ufjx6zYrVinxyyaK2eUi8y+fxLOEoYAarxqyhbPANxdfWAyC8/cETV+JkbBhLveoJdppXrygle4E5fzgKhSS5dv4f/rn0lzj4WDRla/wv7b4uyGqezBTZh7PIEyQX+iNUUqtus62l3brp6rypbRGDZ2Fwkpb8FRh0owSXx3hnF4j81hX4rtzp6juAVdpIPBNsHOv7WgEp7o1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpu-0007a6-Im; Fri, 27 Sep 2024 14:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 02/10] gnu: python-pyvex: Update to 9.2.112. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217028948 (code B ref 72393); Fri, 27 Sep 2024 18:37:02 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:10 +0000 Received: from localhost ([127.0.0.1]:47141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp3-0007Wg-44 for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:10 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFow-0007VD-1L; Fri, 27 Sep 2024 14:36:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=g2lAWOMv HeOEKkVpPNLpqtZqsnzQdls5U5wK8MLq0HU=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=OQzcl/kt0+pp7SgReSQlOJ0gy/P zG3c6lmdP5DZWPvMhaLLwOKCQ0e/wIamBPfGRHJOwryIGfQRaeODjczY5hrBzw1F4Erb3v vaNjZsG+hD8mAYigyWoDwVSIEgG0AZPDOQ/7QvrNUzOhgfXWPj6LHQ0ug8qvu+9hlhc/Ji 3u9U= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 65c3c681 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:27 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:34:55 +0200 Message-ID: X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * 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 c2027f9eeb..669a65dfd6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2039,7 +2039,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 45fcaa63f4..3cf0701e06 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34113,14 +34113,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