From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WJB9HMgTF2KPVAAAgWs5BA (envelope-from ) for ; Thu, 24 Feb 2022 06:12:40 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KBo/FcgTF2LgWgAAG6o9tA (envelope-from ) for ; Thu, 24 Feb 2022 06:12:40 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DE39643DD5 for ; Thu, 24 Feb 2022 06:12:39 +0100 (CET) Received: from localhost ([::1]:57916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nN6Qg-0001ll-UL for larch@yhetil.org; Thu, 24 Feb 2022 00:12:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nN6Q7-0001ka-QP for guix-patches@gnu.org; Thu, 24 Feb 2022 00:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53263) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nN6Q6-0001JO-JC for guix-patches@gnu.org; Thu, 24 Feb 2022 00:12:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nN6Q6-0000Pp-GJ for guix-patches@gnu.org; Thu, 24 Feb 2022 00:12:02 -0500 Subject: bug#49851: [PATCH] gnu: Add libiscsi. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 24 Feb 2022 05:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 49851 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ron Nazarov Cc: 49851-done@debbugs.gnu.org Mail-Followup-To: 49851@debbugs.gnu.org, maxim.cournoyer@gmail.com, noisytoot@disroot.org Received: via spool by 49851-done@debbugs.gnu.org id=D49851.16456794671500 (code D ref 49851); Thu, 24 Feb 2022 05:12:02 +0000 Received: (at 49851-done) by debbugs.gnu.org; 24 Feb 2022 05:11:07 +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 1nN6PD-0000O7-4c for submit@debbugs.gnu.org; Thu, 24 Feb 2022 00:11:07 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:41554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nN6PA-0000NN-RR for 49851-done@debbugs.gnu.org; Thu, 24 Feb 2022 00:11:05 -0500 Received: by mail-qv1-f45.google.com with SMTP id x3so1870381qvd.8 for <49851-done@debbugs.gnu.org>; Wed, 23 Feb 2022 21:11:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=9wueoufIDNFEL4jVrYIsMMMUMVo0Aw48y/gAvyxVWKc=; b=jpL9Z5+ueKdmceY/lSC+rzfV5BQL2M3xYDD0/M9NfpaBMQQ/jWCVeSpfEMC1v5XOpk 2CZeNE/6ey14SFGzZG2XLd7uZM7e3H/uBtRZMUKJDSZzyS80gc+tydYP1a9zUBZMTe7W y1b6c1bSmH/d7EC8MMKCBqcwI2+ZHEqZp9mL3iKudXlD1lwEloX8k34ku4sO8dRkCtjM AeCpMNjuBuPhwyAJkBT5vusCTXwXWkGAC4TxicnBWmLvHJb5/0PIQeaYd8r9c1rdq3zI lI+fVVlRIDlONX5HzU+y0tDbp2eJr0OFuXNih1lK2Mj8YARxiPKRtJaHc9jZhHPAcrvm UR4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=9wueoufIDNFEL4jVrYIsMMMUMVo0Aw48y/gAvyxVWKc=; b=PHSFae1H63vO0YRDKEb1m0AfU5ie/m/hocNo6JbFuuya4fvuXHc5ef2zyFyGPmJhKM 9so5y0uaLniokQuo0LvYh9eaQbXg0Ni2cmmJlZ2Iaq588WCBxbPSyCo9fc0W3LwoR3DW 3Qt5Vyc+cgKbKWEqxhFNiVxaDe6R7oCeqt1TZVbfWmw5rNfJ9YTgRTwvLb9gIuOpGXh4 qmj4CZM00PXPLi1ClI6FmEZX6PKuOf0oaAzRzWACi4x9bvsPu3hAZJA+5nCuqabFdRNC QAVsHGqHpg5ZnUXyEHiOYIGR0DKkIVn3Z2hClD9EVhuAUeKHDs0WevN7R/+pA1P3N8GC 6AyQ== X-Gm-Message-State: AOAM531my3T5q3ssd8oLkdLPK9+8jr26GcCGWZ6rE47KccHnXwzIO7dV NtiA4qVJ8+c+Igj/3n/ursn4tbVM83fpIA== X-Google-Smtp-Source: ABdhPJxMQLk9Pj51+C2OlUzT2WZ6stPeUbCx7ajjtzHPHMcrcddadTaP2LkSikiz2YjueZlOJ8cBJw== X-Received: by 2002:a05:622a:1b8d:b0:2c6:59a9:360e with SMTP id bp13-20020a05622a1b8d00b002c659a9360emr855145qtb.678.1645679458843; Wed, 23 Feb 2022 21:10:58 -0800 (PST) Received: from hurd (dsl-156-1.b2b2c.ca. [66.158.156.1]) by smtp.gmail.com with ESMTPSA id x134sm832447qkb.92.2022.02.23.21.10.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 21:10:58 -0800 (PST) From: Maxim Cournoyer References: <20210803230454.8933-1-noisytoot@disroot.org> Date: Thu, 24 Feb 2022 00:10:57 -0500 In-Reply-To: <20210803230454.8933-1-noisytoot@disroot.org> (Ron Nazarov's message of "Wed, 4 Aug 2021 00:04:54 +0100") Message-ID: <871qzsluhq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645679560; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9wueoufIDNFEL4jVrYIsMMMUMVo0Aw48y/gAvyxVWKc=; b=OzbcQy9r1Lj8qsZjzq8ZenJoCrYi/y5I0f6Sh5lDZzpbabGjr3JNSyx4MUkfshDWr616Tg xGcYSbxdbzv69pRWt6+FjH/iEDYV+lv8/c+E5hhM/XsVPWe44jN92rQKaVctH4Cm6cipaE 1JZR6bD3HThCf9bDakHEzkOKXclsac9NSbiuxoFgEqhZhaE9A3aW0Y3H3zCy0Av4onfeBC TiMQqpJVVaNEYFdJrYyCCM2XtBDipBhwkkykwdXQgwQj2LiPgX769BCWw//rRvi9czPZsw fFH62F4hHWMAoHGttYt/1h0jYj1zaU3kygpaCReuixUqbrs3q6j04xAdA+7soA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645679560; a=rsa-sha256; cv=none; b=kPfqzBH/OlW6q6HvayZgUJwZq7fg2uR9IQ5ZKmRIk5XGTJAWiT5DIWoU//Q8n+6ucxZqCi AoBYZFirDbV5kc/HX/c5xh5ltdC4SdbQ1JATBuLuAnW3I2lfentW3VcEJCJFgc4py4dvF+ R/XuZVV8HkLYt3JbMgb6VI/2L49piT01OGNSnnlpSVKBwLupZo5oGJqQXynwPEjFMPPXPu EnB33L6ZpSYRZ1GTEKGyb5e/RzAIDouMAO9NzY9kAl7oBdMPt+mhBvErugM1EC9qwZGi6Q Nqf3cAFYU6QW45lQlyCGzwPq5s1RoRMsm+csbZoV2jUr3tmPse6FwOpuuPeteQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=jpL9Z5+u; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=jpL9Z5+u; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: DE39643DD5 X-Spam-Score: -2.53 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3lx/rS2k17YD Hello! Ron Nazarov writes: > * gnu/packages/scsi.scm (libiscsi): New variable. > --- > gnu/packages/scsi.scm | 34 ++++++++++++++++++++++++++++++++-- > 1 file changed, 32 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm > index 4c3bfd7e33..ae4f60c10d 100644 > --- a/gnu/packages/scsi.scm > +++ b/gnu/packages/scsi.scm > @@ -1,6 +1,7 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2016 Chris Marusich > ;;; Copyright =C2=A9 2018, 2020, 2021 Tobias Geerinckx-Rice > +;;; Copyright =C2=A9 2021 Noisytoot > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -19,10 +20,12 @@ >=20=20 > (define-module (gnu packages scsi) > #:use-module ((guix licenses) > - #:select (gpl2+ bsd-2 bsd-3)) > + #:select (gpl2+ bsd-2 bsd-3 lgpl2.1+)) > #:use-module (guix packages) > #:use-module (guix download) > - #:use-module (guix build-system gnu)) > + #:use-module (guix git-download) > + #:use-module (guix build-system gnu) > + #:use-module (gnu packages autotools)) >=20=20 > (define-public sg3-utils > (package > @@ -65,3 +68,30 @@ used in C and C++ programs to interact with SCSI devic= es.") > ;; various source code files refer to a file called "BSD_LICENSE" = [...]." > ;; Some files (like sg_compare_and_write.c) retain their 3-clause he= aders! > (license (list gpl2+ bsd-2 bsd-3)))) > + > +(define-public libiscsi > + (package > + (name "libiscsi") > + (version "1.19.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/sahlberg/libiscsi") > + (commit version))) > + (sha256 > + (base32 > + "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7")) > + (file-name (git-file-name name version)))) > + (build-system gnu-build-system) > + (native-inputs > + `(("autoconf" ,autoconf) > + ("automake" ,automake) > + ("libtool" ,libtool))) > + (synopsis "Client-side library for iSCSI") > + (description "Libiscsi is a client-side library to implement > +the iSCSI protocol that can be used to access the resources of an iSCSI = target. > +It is fully asynchronous with regards to iSCSI commands and SCSI tasks, > +but a synchronous layer is also provided for ease of use for simpler app= lications.") > + (home-page "https://github.com/sahlberg/libiscsi") > + (license (list gpl2+ lgpl2.1+)))) Well done! I've modified it a bit like so: modified gnu/packages/scsi.scm @@ -87,14 +87,16 @@ (define-public libiscsi "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7")) (file-name (git-file-name name version)))) (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + (native-inputs (list autoconf automake libtool)) For the new style inputs. (synopsis "Client-side library for iSCSI") - (description "Libiscsi is a client-side library to implement -the iSCSI protocol that can be used to access the resources of an iSCSI ta= rget. -It is fully asynchronous with regards to iSCSI commands and SCSI tasks, -but a synchronous layer is also provided for ease of use for simpler appli= cations.") + (description "Libiscsi is a client-side library to implement the iSCSI +protocol that can be used to access the resources of an iSCSI target. It = is +fully asynchronous with regards to iSCSI commands and SCSI tasks, but a +synchronous layer is also provided for ease of use for simpler applications.") Re-flowed the text in Emacs. (home-page "https://github.com/sahlberg/libiscsi") - (license (list gpl2+ lgpl2.1+)))) + (license (list + ;; For the src, examples and test-tool directories, except + ;; src/ld_iscsi.c. + gpl2+ + ;; For the lib and include directories. + lgpl2.1+)))) Added explanatory comments for the licenses. And pushed as bf827d6465. Thank you! Maxim