From patchwork Wed Jul 5 16:34:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 51577 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 33D3B27BBEA; Wed, 5 Jul 2023 17:43:35 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 9401327BBE2 for ; Wed, 5 Jul 2023 17:43:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qH5au-00081z-Sc; Wed, 05 Jul 2023 12:43:09 -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 1qH5ap-0007yh-O9 for guix-patches@gnu.org; Wed, 05 Jul 2023 12:43:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qH5ap-0005Hg-97 for guix-patches@gnu.org; Wed, 05 Jul 2023 12:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qH5ao-0003LO-DJ for guix-patches@gnu.org; Wed, 05 Jul 2023 12:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64483] [PATCH 2/2] gnu: mactelnet: Unbundle uthash. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jul 2023 16:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64483@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 64483-submit@debbugs.gnu.org id=B64483.168857532312785 (code B ref 64483); Wed, 05 Jul 2023 16:43:02 +0000 Received: (at 64483) by debbugs.gnu.org; 5 Jul 2023 16:42:03 +0000 Received: from localhost ([127.0.0.1]:38873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qH5Zr-0003K7-32 for submit@debbugs.gnu.org; Wed, 05 Jul 2023 12:42:03 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:55482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qH5Zp-0003Ji-7h for 64483@debbugs.gnu.org; Wed, 05 Jul 2023 12:42:01 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id B257F209E5 for <64483@debbugs.gnu.org>; Wed, 5 Jul 2023 18:41:59 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4CC0A80060; Wed, 5 Jul 2023 18:34:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id L7h-NmRLASS4; Wed, 5 Jul 2023 18:34:21 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B3D7A80098; Wed, 5 Jul 2023 18:34:21 +0200 (CEST) From: Bruno Victal Date: Wed, 5 Jul 2023 17:34:05 +0100 Message-Id: <4ba2f134cc5154666c5e5b19710cbd42d9642da8.1688574761.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 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: , 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 * gnu/packages/admin.scm (mactelnet)[source]: Unbundle uthash. [inputs]: Add uthash. [license]: Remove bsd-2. --- gnu/packages/admin.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bbcd364dad..c1bcdb01b4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -114,6 +114,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages datastructures) #:use-module (gnu packages dns) #:use-module (gnu packages elf) #:use-module (gnu packages file) @@ -5866,12 +5867,19 @@ (define-public mactelnet (sha256 (base32 "1z63dz22crrvrm0sh2cwpyqb7wqd9m45m6f2641mwmyp6hcpf4k4")) - (patches (search-patches "mactelnet-remove-init.patch")))) + (patches (search-patches "mactelnet-remove-init.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file "src/utlist.h") + (substitute* (find-files "src/" "\\.c$") + (("\"utlist\\.h\"") "")))))) (build-system gnu-build-system) (arguments (list #:tests? #f)) ; no tests (native-inputs (list autoconf automake gettext-minimal)) + (inputs (list uthash)) (synopsis "MAC-Telnet utilities for communicating with RouterOS devices") (description "This package provides an implementation of the MAC-Telnet protocol used by RouterOS devices. It provides the following commands: @@ -5890,6 +5898,4 @@ (define-public mactelnet (list license:gpl2+ ;; Note: applies to src/md5.{c,h} ;; This file is likely to be gone in the next release. - license:zlib - ;; Bundled uthash-1.9.9. - license:bsd-2)))) + license:zlib))))