From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SMgACC8U7mVXTgEA62LTzQ:P1 (envelope-from ) for ; Sun, 10 Mar 2024 21:12:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id SMgACC8U7mVXTgEA62LTzQ (envelope-from ) for ; Sun, 10 Mar 2024 21:12:31 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=Ulj9YFdO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=soeren-tempel.net (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710101551; a=rsa-sha256; cv=none; b=Q5WXCcoTUFDBq+pTl/KwcSB6kFRopboiO3n+5cduPRS0LLGzyjOuGCMwwZCkqX9OfysQ+T suAoDvvwXSp3C2Cg3BfxnvZsLdOv2osTZHtET7YozsAkZwvOxwQtE/fQKjbm78M7tFaSp9 QwTIY/hO4r8U7i4L+6tev4Saiua2slonz/S0PBdTeqMpC5TwoKkSsb+3o4oSEfkFvjs6VU PPkyXM4b2gsG08OEQHhq+ocnxL9EpS1A4leaSNnPoksOrxcnKdfwUboBzWcd2tWt7EtT7+ vCADh1/E4+NplTyO0aU7v6mTkB1Us5bAs82pw/Q5q9cmnslZDrWPzD7yGJ9c/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=soeren-tempel.net header.s=opensmtpd header.b=Ulj9YFdO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=soeren-tempel.net (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710101551; 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=3Z6lFlwU8cmjIskxhGQjM9ThKc3JV7WheOThiuzam5Y=; b=WfYkRG5jV1VOWvewl5QWBZYht0LdUi3ZbARcgHIGN8MRqqgBw5rPFLmqkfu3VyETKYN3Ls QHoT+vQVNM0POnZ1iW/1g6B01KC2L9XiV2jYe5QyENxvmuUrCDPvcjUHFSJ2T9fIKygf/G wRq8eGZMlb31hG2IZADdmeGk7MM6Ik4mlGfS0rXFTHOgiqlM9aXxWwHdoJdyp4Tu24nktz Fzolnaf1ABSnGVJ2LlJGxgEKqMnmyFbOGgt1aV09+Fvc0K3Cx9GeQCtN82fOpDEOflEEVF gm5yab39JaYksRYOA3yaoXFlkJIWISTpsfECH2X6lh/ocTrN+dv9ecOhhzSPTg== 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 D8B53731A4 for ; Sun, 10 Mar 2024 21:12:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjPWR-0003WV-GA; Sun, 10 Mar 2024 16:11:51 -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 1rjPWJ-0003Up-Lr for guix-patches@gnu.org; Sun, 10 Mar 2024 16:11: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 1rjPWJ-0002Qj-Ca; Sun, 10 Mar 2024 16:11:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rjPWf-0003jN-UO; Sun, 10 Mar 2024 16:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH v2 09/14] gnu: Add python-pyvex. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Sun, 10 Mar 2024 20:12:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@debbugs.gnu.org Cc: troy@troyfigiel.com, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 69074-submit@debbugs.gnu.org id=B69074.171010150014222 (code B ref 69074); Sun, 10 Mar 2024 20:12:05 +0000 Received: (at 69074) by debbugs.gnu.org; 10 Mar 2024 20:11:40 +0000 Received: from localhost ([127.0.0.1]:37972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjPWF-0003hD-Nz for submit@debbugs.gnu.org; Sun, 10 Mar 2024 16:11:40 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:44758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjPVw-0003eq-TS; Sun, 10 Mar 2024 16:11:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=3Z6lFlwU 8cmjIskxhGQjM9ThKc3JV7WheOThiuzam5Y=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=Ulj9YFdONg2emNdejzJIVfzjEhx c3Y6W67xmpdBAXvl30QkGel/X8YSB9VDkOQTi/pKAnQc5nF+80NCKssbd31pCe8fxwAcD6 GhOOfGJTlc1XiWQGNrmwbxmATdYAHydeU/TBl8nCZc+ZRE7hRykKgD1/Ol6rtGPqeAt/O1 gw7E= Received: from localhost (dynamic-2a02-3102-49da-001b-9766-31d2-bfd2-3d82.310.pool.telefonica.de [2a02:3102:49da:1b:9766:31d2:bfd2:3d82]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 0eccef06 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 10 Mar 2024 21:10:42 +0100 (CET) From: soeren@soeren-tempel.net Date: Sun, 10 Mar 2024 21:09:29 +0100 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: <19ef0993fd8891d02402943609f70de73e0b233a.1710101374.git.soeren@soeren-tempel.net> References: <19ef0993fd8891d02402943609f70de73e0b233a.1710101374.git.soeren@soeren-tempel.net> 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 3.72 X-Spam-Score: 3.72 X-Migadu-Queue-Id: D8B53731A4 X-TUID: DU08OFG3XSBq From: Sören Tempel * gnu/packages/patches/python-pyvex-remove-angr-dependency.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python-xyz.scm (python-pyvex): New variable. --- gnu/local.mk | 1 + .../python-pyvex-remove-angr-dependency.patch | 80 +++++++++++++++++++ gnu/packages/python-xyz.scm | 37 +++++++++ 3 files changed, 118 insertions(+) create mode 100644 gnu/packages/patches/python-pyvex-remove-angr-dependency.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1946fdcbb6..ecbae4bb53 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1930,6 +1930,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-runpath.patch \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-1.9.0-system-libraries.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 new file mode 100644 index 0000000000..dccf22bbc6 --- /dev/null +++ b/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch @@ -0,0 +1,80 @@ +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 58a6855850..392df37f2b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -189,6 +189,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages djvu) #:use-module (gnu packages docker) #:use-module (gnu packages documentation) + #:use-module (gnu packages emulators) #:use-module (gnu packages enchant) #:use-module (gnu packages file) #:use-module (gnu packages fonts) @@ -32303,6 +32304,42 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-pyvex + (package + (name "python-pyvex") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (patches (search-patches "python-pyvex-remove-angr-dependency.patch")) + (uri (pypi-uri "pyvex" version)) + (sha256 + (base32 "1v64rn7gxy6fg065bgsy38z6r494k5ri5r6sn4g08hjj32ihx1ka")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest"))))) + + (add-before 'build 'set-cc-native + (lambda _ + (setenv "CC" #$(cc-for-target)) + (setenv "CC_NATIVE" "gcc")))))) + (propagated-inputs (list python-archinfo python-bitstring python-cffi)) + (home-page "https://github.com/angr/pyvex") + (synopsis "Python interface to libVEX and VEX IR") + (description + "This package provides a Python interface the libVEX and VEX IR. +VEX is the intermediate representation (also known as intermediate +language) used by the Valgrind analysis tool. As such, VEX is designed +to enable all kinds of binary analysis tasks.") + (license license:bsd-2))) + (define-public python-claripy (package (name "python-claripy")