From patchwork Thu May 15 03:43:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 42616 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E64B327BC4B; Thu, 15 May 2025 04:45:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3721627BC49 for ; Thu, 15 May 2025 04:45:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFPWu-0004BL-Bc; Wed, 14 May 2025 23:45:08 -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 1uFPWq-00048R-Sz for guix-patches@gnu.org; Wed, 14 May 2025 23:45:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFPWq-0003EQ-Jt for guix-patches@gnu.org; Wed, 14 May 2025 23:45:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=TXoqxxtPRvAcyE21NPAxanXh2COgBSb0PIO0kV87U18=; b=VkWinkevUQGDoc1eCmWmlTgzw5EBn8EBMPkyv8lOmb7GghO/4tTjJT5DpLQxydW/9sd1t42Q3U55l65akbUfEUO/DK/AoJpj6TTHCeaaN56CRAyufqzudxkJAU+mEquUr75M7750fMk/0drCwZhpX3xVnay5MyB2JJb3U5i8tQidKFV7nAMg1iNRmnsA4scm32fCC5bHbiiJu7AP68XAEwEdy6CIbzJqTCjWGjdN6GxNbI5G168NBMB3RHs9Ii9ealtues38GIxgjwKTK6TAPDybalZuIOVO1jkk6HGsW2OhKR2EqTpoThaOdnldOaU0s6HZtyaJ7af0POQvo94OMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uFPWq-00020x-FY for guix-patches@gnu.org; Wed, 14 May 2025 23:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78434] [PATCH 3/3] gnu: Init sqlelf Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 May 2025 03:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78434@debbugs.gnu.org Cc: Raven Hallsby Received: via spool by 78434-submit@debbugs.gnu.org id=B78434.17472806877625 (code B ref 78434); Thu, 15 May 2025 03:45:04 +0000 Received: (at 78434) by debbugs.gnu.org; 15 May 2025 03:44:47 +0000 Received: from localhost ([127.0.0.1]:48760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFPWU-0001yf-1h for submit@debbugs.gnu.org; Wed, 14 May 2025 23:44:47 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]:43414) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uFPWQ-0001xp-VH for 78434@debbugs.gnu.org; Wed, 14 May 2025 23:44:40 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3db6cda65efso5976565ab.1 for <78434@debbugs.gnu.org>; Wed, 14 May 2025 20:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1747280673; x=1747885473; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TXoqxxtPRvAcyE21NPAxanXh2COgBSb0PIO0kV87U18=; b=QnQc6qs9uRjJ6B0rvDyGeMhl+9Wsf40CTFZsFz+a8uXb3aARdLIX8jCuSfmF46+N/M GscvC8I89j0JmBKJWWme2PxarQdwqpxtN3bzeT2h3Z0GqS9j3RNMUA4RI0lkfPd1UhvW KJ2if12CjGinO58614nTcKLwLvb7ai5omxdube1mXx6oCCIqkZ+q0pxNwRllyazxUfCz A0k2dlk053/xf7iUXX0rL5VENgZT1gWqL/4U0TNGlqJih2c5cI+9WoV5a3jJGJjAeA1A L8oye7fHqjZkryKk5K5hsJHJJS2yRrbp3qkWHlqi7XcyAfwnXKMu+tjE7OVqNYbXe7Ti v+Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747280673; x=1747885473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TXoqxxtPRvAcyE21NPAxanXh2COgBSb0PIO0kV87U18=; b=OuOy2DrTWSE9iHroJ9UScIN6IhEVx82QYG2eVBOcuhJk7Xf2h67DKvhqchGfZk/roo CgFNTiRs+TnkDTMpYcB1YKh7hD4DMEnZnsZgSWzjFaD40mxeszV/w2bNEYtUqhB7U0/D B2VBzUEBNE5HPb6wQ+qPNi8GBkisw3Gk76wGzDNciU3I3xErK8ib3gzbmr7XJFf2m8zp 0qm+jEB42Sy1XsOwn8Cgh+qew9BRomCg5tm5w01GiV3VAepvIT8Wi6pFN9tz6yhD0FLi wI9biok3pHqo9fkASl2pcS3MtuyNpVVy7Va7d1OXYnwMHsU4J+NlzkA/OuTSlbTXQCxS pStw== X-Gm-Message-State: AOJu0YywqHUSF8QyVW75VfDC/CSmwI8F1pVnIh6dFlssdEBz/uVUJ8pc aLQtbcqN0AogGNAL9QBwVEFuPFOQN4o2VIwXaJcxnYZ+yTBQj8duNhIr/9f5fUTlhlBm3T7LIeC 0RYg= X-Gm-Gg: ASbGnctuCgJ8sA3XSumdEnMCi+7DdUAyUAL8EKqQ4qpko4ZxKev03W84pIpSuvLHDVc w+G18fGJzDKOcDKF+/h35PTaEQKOyqpj16NYYsIvjQJhbS+pHPTLQEFrPnI48uvuOJLxpUXAML3 SuhAcIbfFVA0iVpWyfrxhZesFGTuzihoNIOUPM4pwMVly5qujyrVrvB/MeEOQoQj4wniHHQ84jX HLBkL/euujm7DGBCoOn0agsll+8/9n1wrhQ3DPUJtQ9kvHTIplXY7YnqTdEqQmfu1lz0TLbFAOW xO5WO32li76/iDk2jJWY+FuUeWfRpfnp3UQN9wJetSxyww3ZZMgKa1pXWXJ7+VyUbrM= X-Google-Smtp-Source: AGHT+IGSikTJwmpHGF22NIhwXKZ2urq+sii6rw3ECDO10skgbvQvXFzpjYajXJFmTGdrBxPkyuRA3Q== X-Received: by 2002:a05:6e02:1a6e:b0:3d4:346e:8d49 with SMTP id e9e14a558f8ab-3db778fd61amr25584325ab.9.1747280672582; Wed, 14 May 2025 20:44:32 -0700 (PDT) Received: from Karl-Desktop.raven ([207.237.222.72]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3da7e158a0esm37148415ab.53.2025.05.14.20.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 20:44:31 -0700 (PDT) Date: Wed, 14 May 2025 22:43:26 -0500 Message-ID: <983934a84e58d4a8c7407c9253f46c6c637aff14.1747280060.git.karl@hallsby.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Raven Hallsby Change-Id: I45bfb48e4f4c11dc97ec642a5248420b9ec8d75d --- gnu/packages/elf.scm | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 7b769770f83..2745f8cb124 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Daniel Maksymow ;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2025, Raven Hallsby ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,16 +37,25 @@ (define-module (gnu packages elf) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) - #:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl3+ lgpl2.0+ lgpl2.1 gpl2 bsd-2)) + #:use-module (guix build-system pyproject) + #:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl3+ lgpl2.0+ lgpl2.1 gpl2 bsd-2 expat)) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages check) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) + #:use-module (gnu packages engineering) #:use-module (gnu packages gcc) #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages xml) #:use-module (srfi srfi-1) @@ -424,3 +434,67 @@ (define-public libdwarf debugging information format.") ;; See https://www.prevanders.net/dwarflicense.html: (license (list lgpl2.1 gpl2 bsd-2)))) + +(define-public sqlelf + ;; Some fixes since last tagged release + (let ((commit "a87e97c17550a0415a961fde0164352f171e7f52") + (revision "0")) + (package + (name "sqlelf") + (version (git-version "0.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fzakaria/sqlelf") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f5d1dgnphqigy03lw6wjrgmij77y146whglxbixqm67wm7w8a43")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Remove vendored version of elftools + (delete-file-recursively "sqlelf/_vendor") + (substitute* "sqlelf/elf.py" + (("sqlelf\\._vendor\\.elftools") "elftools")) + ;; Fix slighly incorrect pyproject.toml so that setuptools + ;; installs a source submodule into the wheel. + (substitute* "pyproject.toml" + (("packages = \\[\\\"sqlelf\\\"\\]") + "packages = [\"sqlelf\", \"sqlelf.tools\"]")))))) + (build-system pyproject-build-system) + (arguments + '(#:tests? #t + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-test-bins + (lambda* (#:key inputs #:allow-other-keys) + (let ((ls (string-append (assoc-ref inputs "coreutils") "/bin/ls")) + (sh (string-append (assoc-ref inputs "bash") "/bin/sh"))) + ;; Replace hard-coded /bin/sh with one from the Store. + (format #t "Replace /bin/sh with ~a~%" sh) + (substitute* "tests/test_cli.py" + (("/bin/sh") sh)) + ;; Tell check phase where to find 'ls' in the store for tests. + (format #t "Set $TEST_BINARY to ~a~%" ls) + (setenv "TEST_BINARY" ls))))))) + (native-inputs + (list python-apsw + bash-minimal ; Needed for /bin/sh replacement in tests + capstone + python-capstone + python-lief ; MUST use python-lief 0.14.1 + python-pyelftools + python-pytest + python-setuptools + python-sh + python-wheel)) + (inputs + (list sqlite)) + (home-page "https://github.com/fzakaria/sqlelf") + (synopsis "Explore ELF objects through the power of SQL") + (description + "A tool that utilizes SQLite's virtual table functionality to allow you to explore Linux ELF objects through SQL.") + (license expat))))