From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:00:58 2024 Received: (at submit) by debbugs.gnu.org; 31 Jul 2024 08:00:58 +0000 Received: from localhost ([127.0.0.1]:48981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4GX-00009N-I4 for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:00:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:52162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4GU-00009E-UC for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:00:56 -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 1sZ4GC-00010g-Nf for guix-patches@gnu.org; Wed, 31 Jul 2024 04:00:38 -0400 Received: from magnesium.8pit.net ([2001:19f0:6c01:4ae:5400:ff:fe66:af9d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sZ4Fu-0004LS-DL; Wed, 31 Jul 2024 04:00:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=DSRmk4U2 ECe4RCo9/axV8wQ3AXT/lS+Y6X1bkOsgcOk=; h=date:subject:to:from; d=soeren-tempel.net; b=hSnp9ypwf/zwWvG/qDR2VckOSz+gX1WIulqpZVRNUltWcj8 aSF8bHJLJOUTgTHVgq3iVzgWE2ZURw4Ma3+IfAK+oWdBZR0MKxPYyygERUMu2m0Nq4L33I /xE0zTqX0Uh3Bu2qBteWU99CCMUu4m5QTkuy+g6lSFzaaFg6+lGBK4= 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 ce829ca6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:00:08 +0200 (CEST) From: soeren@soeren-tempel.net To: guix-patches@gnu.org Subject: [PATCH 00/10] gnu: python-angr: Update to 9.2.112. Date: Wed, 31 Jul 2024 09:59:23 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:19f0:6c01:4ae:5400:ff:fe66:af9d; envelope-from=soeren@soeren-tempel.net; helo=magnesium.8pit.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: Sören Tempel This patchset upgrades the angr package (previously added via #69074 by myself) to the most recent version at the time of writing (9.2.112). As part of the upgrade, four new dependencies have been added which are required by the newer version (python-backports-strenum, python-cart, python-pyformlang, and python-unique-log-filter). Additionally, two patches were removed as they have been integrated upstream. The angr test suite passes locally and angr still seems to work as intended. However, due to the added pyformlang dependency angr now depends (indirectly) on two different versions of python-pyparsing: Version 2.4.7 via python-pydot (required by pyformlang) and version 3.0.6 required by python-packaging-bootstrap. Any suggestion on how to best resolve that? Sören Tempel (10): gnu: python-ailment: Update to 9.2.112. gnu: python-pyvex: Update to 9.2.112. gnu: Add python-backports-strenum. gnu: python-archinfo: Update to 9.2.112. gnu: Add python-cart. gnu: python-cle: Update to 9.2.112. gnu: python-claripy: Update to 9.2.112. gnu: Add python-pyformlang. gnu: Add python-unique-log-filter. gnu: python-angr: Update to 9.2.112. gnu/local.mk | 2 - gnu/packages/emulators.scm | 40 +++++- .../python-angr-addition-type-error.patch | 18 --- .../patches/python-angr-check-exec-deps.patch | 83 ++++++----- .../python-pyvex-remove-angr-dependency.patch | 80 ----------- gnu/packages/python-xyz.scm | 130 +++++++++++++++--- 6 files changed, 186 insertions(+), 167 deletions(-) delete mode 100644 gnu/packages/patches/python-angr-addition-type-error.patch delete mode 100644 gnu/packages/patches/python-pyvex-remove-angr-dependency.patch base-commit: 01d4363168ed10ea223047f7a7b83201f161ec0b From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:01 2024 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 To: 72393@debbugs.gnu.org Subject: [PATCH 02/10] gnu: python-pyvex: Update to 9.2.112. 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 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:07 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:07 +0000 Received: from localhost ([127.0.0.1]:49005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RL-0000RR-0W for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:07 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:21577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RC-0000Pt-R4; Wed, 31 Jul 2024 04:12:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=ecjH5Ruw QyBq/abv3VN0vqParKn1dRNf95j4twPsgDs=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=jzgHPww4VZOMbad7Fwz3zUrtOT1hgk sYm+05MTg7/+zlPBWU4hZJz4wnnTSJaVyVf3M++a2YPA9p1lMg8pxmT7OyPxV8hKYLzGgg mWnj1aHRRpnOMm0fgdIF8i55VYAWPAKuKJJ8eMREe6gdTeziJQdr20SLHlUG+AUKeCDsYN 0= 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 d39a2677 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:36 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 01/10] gnu: python-ailment: Update to 9.2.112. Date: Wed, 31 Jul 2024 10:11:21 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-ailment): Update to 9.2.112. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ce33b330a3..a051fc02db 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33977,13 +33977,13 @@ (define-public python-ailment (package (name "python-ailment") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "ailment" version)) (sha256 - (base32 "073fcssbjis1ckwv2w0dcz2dfl6715bj4d4qdhspajj911mvng2f")))) + (base32 "1rv8rwvdm7fc9mf8z5hqb54dsj0n7jlnwghd12ll0b2jmh2ix8mn")))) (build-system pyproject-build-system) (arguments `(#:phases (modify-phases %standard-phases From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:07 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:07 +0000 Received: from localhost ([127.0.0.1]:49007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RL-0000RT-Am for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:07 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:16899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RE-0000Pw-LZ; Wed, 31 Jul 2024 04:12:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=m2JbuNBE Mn2C7g5mlMkC66AR+e6AEelJwVsrh3JkLMw=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=m4EZHw+rt8ezzJkI8saH/qkPmXoqId Fq38xFQz5MhSPk9L52huqoJRqhZ5dZCWzIyGdzbStQdEHEOwmtS1Lls/U/YHpAvuS3Uxzk j4VB1DlRurBdjKi/WSzXruzaQidvbBYUuzg9ETKiDQwV7MHPTPY1aHZvWYNoPUDpO9OmB/ 0= 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 5115c894 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:38 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 03/10] gnu: Add python-backports-strenum. Date: Wed, 31 Jul 2024 10:11:23 +0200 Message-ID: <7d4d16c118c1e8e07d3ad626dae6bf0fab825fe1.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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-backports-strenum): New variable. --- gnu/packages/emulators.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index d2e488864e..dca6c7b73a 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -95,6 +95,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) @@ -2645,6 +2646,30 @@ (define-public python-keystone-engine assembly for these architectures.") (license license:gpl2))) +;; can be removed once Guix upgrades to Python 3.11. +(define-public python-backports-strenum + (package + (name "python-backports-strenum") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "backports_strenum" version)) + (sha256 + (base32 "0514yj1391k6pbs2cch6i57hidwb3236wngh2ivlk6186h3j9ibp")))) + (native-inputs (list python-poetry-core)) + (build-system pyproject-build-system) + ;; TODO: Running tests requires a new version of poetry in Guix. + (arguments + (list + #:tests? #f)) + (home-page "https://github.com/clbarnes/backports.strenum") + (synopsis "Backport of additions to the 'strenum' module") + (description + "Provides a backport of Python's @code{StrEnum} class which was introduced in +Python 3.11 for Python >=3.8.6.") + (license license:expat))) + (define-public python-archinfo (package (name "python-archinfo") From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:08 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:08 +0000 Received: from localhost ([127.0.0.1]:49009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RL-0000Rb-M8 for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:07 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:21577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RF-0000Pt-01; Wed, 31 Jul 2024 04:12:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=N64Hnby4 VElkTSXhwIFHcWXm7ujtcQHyl6+bomilknM=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=YOEr0103VKQNxzoq0oQZk5XgcBAFWr 51zsnKfgO0aaqSIt5VplOmW73RqJ9pU50EVavPVqidyOCN8MiCk7X4pI+8b5ZW361z8hk/ zHphioUeluwkkAEnsAV8ZKL5AuX7y9AtZ59RC0QkbfPc5GBDmnZ3KhM9gcckPyl/9aLWhE c= 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 bd0a3728 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:39 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 04/10] gnu: python-archinfo: Update to 9.2.112. Date: Wed, 31 Jul 2024 10:11:24 +0200 Message-ID: <56048aa2428f37b1847734de26f3327f0d16fdda.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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/emulators.scm (python-archinfo): Update to 9.2.112. [propagated-inputs]: Add python-backports-strenum. --- gnu/packages/emulators.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index dca6c7b73a..b19376a4c6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2674,17 +2674,26 @@ (define-public python-archinfo (package (name "python-archinfo") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "archinfo" version)) (sha256 - (base32 "037xfq3wcf8ngayxz9623l4646m780v2102mfbygpzbkkjha1966")))) + (base32 "011n9vrrsbqbnw2i38ls7f0xkd85kxcnn14fm4lhxjpi91p7hshb")))) (build-system pyproject-build-system) - (propagated-inputs (list python-capstone python-keystone-engine)) + (propagated-inputs + (list + python-backports-strenum + python-capstone + python-keystone-engine)) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "setup.cfg" + (("backports.strenum") + "backports_strenum")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:08 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:08 +0000 Received: from localhost ([127.0.0.1]:49012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RM-0000Rk-0q for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:08 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:16899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RF-0000Pw-TP; Wed, 31 Jul 2024 04:12:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=MBjikXVi 6ppdCWzvROmh3LbIFFynPhLVmJO0UqwYE/4=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=KO2IMLQGQ+eBHx+j8zGbz8G4xzKSRQ uTaCrebuWyexbxv9tMdRFnLqnVvc1M4BSvP6EI2Ibv3aHISI9pzNESDOT9qZ9lRA+VC86E EbYCODA6jdUEL/JkavsSyrYffFudsVUkQoyOENgd88QipSN6Q7XCIVnZ2Ie6Ls4zYgDtBT Q= 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 7177c810 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:40 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 05/10] gnu: Add python-cart. Date: Wed, 31 Jul 2024 10:11:25 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-cart): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 081801e97d..cc7d45e6fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33973,6 +33973,36 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-cart + (package + (name "python-cart") + (version "1.2.2") + (source + (origin + ;; No source releases available on pypi, hence fetching from GitHub. + (method git-fetch) + (uri (git-reference + (url "https://github.com/CybercentreCanada/cart") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zycv620iljrsval5rai1wsn0hr25ddx9xhjsyy6xxrgprfxvlfi")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" "discover"))))))) + (propagated-inputs (list python-pycryptodome)) + (home-page "https://github.com/CybercentreCanada/cart") + (synopsis "Library for interacting with the CaRT file format") + (description + "This Python library implements the CaRT file format which is commonly +used to store and transmit information about computer malware and associated +metadata.") + (license license:bsd-2))) + (define-public python-ailment (package (name "python-ailment") From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:08 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:08 +0000 Received: from localhost ([127.0.0.1]:49014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RM-0000Rq-BP for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:08 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:21577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RG-0000Pt-Bh; Wed, 31 Jul 2024 04:12:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=fB0v16c2 mwFDI1f8NuOSsMfCNd5axgigHLhGPoIB7tI=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=zEnySXGQirsQ91WWyez3T4jY6iTCEZ miarPQZIA1Y0oSbmDdVjSlFRpo3zDv2XxgI15wGie/+IphT1udJLNm28b/cmZnjnBoPmtv dxVDg/HxRtb9MCUGhHCjRqF3v25jUbg5oH8DLCcqqyToMyqL1sumCAdTYdzNssERk/Z9fR 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 064c68f9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:41 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 06/10] gnu: python-cle: Update to 9.2.112. Date: Wed, 31 Jul 2024 10:11:26 +0200 Message-ID: <2f4ea5d06486ba2ae5769aeb68d6debe12d15570.1722412559.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-cle): Update to 9.2.112. [propagated-inputs]: Add python-cart. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cc7d45e6fa..953a9ac018 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34035,19 +34035,19 @@ (define-public python-cle (package (name "python-cle") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "cle" version)) (sha256 - (base32 "0mswv9gd2p2ws7zfsshqv5ybbj27wkdwakdcknq4vsrx9ry9k4yc")))) + (base32 "11jbvg12wqxz74iy83ax0q8k156xrw6iqv75dix5cpqgacds3gdj")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) (propagated-inputs (list python-pefile python-pyelftools python-pyvex - python-sortedcontainers)) + python-sortedcontainers python-cart)) (native-inputs (list python-cffi)) (home-page "https://github.com/angr/cle") (synopsis "Python loader for binaries and their associated libraries") From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:08 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:09 +0000 Received: from localhost ([127.0.0.1]:49017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RM-0000Rz-Lu for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:08 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:16899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RH-0000Pw-6e; Wed, 31 Jul 2024 04:12:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=yNIZY7Kr 4mC/sQvAO2RnZZcIoKB9VzLIpanRlusPvxI=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=MVhxxmVoCCFAhIsYrLKotMPxw1RZKa 3/hr54qSIOHIffqkYBGmx3GYOifC6s0DHteX6rEuh6gZM6+kZMWvnRAAKIbIofNtFWgZ02 XiGzaHWWYW7vcOoljEQWrKKgH4RtQaiz2p+iZLIb0TY1H5+AvrVHE6W+b2beGys0TATXYW Y= 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 2946995e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:41 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 07/10] gnu: python-claripy: Update to 9.2.112. Date: Wed, 31 Jul 2024 10:11:27 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-claripy): Update to 9.2.112. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 953a9ac018..eefb3f2449 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34096,7 +34096,7 @@ (define-public python-claripy (package (name "python-claripy") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin ;; Fetching from Git as pypi release doesn't include all test files. @@ -34106,13 +34106,13 @@ (define-public python-claripy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nmawpi1596d9plafrp2db36cjsidy2fagkzkja51jwlx2m1ngai")) + (base32 "0c6q6imxjwhxn87d9yz8zvyrszk94r25w8x0g1lr6mrpa9bx7wai")) (modules '((guix build utils))) (snippet '(begin (substitute* "setup.cfg" ;; Relax the z3 version constraint. ;; See https://github.com/angr/claripy/commit/d1fe2df - (("z3-solver==4.10.2.0") + (("z3-solver==4.13.0.0") "")))))) (build-system pyproject-build-system) (arguments From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:09 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:09 +0000 Received: from localhost ([127.0.0.1]:49019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RM-0000S6-VB for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:09 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:21577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RH-0000Pt-Ab; Wed, 31 Jul 2024 04:12:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=/Qmz5ttZ vjiTYUWtJF0U6UObtspkOV96kAEjO1vsrsw=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=EOV9cwPhgNNsgPMh1jQuvUPPoOX2KG V0+jaYdyGs1U6jmWKpj4p4DtiSECeK/48SrGEUF5h5ShVJtiWVe+LlH0bxPLKMse/00RMT nRxuzzeMLGo9O6afdee38ym+oBuVqWc6Gp8mYsM3SHgCanapAnmoXvIqE3sxRBhC0MgD5w w= 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 6885d360 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:42 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 08/10] gnu: Add python-pyformlang. Date: Wed, 31 Jul 2024 10:11:28 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-pyformlang): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eefb3f2449..d253817748 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23796,6 +23796,27 @@ (define-public python-pypeg2 parse many formal languages.") (license license:gpl2))) +(define-public python-pyformlang + (package + (name "python-pyformlang") + (version "1.0.10") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyformlang" version)) + (sha256 + (base32 "0szgy4pqfixmswjs37qgma4qa3bsadpp3l1xflrpfi10aa8hh2sp")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-networkx python-numpy python-pydot)) + (home-page "https://github.com/Aunsiels/pyformlang") + (synopsis "Framework for interacting with formal grammars") + (description + "This package provides a framework for working with formal +language grammars. The library was originally developed for educational +purposes and therefore implements many textbook algorithms regarding the +manipulation and interaction with formal grammars.") + (license license:expat))) + (define-public python-incremental (package (name "python-incremental") From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:09 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:09 +0000 Received: from localhost ([127.0.0.1]:49021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RN-0000SD-89 for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:09 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:16899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RI-0000Pw-5a; Wed, 31 Jul 2024 04:12:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=FkHkCJjb VIvULg5zOTyyh8CwH1BNLSfu2VI8Z8kriYQ=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=Oc+LabLOly4lwgKp5P73qcAsmN2xiN o4VAF768ZoY9rBSMwTJeqgPd2fWdmp+dOv1z10G5cZIWvL0J74r+YTddSyn08TMT9Pdjng z5ssWl+kb1w5qdzSB83OZqFEWsnOquTnYyT05mtMeOXEz2z7LN8BjVnIMZnQ9LxnkV2Ceh g= 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 8a58119f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:43 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 09/10] gnu: Add python-unique-log-filter. Date: Wed, 31 Jul 2024 10:11:29 +0200 Message-ID: <29ac50936ab5af28cf34a3410f814d66a41f3b0a.1722412559.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-unique-log-filter): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d253817748..02d2a49dbb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30956,6 +30956,36 @@ (define-public python-json-logger we can stop writing custom parsers for syslog-type records.") (license license:bsd-3))) +(define-public python-unique-log-filter + (package + (name "python-unique-log-filter") + (version "0.1.0") + (source + ;; The version on pypi does not include test files. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/twizmwazin/unique_log_filter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "036mh6nqskck2fa1q2inasqxb9wcz2p09qcpldnnffzcy1a6kzba")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "test_unique_log_filter.py"))))))) + (native-inputs (list python-flit-core)) + (home-page "https://github.com/twizmwazin/unique_log_filter") + (synopsis "Log filter that removes duplicate log messages") + (description + "This library provides a filter for the @code{logging} module +from the Python standard library which allows removing duplicate log +messages.") + (license license:bsd-2))) + (define-public python-daiquiri (package (name "python-daiquiri") From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 31 04:12:10 2024 Received: (at 72393) by debbugs.gnu.org; 31 Jul 2024 08:12:10 +0000 Received: from localhost ([127.0.0.1]:49024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RN-0000SL-Jy for submit@debbugs.gnu.org; Wed, 31 Jul 2024 04:12:10 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:21577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZ4RI-0000Pt-9i; Wed, 31 Jul 2024 04:12:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=okYGiTLf 3K3bDYTjWkiAD8xdpmaqYFGuKJBuaTu3YXg=; h=references:in-reply-to:date: subject:to:from; d=soeren-tempel.net; b=wXUhSixZwh0OtExrJOFG7yBMKH2ugg rMhOZkTRpx84beat9SCi9pNTIiAy7zHyyRpjiALqbebvsytCBVs+W50DqHo3DPRsZ/oYGg Zn5iyAiIKL1QsSJL+mF705pb4+NRzA4o5nLcnLYK/WI+07pcgvPjWXiftNh7VtQQut8mdS U= 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 48976dd4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Wed, 31 Jul 2024 10:11:44 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH 10/10] gnu: python-angr: Update to 9.2.112. Date: Wed, 31 Jul 2024 10:11:30 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-angr): Update to 9.2.112. [propagated-inputs]: Remove python-progressbar2; add python-pyformlang, add python-rich, add python-unique-log-filter. * gnu/packages/patches/python-angr-addition-type-error.patch: Remove patch (merged upstream and included in new release). * gnu/packages/patches/python-angr-check-exec-deps.patch: Rebase for new release. --- gnu/local.mk | 1 - .../python-angr-addition-type-error.patch | 18 ---- .../patches/python-angr-check-exec-deps.patch | 83 +++++++++---------- gnu/packages/python-xyz.scm | 28 +++++-- 4 files changed, 58 insertions(+), 72 deletions(-) delete mode 100644 gnu/packages/patches/python-angr-addition-type-error.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8b00928141..43e5116c08 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1945,7 +1945,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-hurd-configure.patch \ - %D%/packages/patches/python-angr-addition-type-error.patch \ %D%/packages/patches/python-angr-check-exec-deps.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ diff --git a/gnu/packages/patches/python-angr-addition-type-error.patch b/gnu/packages/patches/python-angr-addition-type-error.patch deleted file mode 100644 index 7301d8b505..0000000000 --- a/gnu/packages/patches/python-angr-addition-type-error.patch +++ /dev/null @@ -1,18 +0,0 @@ -This fixes failures of the test_ln_gcc_O2 and other related tests -in the angr test suite. The patch has been proposed upstream. - -Taken form: https://github.com/angr/angr/pull/4443 - -diff --git a/angr/analyses/reassembler.py b/angr/analyses/reassembler.py -index 7a2399a60..b09b3a8cb 100644 ---- a/angr/analyses/reassembler.py -+++ b/angr/analyses/reassembler.py -@@ -730,7 +730,7 @@ class Instruction: - elif operand.type == capstone.CS_OP_MEM: - operand_offsets.append(capstone_instr.disp_offset) - else: -- operand_offsets.append(None) -+ operand_offsets.append(0) - - if self.addr is not None: - self._initialize(capstone_instr.operands, operand_offsets) diff --git a/gnu/packages/patches/python-angr-check-exec-deps.patch b/gnu/packages/patches/python-angr-check-exec-deps.patch index 438f8ef183..6001d9c924 100644 --- a/gnu/packages/patches/python-angr-check-exec-deps.patch +++ b/gnu/packages/patches/python-angr-check-exec-deps.patch @@ -8,11 +8,11 @@ For Guix, this files as the glibc shared objects cannot be found. Additionally, we don't really want to execute pre-compiled binaries on Guix, hence we disable those tests. -diff --git a/tests/test_ctype_locale.py b/tests/test_ctype_locale.py -index 08cb89836..2b9233558 100644 ---- a/tests/test_ctype_locale.py -+++ b/tests/test_ctype_locale.py -@@ -14,7 +14,7 @@ test_location = os.path.dirname(os.path.abspath(__file__)) +diff --git a/tests/procedures/glibc/test_ctype_locale.py b/tests/procedures/glibc/test_ctype_locale.py +index ac3e1ee16..1fb0fd095 100755 +--- a/tests/procedures/glibc/test_ctype_locale.py ++++ b/tests/procedures/glibc/test_ctype_locale.py +@@ -15,7 +15,7 @@ test_location = os.path.join(bin_location, "tests") class TestCtypeLocale(unittest.TestCase): @@ -21,7 +21,7 @@ index 08cb89836..2b9233558 100644 def test_ctype_b_loc(self): """ test_ctype_locale.test_ctype_b_loc -@@ -60,7 +60,7 @@ class TestCtypeLocale(unittest.TestCase): +@@ -61,7 +61,7 @@ class TestCtypeLocale(unittest.TestCase): output = subprocess.check_output(bin_path, shell=True) assert result == output @@ -30,7 +30,7 @@ index 08cb89836..2b9233558 100644 def test_ctype_tolower_loc(self): """ test_ctype_locale.test_ctype_tolower_loc -@@ -109,7 +109,7 @@ class TestCtypeLocale(unittest.TestCase): +@@ -110,7 +110,7 @@ class TestCtypeLocale(unittest.TestCase): output = subprocess.check_output(bin_path, shell=True) assert result == output @@ -39,50 +39,24 @@ index 08cb89836..2b9233558 100644 def test_ctype_toupper_loc(self): """ test_ctype_locale.test_ctype_toupper_loc -diff --git a/tests/test_signed_div.py b/tests/test_signed_div.py -index 59cb9b8d1..994ed9c65 100644 ---- a/tests/test_signed_div.py -+++ b/tests/test_signed_div.py -@@ -1,6 +1,7 @@ - import angr - import subprocess - import sys -+import pytest - - import logging - -@@ -13,7 +14,7 @@ import os - test_location = os.path.dirname(os.path.realpath(__file__)) - - --@skipUnless(sys.platform.startswith("linux"), "linux only") -+@pytest.mark.skip(reason="test executes pre-compiled binaries") - def test_signed_div(): - test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "test_signed_div") - b = angr.Project(test_bin, auto_load_libs=False) -diff --git a/tests/test_sscanf.py b/tests/test_sscanf.py -index 29d2c8403..ea799b310 100644 ---- a/tests/test_sscanf.py -+++ b/tests/test_sscanf.py -@@ -1,3 +1,4 @@ -+import pytest - import angr - import subprocess - import sys -@@ -14,7 +15,7 @@ test_location = os.path.dirname(os.path.realpath(__file__)) +diff --git a/tests/procedures/libc/test_sscanf.py b/tests/procedures/libc/test_sscanf.py +index 7c2da6f5e..e20952f54 100755 +--- a/tests/procedures/libc/test_sscanf.py ++++ b/tests/procedures/libc/test_sscanf.py +@@ -14,7 +14,7 @@ test_location = os.path.join(bin_location, "tests") class TestSscanf(unittest.TestCase): - @unittest.skipUnless(sys.platform.startswith("linux"), "linux only") + @unittest.skip("test executes pre-compiled binaries") def test_sscanf(self): - test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "sscanf_test") + test_bin = os.path.join(test_location, "x86_64", "sscanf_test") b = angr.Project(test_bin, auto_load_libs=False) -diff --git a/tests/test_strtol.py b/tests/test_strtol.py -index 6c29cab22..f36181407 100644 ---- a/tests/test_strtol.py -+++ b/tests/test_strtol.py -@@ -11,7 +11,7 @@ class TestStrtol(unittest.TestCase): +diff --git a/tests/procedures/libc/test_strtol.py b/tests/procedures/libc/test_strtol.py +index 4d7982b86..8818ced3b 100755 +--- a/tests/procedures/libc/test_strtol.py ++++ b/tests/procedures/libc/test_strtol.py +@@ -15,7 +15,7 @@ class TestStrtol(unittest.TestCase): # pylint: disable=no-self-use @slow_test @@ -91,3 +65,24 @@ index 6c29cab22..f36181407 100644 def test_strtol(self, threads=None): test_bin = os.path.join(bin_location, "tests", "x86_64", "strtol_test") # disabling auto_load_libs increases the execution time of the test case. +diff --git a/tests/sim/exec_insn/test_signed_div.py b/tests/sim/exec_insn/test_signed_div.py +index 46581020f..d5acc5370 100755 +--- a/tests/sim/exec_insn/test_signed_div.py ++++ b/tests/sim/exec_insn/test_signed_div.py +@@ -2,6 +2,7 @@ + # pylint: disable=missing-class-docstring,no-self-use,line-too-long + __package__ = __package__ or "tests.sim.exec_insn" # pylint:disable=redefined-builtin + ++import pytest + import os + import subprocess + import sys +@@ -16,7 +17,7 @@ test_location = os.path.join(bin_location, "tests") + + + class TestSignedDiv(TestCase): +- @skipUnless(sys.platform.startswith("linux"), "linux only") ++ @pytest.mark.skip(reason="test executes pre-compiled binaries") + def test_signed_div(self): + test_bin = os.path.join(test_location, "x86_64", "test_signed_div") + b = angr.Project(test_bin, auto_load_libs=False) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 02d2a49dbb..ae13a49577 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34335,19 +34335,18 @@ (define-public python-itanium-demangler (define-public python-angr (package (name "python-angr") - (version "9.2.46") + (version "9.2.112") (source (origin ;; Fetching from Git as pypi release doesn't include all test files. (method git-fetch) - (patches (search-patches "python-angr-addition-type-error.patch" - "python-angr-check-exec-deps.patch")) + (patches (search-patches "python-angr-check-exec-deps.patch")) (uri (git-reference (url "https://github.com/angr/angr") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18y9wyf7va7gvp9zd6lhw82j9a2x2ajsvbawh96xnxzml0jwlwjm")))) + (base32 "1179926xbfh2930laz33p90vj532jk7g2qylzzpw1185yhlf9cis")))) (build-system pyproject-build-system) (arguments (list @@ -34355,9 +34354,18 @@ (define-public python-angr (add-after 'unpack 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* "tests/test_vault.py" - (("/bin/false") - (which "false"))) + ;; The constraint exists because of a capstone bug for which + ;; we backport a patch, hence we can relax the constraint. + ;; + ;; See https://github.com/angr/angr/issues/4656 + (substitute* "setup.cfg" + (("capstone==5.0.0.post1") + "capstone")) + ;; Relax constraint on python-rich, the constraint is too strict, + ;; angr work well with our packaged version of python-rich. + (substitute* "setup.cfg" + (("rich>=13.1.0") + "rich")) (substitute* "tests/common.py" (("\\[\"cc\"\\]") "[\"gcc\"]"))))) @@ -34396,11 +34404,13 @@ (define-public python-angr python-itanium-demangler python-pycparser python-pyvex - python-progressbar2 + python-pyformlang + python-rich python-rpyc python-sortedcontainers python-sqlalchemy python-sympy + python-unique-log-filter unicorn)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-xdist" ,python-pytest-xdist) @@ -34418,7 +34428,7 @@ (define-public python-angr version)))) (file-name (git-file-name "angr-binaries" version)) (sha256 (base32 - "1f286b2239zavxzwg1184hj1zs380cr9qr549mvy3vywvm8bsmgr")))))) + "0bxzf6alkczv9r0151ksvcwyksnw8077acz1wd8drbxw0zl0qnmr")))))) (home-page "https://github.com/angr/angr") (synopsis "Multi-architecture binary analysis toolkit") (description From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 15 06:26:46 2024 Received: (at 72393) by debbugs.gnu.org; 15 Sep 2024 10:26:46 +0000 Received: from localhost ([127.0.0.1]:48478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spmSs-0002kc-0A for submit@debbugs.gnu.org; Sun, 15 Sep 2024 06:26:46 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:25216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spmSo-0002kT-SY for 72393@debbugs.gnu.org; Sun, 15 Sep 2024 06:26:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=oe6+Yy1l ajNfL5xbMdCFD8PQ4Bfxde44VMpB7Tnk17E=; h=from:subject:cc:to:date; d=soeren-tempel.net; b=PEGunfIFyhWqlJhsRgOSLYkpQDWoc5JLhcVy+VMIqhAmRDl jOsW73xjeG54jS1F8YxEkGoR+mAfx7JfDOlqpn0wwW8qCWikRGO7w8EfmnhxOZ8vyvnyxu tqHAxod6oAg1JpPGo4nBYxJbEZzva99sJzUgN3WdA2Eq/e/4m1jQJg= Received: from localhost (ip-185-104-138-47.ptr.icomera.net [185.104.138.47]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id ffe90d7c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Sun, 15 Sep 2024 12:26:28 +0200 (CEST) Date: Sun, 15 Sep 2024 12:26:27 +0200 To: 72393@debbugs.gnu.org Subject: Re: [PATCH 00/10] gnu: python-angr: Update to 9.2.112. From: =?UTF-8?Q?S=C3=B6ren?= Tempel Message-Id: <2QWWFKQJOGK76.2LQ2QUY4A7L6V@8pit.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello jgart, Since you already reviewed the initial addition of angr to Guix in !69074, maybe you can have a look at this angr upgrade as well? :) Would appreciate your feedback, if you have the time. Greetings, S=C3=B6ren From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 22 22:07:51 2024 Received: (at 72393) by debbugs.gnu.org; 23 Sep 2024 02:07:52 +0000 Received: from localhost ([127.0.0.1]:43003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssYUR-0002Pw-GL for submit@debbugs.gnu.org; Sun, 22 Sep 2024 22:07:51 -0400 Received: from mx1.dismail.de ([78.46.223.134]:30524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssYUM-0002Pf-OH for 72393@debbugs.gnu.org; Sun, 22 Sep 2024 22:07:50 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 574402b2; Mon, 23 Sep 2024 04:07:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:content-transfer-encoding:from :message-id:subject:to:in-reply-to:references; s=20190914; bh=yp jP1kXt/xyTEWUNvCJxsT/dtDeu8QOa9gnShoy08cs=; b=b2wEic2NI+hn5TrGuy s3d+hSfYBGGhfzNPFlpyWx681A8qDQOuLOaNXUVjJ0Hmol/xW0OUWRPeoJOZ+vxG C4rZ4reCZFa1lyHJRGFaWUiHLRDlpjv2jaTVSavqTb5eYazStkXCznO+Y66onVUq 04MrcG/v2mP7/qONZNXMsQ49wwloy86ChPT+j4OVRkPoya1jfyHlEy9Sw6wpnYcr A+rg+6RD+FTFzp2Xqft5eKzpW0TIS/OzGrTr1PwVtWtkdDbPXqg+2TuL4Cif1dhT 21UM9YUkiW1QDaDxXKD/6eZrYXtGLxlzHDCJQqrfgiHd2ViKZxxBS9llFa39fUyg daHQ== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id e69f2c45; Mon, 23 Sep 2024 04:07:16 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 39fba834; Mon, 23 Sep 2024 04:07:16 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 3980a2e0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 23 Sep 2024 04:07:16 +0200 (CEST) MIME-Version: 1.0 Date: Mon, 23 Sep 2024 02:07:15 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: "jgart" Message-ID: TLS-Required: No Subject: Re: [PATCH 00/10] gnu: python-angr: Update to 9.2.112. To: "=?utf-8?B?U8O2cmVuIFRlbXBlbA==?=" , 72393@debbugs.gnu.org In-Reply-To: <2QWWFKQJOGK76.2LQ2QUY4A7L6V@8pit.net> References: <2QWWFKQJOGK76.2LQ2QUY4A7L6V@8pit.net> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72393 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, Could you rebase and send a v2? This patch series doesn't apply cleanly anymore. I can take a look this coming week. all best, jgart From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:04 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:04 +0000 Received: from localhost ([127.0.0.1]:47126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFow-0007Vg-WF for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:04 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFou-0007VD-Sv; Fri, 27 Sep 2024 14:36:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=u23gmzYx V4oWxkfPycAPyiKr0A2Arplm7ADM/T8OllQ=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=On6IXkmwM8CoW4sHjLTvQFEd+LAAQXfUPU3O8CRgjKkNRyJ 5o83MEb+NraAki9Ny2z2U5kgp/0mAJwEqVAhOD++ebAyRl/DRKej6TJ++WijLRyHij71fg q+6V3oXThpJj9luHYoyYPjabnUmhu3Bx1wkCMPeH9M1KULRAzBMfF8= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 79403030 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:26 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 01/10] gnu: python-ailment: Update to 9.2.112. Date: Fri, 27 Sep 2024 20:34:54 +0200 Message-ID: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-ailment): Update to 9.2.112. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 22351e813a..45fcaa63f4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34059,13 +34059,13 @@ (define-public python-ailment (package (name "python-ailment") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "ailment" version)) (sha256 - (base32 "073fcssbjis1ckwv2w0dcz2dfl6715bj4d4qdhspajj911mvng2f")))) + (base32 "1rv8rwvdm7fc9mf8z5hqb54dsj0n7jlnwghd12ll0b2jmh2ix8mn")))) (build-system pyproject-build-system) (arguments `(#:phases (modify-phases %standard-phases base-commit: 9a141b5bd633227ea31776b9ce7ca40928de2442 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:10 2024 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 To: 72393@debbugs.gnu.org Subject: [PATCH v2 02/10] gnu: python-pyvex: Update to 9.2.112. 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-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:10 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:10 +0000 Received: from localhost ([127.0.0.1]:47143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp4-0007Wr-78 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 1suFox-0007VD-Jc; Fri, 27 Sep 2024 14:36:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=BnIGZFB0 5W3zBkkSUR1H7oOV5arzmSpgWilsXnEuVbw=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=nUkEOuh/C9pTMXnFkBKN/lvo2VJ WCUridnkf+NukoSPU84zQxfHtVwNeItwOIkx/A1oNWUoM4Oe3ZTEispdQpasTgtthc9NnT oFYqHNN9mzFY8q4Vh3q/nvV3m7aUP5ulnw8fqRQ/duJovyH2U/y07lTN//z8co33nHEi8p UCfI= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 24cff974 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:28 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 03/10] gnu: Add python-backports-strenum. Date: Fri, 27 Sep 2024 20:34:56 +0200 Message-ID: <5e3a845ca12ba21d14e3d687bf148ee5b62d85da.1727462103.git.soeren@soeren-tempel.net> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-backports-strenum): New variable. --- gnu/packages/emulators.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 4dc61bdbff..25391ffaaf 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -96,6 +96,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) @@ -2649,6 +2650,30 @@ (define-public python-keystone-engine assembly for these architectures.") (license license:gpl2))) +;; can be removed once Guix upgrades to Python 3.11. +(define-public python-backports-strenum + (package + (name "python-backports-strenum") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "backports_strenum" version)) + (sha256 + (base32 "0514yj1391k6pbs2cch6i57hidwb3236wngh2ivlk6186h3j9ibp")))) + (native-inputs (list python-poetry-core)) + (build-system pyproject-build-system) + ;; TODO: Running tests requires a new version of poetry in Guix. + (arguments + (list + #:tests? #f)) + (home-page "https://github.com/clbarnes/backports.strenum") + (synopsis "Backport of additions to the 'strenum' module") + (description + "Provides a backport of Python's @code{StrEnum} class which was introduced in +Python 3.11 for Python >=3.8.6.") + (license license:expat))) + (define-public python-archinfo (package (name "python-archinfo") From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:11 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:11 +0000 Received: from localhost ([127.0.0.1]:47145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp4-0007X7-Q6 for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:11 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFoz-0007VD-2V; Fri, 27 Sep 2024 14:36:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=k/AJoGJu 1TqIQ6rQJmOyHE7LJ6DETVwXjNXatiqJgwA=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=BCmGe7QYfjoKIsfLejUWccbdlxz E4v9mtpsmvp4VZfmqZRTwLX7D1CoxLkX8m58EwG2lCA4MUI2WoMpGGiPLdkmj8gDIWS5xU 6Cr/n1LC+gaWnMaAOO1q3vjBAtdwN6WK+yOGAm7E5FtJf6Fix2wPdXeHSTZMOpU/WRL1EP xuLE= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 4ab4a522 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:28 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 04/10] gnu: python-archinfo: Update to 9.2.112. Date: Fri, 27 Sep 2024 20:34:57 +0200 Message-ID: <802a649a9d0832604fbe0c6b14dd63219de4cdb8.1727462103.git.soeren@soeren-tempel.net> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/emulators.scm (python-archinfo): Update to 9.2.112. [propagated-inputs]: Add python-backports-strenum. --- gnu/packages/emulators.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 25391ffaaf..0e5b6e6fd5 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2678,17 +2678,26 @@ (define-public python-archinfo (package (name "python-archinfo") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "archinfo" version)) (sha256 - (base32 "037xfq3wcf8ngayxz9623l4646m780v2102mfbygpzbkkjha1966")))) + (base32 "011n9vrrsbqbnw2i38ls7f0xkd85kxcnn14fm4lhxjpi91p7hshb")))) (build-system pyproject-build-system) - (propagated-inputs (list python-capstone python-keystone-engine)) + (propagated-inputs + (list + python-backports-strenum + python-capstone + python-keystone-engine)) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "setup.cfg" + (("backports.strenum") + "backports_strenum")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:11 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:11 +0000 Received: from localhost ([127.0.0.1]:47147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp5-0007XB-3c for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:11 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:19108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp0-0007W9-2x; Fri, 27 Sep 2024 14:36:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=OTsYUg3J +8lebvcT3w1rQ69lh7BxKjuqlQV7vN8XawI=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=XIGKJmMyRi//njC46LngGUnCwMt E04G19Zb8tmfCGrGFZFSvY1eHo3otF2PS995tqOWsoPvYbATi13OT0tBQZQNb3XAkIItJn 30Re2dj/x8ILml7+oCBwJBJwFCFTXl7M/5iCWvAfzgGOHhbbsSC7UQj/ibHHYldCMp/JyW igpA= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id bbaf1b4a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:29 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 06/10] gnu: python-cle: Update to 9.2.112. Date: Fri, 27 Sep 2024 20:34:59 +0200 Message-ID: <32189cc7944ab12d02a63c2cb9e2d33c5b2ebe93.1727462103.git.soeren@soeren-tempel.net> 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-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-cle): Update to 9.2.112. [propagated-inputs]: Add python-cart. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 545ef0659f..909aa5f43c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34117,19 +34117,19 @@ (define-public python-cle (package (name "python-cle") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "cle" version)) (sha256 - (base32 "0mswv9gd2p2ws7zfsshqv5ybbj27wkdwakdcknq4vsrx9ry9k4yc")))) + (base32 "11jbvg12wqxz74iy83ax0q8k156xrw6iqv75dix5cpqgacds3gdj")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) (propagated-inputs (list python-pefile python-pyelftools python-pyvex - python-sortedcontainers)) + python-sortedcontainers python-cart)) (native-inputs (list python-cffi)) (home-page "https://github.com/angr/cle") (synopsis "Python loader for binaries and their associated libraries") From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:11 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:11 +0000 Received: from localhost ([127.0.0.1]:47149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp5-0007XI-DV for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:11 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp0-0007VD-1x; Fri, 27 Sep 2024 14:36:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=gA7SjaDd NOjUmGkWecF1i/AwBqr08XAQbyWtYj0aM9U=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=amADfySLuRMWOyz6SoWgUAxZo02 AMmMkf1cOWOr/1mri9UlT5cUQ0DuN0drjhg1CylZx2RwCToSKe7soRktWopQBRV3d6pd4x oAloaSemGvGbk0b+JNPvU1HHNOG1PXvyd9qztAFjLgUQ+h1ABvxdUFfwQq8V+Pnmt8pAIs bfAM= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 6f07f599 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:29 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 05/10] gnu: Add python-cart. Date: Fri, 27 Sep 2024 20:34:58 +0200 Message-ID: <1096050e874a9fe9eb85bd97f03ab4d65a320465.1727462103.git.soeren@soeren-tempel.net> 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-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-cart): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3cf0701e06..545ef0659f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34055,6 +34055,36 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-cart + (package + (name "python-cart") + (version "1.2.2") + (source + (origin + ;; No source releases available on pypi, hence fetching from GitHub. + (method git-fetch) + (uri (git-reference + (url "https://github.com/CybercentreCanada/cart") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zycv620iljrsval5rai1wsn0hr25ddx9xhjsyy6xxrgprfxvlfi")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" "discover"))))))) + (propagated-inputs (list python-pycryptodome)) + (home-page "https://github.com/CybercentreCanada/cart") + (synopsis "Library for interacting with the CaRT file format") + (description + "This Python library implements the CaRT file format which is commonly +used to store and transmit information about computer malware and associated +metadata.") + (license license:bsd-2))) + (define-public python-ailment (package (name "python-ailment") From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:12 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:12 +0000 Received: from localhost ([127.0.0.1]:47151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp5-0007XP-PR for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:12 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:19108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp1-0007W9-3f; Fri, 27 Sep 2024 14:36:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=4vlWphdj CDOBkZxw130QjURQI6UjjIZe6oAjlkeVkgI=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=yhkHUGZd+u5nrzukcEixIuaxE0g VXrSdXM9QYZ/UcS22MJSZmcIXcNPYXqwv3dYeAeTTz28RWqAI4LoztCw0/UpdDICaF0JT5 QZ0bHOEKEXHuTFx4QTQGa1sEA+DBRkesRLH7MeDdtc9K7OinDcBp8m8xi4tHjan7uNDSo3 mzuY= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 34064502 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:31 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 08/10] gnu: Add python-pyformlang. Date: Fri, 27 Sep 2024 20:35:01 +0200 Message-ID: <9bb133c6269afe70dbf0e9ef9836c4179a71e126.1727462103.git.soeren@soeren-tempel.net> 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-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-pyformlang): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d34009abc7..b07cb6c409 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23859,6 +23859,27 @@ (define-public python-pypeg2 parse many formal languages.") (license license:gpl2))) +(define-public python-pyformlang + (package + (name "python-pyformlang") + (version "1.0.10") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyformlang" version)) + (sha256 + (base32 "0szgy4pqfixmswjs37qgma4qa3bsadpp3l1xflrpfi10aa8hh2sp")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-networkx python-numpy python-pydot)) + (home-page "https://github.com/Aunsiels/pyformlang") + (synopsis "Framework for interacting with formal grammars") + (description + "This package provides a framework for working with formal +language grammars. The library was originally developed for educational +purposes and therefore implements many textbook algorithms regarding the +manipulation and interaction with formal grammars.") + (license license:expat))) + (define-public python-incremental (package (name "python-incremental") From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:12 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:13 +0000 Received: from localhost ([127.0.0.1]:47153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp6-0007XY-7Z for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:12 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp1-0007VD-2q; Fri, 27 Sep 2024 14:36:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=xVqitDGs Vz0nlFRMrHTni2Pv2eYVkBaIvMJhhMZ8FRc=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=uA/Lk4dONp0ZDeRUe2CnRs6uwoS 8p9E3MzX1jd8xAiK5ivm/SlkQ+BC47a4c8cqQU+tTcqoCYcl86I19Y70GT+SkB4LyBQ0o1 3WeLPPonZTfRL/+MzbGe/fdsJHLWyg3kjgzraVdxhUtSm2bTU0gThhXpVvuqhVMdMxmpNW ilTU= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id ceb52569 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:30 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 07/10] gnu: python-claripy: Update to 9.2.112. Date: Fri, 27 Sep 2024 20:35:00 +0200 Message-ID: <325f5909e1f552a540a1d4c4b8ad7bce8a97f32a.1727462103.git.soeren@soeren-tempel.net> 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-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-claripy): Update to 9.2.112. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 909aa5f43c..d34009abc7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34178,7 +34178,7 @@ (define-public python-claripy (package (name "python-claripy") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin ;; Fetching from Git as pypi release doesn't include all test files. @@ -34188,13 +34188,13 @@ (define-public python-claripy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nmawpi1596d9plafrp2db36cjsidy2fagkzkja51jwlx2m1ngai")) + (base32 "0c6q6imxjwhxn87d9yz8zvyrszk94r25w8x0g1lr6mrpa9bx7wai")) (modules '((guix build utils))) (snippet '(begin (substitute* "setup.cfg" ;; Relax the z3 version constraint. ;; See https://github.com/angr/claripy/commit/d1fe2df - (("z3-solver==4.10.2.0") + (("z3-solver==4.13.0.0") "")))))) (build-system pyproject-build-system) (arguments From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:14 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:14 +0000 Received: from localhost ([127.0.0.1]:47157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp6-0007Xf-PM for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:14 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:19108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp2-0007W9-G2; Fri, 27 Sep 2024 14:36:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=OT5Vamxp /DJyhmQ33XMD4bqub5CZ6hE61qZE7FSOJVY=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=hadur40o9QHX86tAfJHjzI1ZMFP zpq8qQ6d3xfeoEsXxQLqu1XjKR0zpGdFQ5GYzBTbh9QPSVF0kRSCSXP3mR1UsZZ9u7D3qW 9zkxlODKaejOcX/mB5PrBrM7yWyHnxS9I3VQ6uw3teLot6daZ2xritI2z/Im1CdkMDpOM+ Aczo= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 66dde5f4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:32 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 10/10] gnu: python-angr: Update to 9.2.112. Date: Fri, 27 Sep 2024 20:35:03 +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-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-angr): Update to 9.2.112. [propagated-inputs]: Remove python-progressbar2; add python-pyformlang, add python-rich, add python-unique-log-filter. * gnu/packages/patches/python-angr-addition-type-error.patch: Remove patch (merged upstream and included in new release). * gnu/packages/patches/python-angr-check-exec-deps.patch: Rebase for new release. --- gnu/local.mk | 1 - .../python-angr-addition-type-error.patch | 18 ---- .../patches/python-angr-check-exec-deps.patch | 83 +++++++++---------- gnu/packages/python-xyz.scm | 28 +++++-- 4 files changed, 58 insertions(+), 72 deletions(-) delete mode 100644 gnu/packages/patches/python-angr-addition-type-error.patch diff --git a/gnu/local.mk b/gnu/local.mk index 669a65dfd6..adbea45636 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2004,7 +2004,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-hurd-configure.patch \ - %D%/packages/patches/python-angr-addition-type-error.patch \ %D%/packages/patches/python-angr-check-exec-deps.patch \ %D%/packages/patches/python-3-reproducible-build.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ diff --git a/gnu/packages/patches/python-angr-addition-type-error.patch b/gnu/packages/patches/python-angr-addition-type-error.patch deleted file mode 100644 index 7301d8b505..0000000000 --- a/gnu/packages/patches/python-angr-addition-type-error.patch +++ /dev/null @@ -1,18 +0,0 @@ -This fixes failures of the test_ln_gcc_O2 and other related tests -in the angr test suite. The patch has been proposed upstream. - -Taken form: https://github.com/angr/angr/pull/4443 - -diff --git a/angr/analyses/reassembler.py b/angr/analyses/reassembler.py -index 7a2399a60..b09b3a8cb 100644 ---- a/angr/analyses/reassembler.py -+++ b/angr/analyses/reassembler.py -@@ -730,7 +730,7 @@ class Instruction: - elif operand.type == capstone.CS_OP_MEM: - operand_offsets.append(capstone_instr.disp_offset) - else: -- operand_offsets.append(None) -+ operand_offsets.append(0) - - if self.addr is not None: - self._initialize(capstone_instr.operands, operand_offsets) diff --git a/gnu/packages/patches/python-angr-check-exec-deps.patch b/gnu/packages/patches/python-angr-check-exec-deps.patch index 438f8ef183..6001d9c924 100644 --- a/gnu/packages/patches/python-angr-check-exec-deps.patch +++ b/gnu/packages/patches/python-angr-check-exec-deps.patch @@ -8,11 +8,11 @@ For Guix, this files as the glibc shared objects cannot be found. Additionally, we don't really want to execute pre-compiled binaries on Guix, hence we disable those tests. -diff --git a/tests/test_ctype_locale.py b/tests/test_ctype_locale.py -index 08cb89836..2b9233558 100644 ---- a/tests/test_ctype_locale.py -+++ b/tests/test_ctype_locale.py -@@ -14,7 +14,7 @@ test_location = os.path.dirname(os.path.abspath(__file__)) +diff --git a/tests/procedures/glibc/test_ctype_locale.py b/tests/procedures/glibc/test_ctype_locale.py +index ac3e1ee16..1fb0fd095 100755 +--- a/tests/procedures/glibc/test_ctype_locale.py ++++ b/tests/procedures/glibc/test_ctype_locale.py +@@ -15,7 +15,7 @@ test_location = os.path.join(bin_location, "tests") class TestCtypeLocale(unittest.TestCase): @@ -21,7 +21,7 @@ index 08cb89836..2b9233558 100644 def test_ctype_b_loc(self): """ test_ctype_locale.test_ctype_b_loc -@@ -60,7 +60,7 @@ class TestCtypeLocale(unittest.TestCase): +@@ -61,7 +61,7 @@ class TestCtypeLocale(unittest.TestCase): output = subprocess.check_output(bin_path, shell=True) assert result == output @@ -30,7 +30,7 @@ index 08cb89836..2b9233558 100644 def test_ctype_tolower_loc(self): """ test_ctype_locale.test_ctype_tolower_loc -@@ -109,7 +109,7 @@ class TestCtypeLocale(unittest.TestCase): +@@ -110,7 +110,7 @@ class TestCtypeLocale(unittest.TestCase): output = subprocess.check_output(bin_path, shell=True) assert result == output @@ -39,50 +39,24 @@ index 08cb89836..2b9233558 100644 def test_ctype_toupper_loc(self): """ test_ctype_locale.test_ctype_toupper_loc -diff --git a/tests/test_signed_div.py b/tests/test_signed_div.py -index 59cb9b8d1..994ed9c65 100644 ---- a/tests/test_signed_div.py -+++ b/tests/test_signed_div.py -@@ -1,6 +1,7 @@ - import angr - import subprocess - import sys -+import pytest - - import logging - -@@ -13,7 +14,7 @@ import os - test_location = os.path.dirname(os.path.realpath(__file__)) - - --@skipUnless(sys.platform.startswith("linux"), "linux only") -+@pytest.mark.skip(reason="test executes pre-compiled binaries") - def test_signed_div(): - test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "test_signed_div") - b = angr.Project(test_bin, auto_load_libs=False) -diff --git a/tests/test_sscanf.py b/tests/test_sscanf.py -index 29d2c8403..ea799b310 100644 ---- a/tests/test_sscanf.py -+++ b/tests/test_sscanf.py -@@ -1,3 +1,4 @@ -+import pytest - import angr - import subprocess - import sys -@@ -14,7 +15,7 @@ test_location = os.path.dirname(os.path.realpath(__file__)) +diff --git a/tests/procedures/libc/test_sscanf.py b/tests/procedures/libc/test_sscanf.py +index 7c2da6f5e..e20952f54 100755 +--- a/tests/procedures/libc/test_sscanf.py ++++ b/tests/procedures/libc/test_sscanf.py +@@ -14,7 +14,7 @@ test_location = os.path.join(bin_location, "tests") class TestSscanf(unittest.TestCase): - @unittest.skipUnless(sys.platform.startswith("linux"), "linux only") + @unittest.skip("test executes pre-compiled binaries") def test_sscanf(self): - test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "sscanf_test") + test_bin = os.path.join(test_location, "x86_64", "sscanf_test") b = angr.Project(test_bin, auto_load_libs=False) -diff --git a/tests/test_strtol.py b/tests/test_strtol.py -index 6c29cab22..f36181407 100644 ---- a/tests/test_strtol.py -+++ b/tests/test_strtol.py -@@ -11,7 +11,7 @@ class TestStrtol(unittest.TestCase): +diff --git a/tests/procedures/libc/test_strtol.py b/tests/procedures/libc/test_strtol.py +index 4d7982b86..8818ced3b 100755 +--- a/tests/procedures/libc/test_strtol.py ++++ b/tests/procedures/libc/test_strtol.py +@@ -15,7 +15,7 @@ class TestStrtol(unittest.TestCase): # pylint: disable=no-self-use @slow_test @@ -91,3 +65,24 @@ index 6c29cab22..f36181407 100644 def test_strtol(self, threads=None): test_bin = os.path.join(bin_location, "tests", "x86_64", "strtol_test") # disabling auto_load_libs increases the execution time of the test case. +diff --git a/tests/sim/exec_insn/test_signed_div.py b/tests/sim/exec_insn/test_signed_div.py +index 46581020f..d5acc5370 100755 +--- a/tests/sim/exec_insn/test_signed_div.py ++++ b/tests/sim/exec_insn/test_signed_div.py +@@ -2,6 +2,7 @@ + # pylint: disable=missing-class-docstring,no-self-use,line-too-long + __package__ = __package__ or "tests.sim.exec_insn" # pylint:disable=redefined-builtin + ++import pytest + import os + import subprocess + import sys +@@ -16,7 +17,7 @@ test_location = os.path.join(bin_location, "tests") + + + class TestSignedDiv(TestCase): +- @skipUnless(sys.platform.startswith("linux"), "linux only") ++ @pytest.mark.skip(reason="test executes pre-compiled binaries") + def test_signed_div(self): + test_bin = os.path.join(test_location, "x86_64", "test_signed_div") + b = angr.Project(test_bin, auto_load_libs=False) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f56d23f93e..45dce3082d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34417,19 +34417,18 @@ (define-public python-itanium-demangler (define-public python-angr (package (name "python-angr") - (version "9.2.46") + (version "9.2.112") (source (origin ;; Fetching from Git as pypi release doesn't include all test files. (method git-fetch) - (patches (search-patches "python-angr-addition-type-error.patch" - "python-angr-check-exec-deps.patch")) + (patches (search-patches "python-angr-check-exec-deps.patch")) (uri (git-reference (url "https://github.com/angr/angr") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18y9wyf7va7gvp9zd6lhw82j9a2x2ajsvbawh96xnxzml0jwlwjm")))) + (base32 "1179926xbfh2930laz33p90vj532jk7g2qylzzpw1185yhlf9cis")))) (build-system pyproject-build-system) (arguments (list @@ -34437,9 +34436,18 @@ (define-public python-angr (add-after 'unpack 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* "tests/test_vault.py" - (("/bin/false") - (which "false"))) + ;; The constraint exists because of a capstone bug for which + ;; we backport a patch, hence we can relax the constraint. + ;; + ;; See https://github.com/angr/angr/issues/4656 + (substitute* "setup.cfg" + (("capstone==5.0.0.post1") + "capstone")) + ;; Relax constraint on python-rich, the constraint is too strict, + ;; angr work well with our packaged version of python-rich. + (substitute* "setup.cfg" + (("rich>=13.1.0") + "rich")) (substitute* "tests/common.py" (("\\[\"cc\"\\]") "[\"gcc\"]"))))) @@ -34478,11 +34486,13 @@ (define-public python-angr python-itanium-demangler python-pycparser python-pyvex - python-progressbar2 + python-pyformlang + python-rich python-rpyc python-sortedcontainers python-sqlalchemy python-sympy + python-unique-log-filter unicorn)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-xdist" ,python-pytest-xdist) @@ -34500,7 +34510,7 @@ (define-public python-angr version)))) (file-name (git-file-name "angr-binaries" version)) (sha256 (base32 - "1f286b2239zavxzwg1184hj1zs380cr9qr549mvy3vywvm8bsmgr")))))) + "0bxzf6alkczv9r0151ksvcwyksnw8077acz1wd8drbxw0zl0qnmr")))))) (home-page "https://github.com/angr/angr") (synopsis "Multi-architecture binary analysis toolkit") (description From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 14:36:38 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:38 +0000 Received: from localhost ([127.0.0.1]:47177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFpV-0007Yl-4a for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:37 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp2-0007VD-G2; Fri, 27 Sep 2024 14:36:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=gqgGZ2DK WIB+hg4WP6vl5tR4Kx4oDQfbmGN0nu+BE5M=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=b0DVWczdCIdMAFWLTK4l3Dq3OYO oM2cDFmC1Pw1rKinNXRKDTLr69zxauhWpWzoEphfmZndilylOqw6doNw/05v0iqFr50PNF GdnuJBDsSi1sQ0l2+t5OZeGkfK1Xg9fo9/5ZtT0O59bXyWYC1piOkb+m0Q037PxzsTFUU2 Z+iI= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 6979e5f6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:31 +0200 (CEST) From: soeren@soeren-tempel.net To: 72393@debbugs.gnu.org Subject: [PATCH v2 09/10] gnu: Add python-unique-log-filter. Date: Fri, 27 Sep 2024 20:35:02 +0200 Message-ID: <92cd01f98e231ab55ed8018bcba619028e400cd1.1727462103.git.soeren@soeren-tempel.net> 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-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: jgart@dismail.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Sören Tempel * gnu/packages/python-xyz.scm (python-unique-log-filter): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b07cb6c409..f56d23f93e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31033,6 +31033,36 @@ (define-public python-json-logger we can stop writing custom parsers for syslog-type records.") (license license:bsd-3))) +(define-public python-unique-log-filter + (package + (name "python-unique-log-filter") + (version "0.1.0") + (source + ;; The version on pypi does not include test files. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/twizmwazin/unique_log_filter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "036mh6nqskck2fa1q2inasqxb9wcz2p09qcpldnnffzcy1a6kzba")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "test_unique_log_filter.py"))))))) + (native-inputs (list python-flit-core)) + (home-page "https://github.com/twizmwazin/unique_log_filter") + (synopsis "Log filter that removes duplicate log messages") + (description + "This library provides a filter for the @code{logging} module +from the Python standard library which allows removing duplicate log +messages.") + (license license:bsd-2))) + (define-public python-daiquiri (package (name "python-daiquiri") From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 27 16:26:42 2024 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 20:26:42 +0000 Received: from localhost ([127.0.0.1]:54204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suHY2-0007Om-0G for submit@debbugs.gnu.org; Fri, 27 Sep 2024 16:26:42 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:9355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suHXy-0007Ob-OK for 72393@debbugs.gnu.org; Fri, 27 Sep 2024 16:26:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=hB2QuqNz pVTfFgw5yLc/3BuRraaAFLx5Bhaa5ZFGcsk=; h=in-reply-to:references:from: subject:cc:to:date; d=soeren-tempel.net; b=uLgoc2Dx0uFL2yaSMyYbYHv83hY m7MlJGaSe2eyY9nCLbLXnI64DQtgEeFnCRXQtvkRvpZuFID24yEOhFAaJ3d3NzE1tCy3Nd 27zyerWB709vsrtXpN8QNlQM2tAt9u2kLUNiw6FqCudzZL4S02grpT1YJp0gaMtmzB6tRR VFm8= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 4e6faf68 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 22:25:51 +0200 (CEST) Date: Fri, 27 Sep 2024 22:25:47 +0200 To: jgart Subject: Re: [PATCH 00/10] gnu: python-angr: Update to 9.2.112. From: =?UTF-8?Q?S=C3=B6ren?= Tempel References: <2QWWFKQJOGK76.2LQ2QUY4A7L6V@8pit.net> In-Reply-To: Message-Id: <2WW6ERY7S4270.3C5DPMUEACOAO@8pit.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 72393 Cc: 72393@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, The patch still applied cleanly for me but I still rebased it to current master and send a new revision. Keep in mind that, unfortunately, the mail order does not correspond to patch order. Let me know if there is anything I can do about that. Looking forward to your feedback on the patchset! Cheers, S=C3=B6ren "jgart" wrote: > Hi, >=20 > Could you rebase and send a v2? This patch series doesn't apply cleanly > anymore. I can take a look this coming week. >=20 > all best, >=20 > jgart From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 07 06:25:03 2024 Received: (at 72393-done) by debbugs.gnu.org; 7 Oct 2024 10:25:03 +0000 Received: from localhost ([127.0.0.1]:44973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxkvH-0002jZ-Bd for submit@debbugs.gnu.org; Mon, 07 Oct 2024 06:25:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxkvF-0002iu-QD for 72393-done@debbugs.gnu.org; Mon, 07 Oct 2024 06:25:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxkuz-00015x-GW; Mon, 07 Oct 2024 06:24:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=zKJ72N1l0om0UHUHsJlvm2AoUo3FUriS8+J08CuJgCY=; b=WKLKKRa+syzCUtOEKdMu yCTYbjOoy1VH5lTZ/b/yDoI2+hEKaZJljIoJqRIq6aC6cazqls/6gwAVM9RApRkuqaBgj4tvoyHPw PcRsPNo5TzzJnqKFNMlaZ/7ryRiLyZEdaBDFB/r70935SkmuYCUH1e/pFVziIciHYDUq2T+U9Wd2y PARowAdLCzIqDVWN94lA3GxmTvhth+RZ1jfH9cu1TxTgbVtpLo7UeFeC5rw+Qqg0g/GY+mNuVDsWw 8+ip6biCeLEbH0AVTpUkNQbdmiq6BAfhbzTqHC1AKDoGrGMDnJeq/DR2FGHJNXnmpx9RgsZcehizB KQe9Kv5Vu4yJTA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: soeren@soeren-tempel.net Subject: Re: [bug#72393] [PATCH v2 01/10] gnu: python-ailment: Update to 9.2.112. In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> (soeren@soeren-tempel.net's message of "Fri, 27 Sep 2024 20:34:54 +0200") References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> Date: Mon, 07 Oct 2024 12:24:41 +0200 Message-ID: <87r08sxlau.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 72393-done Cc: Sharlatan Hellseher , Munyoki Kilyungi , Lars-Dominik Braun , jgart@dismail.de, Marius Bakke , Tanguy Le Carrour , 72393-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi S=C3=B6ren, Applied the whole series, which got a green light on qa.guix. Thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 07 13:32:21 2024 Received: (at 72393-done) by debbugs.gnu.org; 7 Oct 2024 17:32:22 +0000 Received: from localhost ([127.0.0.1]:47766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxran-0000qW-Jo for submit@debbugs.gnu.org; Mon, 07 Oct 2024 13:32:21 -0400 Received: from mx1.dismail.de ([78.46.223.134]:2609) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxral-0000qH-2L for 72393-done@debbugs.gnu.org; Mon, 07 Oct 2024 13:32:20 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 30c66137; Mon, 7 Oct 2024 19:32:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:from:message-id:subject:to:cc :in-reply-to:references; s=20190914; bh=CKQmQKag5k8W0mqZGiK3mNcc Ijf1B1lJt14VNVANokA=; b=Fiv9Dwce0EB5ptrg3lKshyUlReZzjdW6lOwHzUGR b+xEAfM9hIj6dIPFe3eNOdiP+TMw01Iiq6t6JnciXTNTR6X36tlfpm5PxrylShJ7 QZiJEP426PagkUrdt1PGkKhSLesi4abrZnATijbD6ymAM9xCZZ9TBL8kskP7A+go pnndWT9KctJa7cj3IyaRplF4QZabDnFcDNaXjpaxkSk2LNczzntDgP5tmR9sPaqs kinWVAGslPkPurcQgqsjDoLhDBUuEP7/CrmB5UgA+dnF3cUIIRuYEy/IuGnyrQip C+767FkhjVGvRLsKErmyOI+vhgd1AVLvZS4zXZidnZNdEQ== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 690c88f7; Mon, 7 Oct 2024 19:32:03 +0200 (CEST) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id f1612126; Mon, 7 Oct 2024 19:32:03 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 5e8455c6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 7 Oct 2024 19:32:03 +0200 (CEST) MIME-Version: 1.0 Date: Mon, 07 Oct 2024 17:32:02 +0000 Content-Type: multipart/alternative; boundary="15e085c3-44d7-4b36-a2cc-8b15ced0d164-1" From: "jgart" Message-ID: <7a69fc4d4ef7099f96f5f97294a33b70a6412e5d@dismail.de> TLS-Required: No Subject: Re: [bug#72393] [PATCH v2 01/10] gnu: python-ailment: Update to 9.2.112. To: "=?utf-8?B?THVkb3ZpYyBDb3VydMOocw==?=" , soeren@soeren-tempel.net In-Reply-To: <87r08sxlau.fsf@gnu.org> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> <87r08sxlau.fsf@gnu.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 72393-done Cc: Sharlatan Hellseher , Munyoki Kilyungi , Lars-Dominik Braun , Marius Bakke , Tanguy Le Carrour , 72393-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --15e085c3-44d7-4b36-a2cc-8b15ced0d164-1 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Ludo, Thanks for helping out with this one. It is much appreciated. all best, jgart --15e085c3-44d7-4b36-a2cc-8b15ced0d164-1 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable
Hi Ludo,

<= /div>
Thanks for helping out with this one. It is much appreciated.

all best,

jgart<= br>
--15e085c3-44d7-4b36-a2cc-8b15ced0d164-1-- From unknown Tue Jun 17 01:48:52 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 05 Nov 2024 12:24:12 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator