From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id INLoKePxqWZvPAAAe85BDQ:P1 (envelope-from ) for ; Wed, 31 Jul 2024 08:12:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id INLoKePxqWZvPAAAe85BDQ (envelope-from ) for ; Wed, 31 Jul 2024 10:12:19 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=j5JT9RbF; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=uI5Ljf0g; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=soeren-tempel.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722413539; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=lQMIARqS7NYLvQ1D3J3q8H0z61LHKFq2tB8HnNrAWf4=; b=PE6Z5+j3cHjPbX/1Gsui66yZl+wqfbqXT6Jz+ZIeYNDJCoyE+BGLb1g/l3+NW+8qdtCD9p EILDfG5ndLt6gtITnKofUnIwsn8eRsOpO2F1yrI8KsLw5V4hJT96MAI3XtJWrh6uNhJRXB NyutY7FBHqwgCVPUSLVRHG1B3P0iarwXVpTzokHRzHXR+P6pTDToskAHWACYQ4xMz7q1Iv pRP2cA91pMwCzVd/GeIdMuQgcuGjmyGJT1wfn/kxiO9HG2VIIGo7T4zY+UaNF9WC1biBB+ MvEkFjlswrhlLbB//L6u97aUd8u1cKBUZTBE2EXks6Z9yjC9Qv/Hh6jE9dvevA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=j5JT9RbF; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=uI5Ljf0g; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=soeren-tempel.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722413539; a=rsa-sha256; cv=none; b=TYw6+rxz+oj8WTWQTpMY+MNmiwY/EpHEYdfzg0CDJqcg+5YAGgsLCGc7DzM3UY5Zv/ue0h KMUzwGOw27LPE/BXd/xZzlNBgBVbNfWzLAJ4sBlVdFy23+J3GLWa1ZHOY0kjOF3cX1JtXO 1D6g3AiH/OYOY8XXB/Wyst+71FVsYGQfkwNsIGXFV6mdrI7FYNW0lSpOLEgY8Kl+sqEUQm 71s0PLdP3D1S/evJ9tTlVupg126Ncrv/BRSz9VL6aFxHXESseTK38z8YRKwo4YFw23P2Om qPA/mhWRg4KKP+9fCLIZYUeFKuF1G1sZgwWmVEGAkh/mRBUFb4RJFf5jPGrAnw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4BED6ED87 for ; Wed, 31 Jul 2024 10:12:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sZ4RD-0002nJ-8j; Wed, 31 Jul 2024 04:11:59 -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 1sZ4RB-0002n1-Qq for guix-patches@gnu.org; Wed, 31 Jul 2024 04:11:58 -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 1sZ4RB-0006Pi-28; Wed, 31 Jul 2024 04:11:57 -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=lQMIARqS7NYLvQ1D3J3q8H0z61LHKFq2tB8HnNrAWf4=; b=j5JT9RbFM0MiQJ20JUZVjoOktsiPbwN4WX5VwEg0AK49Ojj0dsBP+L7K23QJ2aOaLznDn6Rn3XIdozMm8jzoYMRVgmDGV6bxHx8Z7y4ESUpwcm4jjgJTfJ6VHyFL9Uim/lSbLl8y857mQHEy7Ocey6lpXqH6eapJNlVo5XrZ0LUuVM/dV/07b2FbgL6mz8ws9Xk9gy5wjHO0TfHbn8mAFqC/MiBbPHJX8RNur+6lzq266e7CBCyz8HZ3Nt/vEoOCxxzLU0kjD2OzSLJBAddgQJzLvontvCENL4QOMdKtKVcF43clJyQyy5xzGWKBb+E4DDJQNlSKYoP0yvzNbMwdfA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sZ4RH-0000Qm-9r; Wed, 31 Jul 2024 04:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH 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: Wed, 31 Jul 2024 08:12:03 +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: 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.17224135221637 (code B ref 72393); Wed, 31 Jul 2024 08:12:03 +0000 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:02 +0000 Received: from localhost ([127.0.0.1]:48993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RF-0000QA-3k for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:01 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:16899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RD-0000Pw-5b; Wed, 31 Jul 2024 04:12:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=lQMIARqS 7NYLvQ1D3J3q8H0z61LHKFq2tB8HnNrAWf4=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=uI5Ljf0gWL240uBFz/qloUrDtgx86L 7PqlHYG9vmi2ozGdZ3G6rsAtPRqc9p1SDwJG4WCkNpnnEr84HABQ9OLb660ybIj/a8XnfD WgzH/4aiOaKiGKAESUPBCFhaAOrmrN9E0FCnWBzIW4qd8AYlVEKuNyb6aAKXIXVLBrsep9 A= Received: from localhost (dynamic-176-005-136-001.176.5.pool.telefonica.de [176.5.136.1]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id dd07b41e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:37 +0200 (CEST) From: soeren@soeren-tempel.net Date: Wed, 31 Jul 2024 10:11:22 +0200 Message-ID: <6922b1905f3822b69453fdad73d8507337580af4.1722412559.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -4.46 X-Migadu-Queue-Id: 4BED6ED87 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -4.46 X-TUID: adskdzFegUQc 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 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