From patchwork Sat Sep 18 16:28:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 33159 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 6F4C627BBE4; Sat, 18 Sep 2021 17:31:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0C6AA27BBE1 for ; Sat, 18 Sep 2021 17:31:00 +0100 (BST) Received: from localhost ([::1]:47562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRdEx-0008TV-4s for patchwork@mira.cbaines.net; Sat, 18 Sep 2021 12:30:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRdE4-0008Sc-6G for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53343) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRdE3-0001JA-8q for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mRdE3-0004ok-51 for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v4 1/3] licenses: Add Expat No Attribution license. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 16:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48702@debbugs.gnu.org Cc: Xinglu Chen Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.163198255618409 (code B ref 48702); Sat, 18 Sep 2021 16:30:03 +0000 Received: (at 48702) by debbugs.gnu.org; 18 Sep 2021 16:29:16 +0000 Received: from localhost ([127.0.0.1]:36651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdDH-0004mk-3S for submit@debbugs.gnu.org; Sat, 18 Sep 2021 12:29:15 -0400 Received: from out2.migadu.com ([188.165.223.204]:15909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdD1-0004lm-DA for 48702@debbugs.gnu.org; Sat, 18 Sep 2021 12:29:04 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1631982538; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=NlF3c09BBj7U8ZWQLtgYCBU90u352zHRUEvOs0sCuQk=; b=OUxf5Mc6RMcorlum4saE3HLBg/pb/MyRSUZv42SobtJ9CAL6+Q+EJ9GQjA6wygDsn1R6Mb geZGb3/+uhXXMakPg78ysCGhLNBjG1aoQvNI1U4BOnhzSHe8oPGhxWuoC6Kxgo1WaNX2fO fKdHra5qgrOImrk7vcKL22IO7nN0lkktVgkSqn1XH+COzfvCutlokMS3OodioexSRl9T3T vfImANZFAY+SyZc8xeNCNc22SzJyI7e8ssF5ox1SXcc0w7RrEOkERvIWzn1lRwC+A+30YB hh6BXlbq9LBrbc6f2iRvp92NuEILZo/nIp2WWM7HwO3oIv7RRn8uVXvWmwgnFQ== From: Kyle Meyer Date: Sat, 18 Sep 2021 12:28:51 -0400 Message-Id: <20210918162853.25997-2-kyle@kyleam.com> In-Reply-To: <20210918162853.25997-1-kyle@kyleam.com> References: <20210717130941.25146-1-kyle@kyleam.com> <20210918162853.25997-1-kyle@kyleam.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@kyleam.com 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" X-getmail-retrieved-from-mailbox: Patches * guix/licenses.scm (expat-0): New variable. * guix/import/utils.scm (spdx-string->license): Add MIT-0. --- guix/import/utils.scm | 2 ++ guix/licenses.scm | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index a180742ca3..02ddb6783e 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -162,6 +163,7 @@ (define (spdx-string->license str) ("CPL-1.0" 'license:cpl1.0) ("EPL-1.0" 'license:epl1.0) ("MIT" 'license:expat) + ("MIT-0" 'license:expat-0) ("FTL" 'license:freetype) ("GFDL-1.1" 'license:fdl1.1+) ("GFDL-1.2" 'license:fdl1.2+) diff --git a/guix/licenses.scm b/guix/licenses.scm index c071aae4a9..fc4077fc85 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Noisytoot +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,7 @@ (define-module (guix licenses) epl1.0 epl2.0 eupl1.2 - expat + expat expat-0 freetype freebsd-doc giftware @@ -313,6 +314,13 @@ (define expat "http://directory.fsf.org/wiki/License:Expat" "https://www.gnu.org/licenses/license-list.html#Expat")) +(define expat-0 + (license "Expat No Attribution" + ;; Note: There is a later formulation of the same license at + ;; . + "https://romanrm.net/mit-zero" + "Expat license with the attribution paragraph removed.")) + (define freetype (license "Freetype" "http://directory.fsf.org/wiki/License:Freetype" From patchwork Sat Sep 18 16:28:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 33160 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 455EB27BBE3; Sat, 18 Sep 2021 17:31:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D0BA027BBE1 for ; Sat, 18 Sep 2021 17:31:00 +0100 (BST) Received: from localhost ([::1]:47564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRdEx-0008TW-Sv for patchwork@mira.cbaines.net; Sat, 18 Sep 2021 12:30:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRdE4-0008Se-6H for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53344) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRdE3-0001Jm-RL for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mRdE3-0004os-NW for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v4 2/3] gnu: Add patatt. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 16:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48702@debbugs.gnu.org Cc: Xinglu Chen Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.163198255618416 (code B ref 48702); Sat, 18 Sep 2021 16:30:03 +0000 Received: (at 48702) by debbugs.gnu.org; 18 Sep 2021 16:29:16 +0000 Received: from localhost ([127.0.0.1]:36653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdDI-0004ms-0p for submit@debbugs.gnu.org; Sat, 18 Sep 2021 12:29:16 -0400 Received: from out2.migadu.com ([188.165.223.204]:15933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdD3-0004lv-6x for 48702@debbugs.gnu.org; Sat, 18 Sep 2021 12:29:04 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1631982540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SWGmQo2yeczmFvDtGZtupDobLTcmnwrA9QCreHapR04=; b=L5ohM0aMmji2W7Xz2dK1WEkTAtRuw90qEooaS6dw4tG0hY736zmcY4tSiiYBmQiNT1WZEP 9Qc783bp5myp/iAtyasKgJhRQwSPmN5ovtiGZw4NjHpOhjZqr++OqioChV4buAWfTzFrm6 g684EqnOsu7E/BIBQVClgf5TBtHj02KfnFWREwMpjFgv+tZxIExD0XzHNR1x93MdjfFdKv XKgGtGrElg1cyXGsk/NydwgVoCDJIcS/kqeZnRYSPumursruKgvesFrsLRApicwYL6rR5l 0VTgsO8DjDlWoBkkhOqXxkGtYd9WcqJavC2042mhEQvEJNIoyEceMq0c3/k5/Q== From: Kyle Meyer Date: Sat, 18 Sep 2021 12:28:52 -0400 Message-Id: <20210918162853.25997-3-kyle@kyleam.com> In-Reply-To: <20210918162853.25997-1-kyle@kyleam.com> References: <20210717130941.25146-1-kyle@kyleam.com> <20210918162853.25997-1-kyle@kyleam.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@kyleam.com 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (patatt): New variable. --- gnu/packages/version-control.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fe84601372..594a2c2003 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -111,6 +111,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) @@ -2500,6 +2501,28 @@ (define-public grokmirror based on a manifest file published by servers.") (license license:gpl3+))) +(define-public patatt + (package + (name "patatt") + (version "0.4.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "patatt" version)) + (sha256 + (base32 "1jj3c2rc5lzgsk3x2bq1295g7h59y9y8vi9a0gzqh3aqka00zqak")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs + `(("python-pynacl" ,python-pynacl))) + (home-page "https://git.kernel.org/pub/scm/utils/patatt/patatt.git") + (synopsis "Tool for cryptographic patch attestation") + (description "This utility provides end-to-end cryptographic attestation +of patches sent via mail. It does so by adapting the DKIM email signature +standard to include cryptographic signatures via the X-Developer-Signature +email header.") + (license license:expat-0))) + (define-public b4 (package (name "b4") From patchwork Sat Sep 18 16:28:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 33161 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 1E94D27BBE3; Sat, 18 Sep 2021 17:31:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D90D927BBE1 for ; Sat, 18 Sep 2021 17:31:09 +0100 (BST) Received: from localhost ([::1]:48180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRdF6-0000cp-Uk for patchwork@mira.cbaines.net; Sat, 18 Sep 2021 12:31:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRdE4-0008Sf-GF for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRdE4-0001K6-7i for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mRdE4-0004oz-4V for guix-patches@gnu.org; Sat, 18 Sep 2021 12:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH v4 3/3] gnu: b4: Update to 0.8.0. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 16:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48702@debbugs.gnu.org Cc: Xinglu Chen Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.163198255718424 (code B ref 48702); Sat, 18 Sep 2021 16:30:04 +0000 Received: (at 48702) by debbugs.gnu.org; 18 Sep 2021 16:29:17 +0000 Received: from localhost ([127.0.0.1]:36655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdDI-0004mz-8n for submit@debbugs.gnu.org; Sat, 18 Sep 2021 12:29:17 -0400 Received: from out2.migadu.com ([188.165.223.204]:15943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdD4-0004mF-RD for 48702@debbugs.gnu.org; Sat, 18 Sep 2021 12:29:04 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1631982542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/XY7nVvGoBwS8Uy9wajPYhYszZBfKb4BT/WCgi5My9g=; b=QP1ErdhPD/PycjnJbTOw698rLuptTKE83KKcgb+aTNf6eYCVEak37Cj7nmbXYeDMIEdDVR zv7NlvyQygYXF9f5UDYBqMCpMy5I1TLhlLj3de4iwjcYUDXIyZbga6CKrXwraxjvyaw9tC ++ZqqHL7X+IMeMId4RVzfCUe0hJ4+Ifpt43MBnQRc37DRB7NWPvL7h+cn0HnNPv0+W2E4R TNRs8vRDpTXncmP3fXGKCNRpLjofaJbuM28EAxOTStIZi83fchVOT6Z01cHxYyPDG/xeko ePbeefgGE9U+fa9bj+ULcM11gGe1yOluDmytHz5aELOoN4QkfNtMR9NtbJVJwQ== From: Kyle Meyer Date: Sat, 18 Sep 2021 12:28:53 -0400 Message-Id: <20210918162853.25997-4-kyle@kyleam.com> In-Reply-To: <20210918162853.25997-1-kyle@kyleam.com> References: <20210717130941.25146-1-kyle@kyleam.com> <20210918162853.25997-1-kyle@kyleam.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@kyleam.com 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (b4): Update to 0.8.0. [propagated-inputs]: Add patatt. [source]: Drop snippet for issue that is now fixed upstream. --- gnu/packages/version-control.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 594a2c2003..e8b52d1b19 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2526,27 +2526,21 @@ (define-public patatt (define-public b4 (package (name "b4") - (version "0.6.2") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "b4" version)) (sha256 - (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fixes issue with dependency requirements being too strict. See upstream commit: - ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=31348a14afdb1d39e7faf9576eaddea1ced76e19 - (substitute* "setup.py" - (("~=") ">=")) - #t)))) + (base32 "115ysciq15sxc8fd9hf7p0f4wnd5xapcfkmq8g33y1c8nbdxclbx")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs `(("python-dkimpy" ,python-dkimpy) ("python-dnspython" ,python-dnspython) ("python-requests" ,python-requests))) + (propagated-inputs + `(("patatt" ,patatt))) (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git") (synopsis "Tool for working with patches in public-inbox archives") (description