From patchwork Thu May 27 14:54:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 29627 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 ACA5227BC81; Thu, 27 May 2021 15:55:41 +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_H4,RCVD_IN_MSPIKE_WL,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 5FECA27BC78 for ; Thu, 27 May 2021 15:55:41 +0100 (BST) Received: from localhost ([::1]:55046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmHQC-0002bn-Ks for patchwork@mira.cbaines.net; Thu, 27 May 2021 10:55:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmHPa-0002aw-QF for guix-patches@gnu.org; Thu, 27 May 2021 10:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmHPa-0005wI-IP for guix-patches@gnu.org; Thu, 27 May 2021 10:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lmHPa-0008CA-HT for guix-patches@gnu.org; Thu, 27 May 2021 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH 1/3] licenses: Add Expat No Attribution license. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 May 2021 14:55:02 +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 Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.162212729831473 (code B ref 48702); Thu, 27 May 2021 14:55:02 +0000 Received: (at 48702) by debbugs.gnu.org; 27 May 2021 14:54:58 +0000 Received: from localhost ([127.0.0.1]:52576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmHPQ-0008BG-DL for submit@debbugs.gnu.org; Thu, 27 May 2021 10:54:57 -0400 Received: from out1.migadu.com ([91.121.223.63]:64784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmHPN-0008B4-Ta for 48702@debbugs.gnu.org; Thu, 27 May 2021 10:54:51 -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=1622127288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BAkqsDE6NvT4VYmz4inOUQmlUnNxi2GIiRcvGzwuFW8=; b=nb2b+vtO9rh/OmPtmDLjtIRhGe7OJzyml9aiuOIO3VnHCwU4PPkmPNGMg3ovdmdzysFCBa luRxLQFO25Knil9y/qD5eNJWcDTb0kgIOFMkBqPoxn131KEQm0YHxsRoXyNm8iqjKQjSb8 pEMSOnTmENTNSTiVYflbaNPQRU9OFF3+lqM3OG2ZrV9ync0bfuyrAMshKWpQTi3/jAmQry Qd5nzAKhABcnoeIa4Nc8+C8ugi3Izn99xLddhZl/mhru4egB0RFotGxxxUrVmmZ1hdIMJL uCEBw+8mwc5raNCJgQaf+jpejXATLCrNwW/lPDE75/S5QiFck8tcxZ2w64KP+g== From: Kyle Meyer Date: Thu, 27 May 2021 10:54:19 -0400 Message-Id: <20210527145421.11903-1-kyle@kyleam.com> In-Reply-To: <20210527145046.11773-1-kyle@kyleam.com> References: <20210527145046.11773-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 d817318a91..22d558cf09 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -155,6 +156,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 4718ccf83f..6e3bc5f488 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 André Batista ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +56,7 @@ (define-module (guix licenses) edl1.0 epl1.0 epl2.0 - expat + expat expat-0 freetype freebsd-doc giftware @@ -306,6 +307,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 Thu May 27 14:54:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 29629 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 8A7D827BC81; Thu, 27 May 2021 16:08:36 +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_H4,RCVD_IN_MSPIKE_WL,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 5876C27BC78 for ; Thu, 27 May 2021 16:08:36 +0100 (BST) Received: from localhost ([::1]:49700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmHch-0002UB-H2 for patchwork@mira.cbaines.net; Thu, 27 May 2021 11:08:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmHPb-0002bA-GY for guix-patches@gnu.org; Thu, 27 May 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmHPa-0005wx-V5 for guix-patches@gnu.org; Thu, 27 May 2021 10:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lmHPa-0008CH-U2 for guix-patches@gnu.org; Thu, 27 May 2021 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH 2/3] gnu: Add patatt. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 May 2021 14:55:02 +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 Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.162212729831480 (code B ref 48702); Thu, 27 May 2021 14:55:02 +0000 Received: (at 48702) by debbugs.gnu.org; 27 May 2021 14:54:58 +0000 Received: from localhost ([127.0.0.1]:52582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmHPV-0008Ba-W3 for submit@debbugs.gnu.org; Thu, 27 May 2021 10:54:58 -0400 Received: from out2.migadu.com ([188.165.223.204]:32869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmHPQ-0008BE-KJ for 48702@debbugs.gnu.org; Thu, 27 May 2021 10:54:53 -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=1622127291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NBDyOxUgHzwFBWbtiKbtLjSI64o1Y4jXvXJHqa68yt4=; b=oVgyuJ6T56culkefBBqCjOijioAtfoZpglVkmxsBcqVXbIM/iwEGE/HkpCbV2LqjnCe514 2prAbl0GUPeP5tS/S8W00RXyH5hRta4HO9qjZ0Pjt5rCYr0fhnxWibdGWCWTqYSQ7RoFMS bb2kI+8EnXJaMO4qRCO21jZdylGkkb49atCq0pJkXiVJ/K5vfMvckd3ud2Mu5lUNoWJV6p uCxLH5I5fRhWB4XxMfaL54QQwvL8D6jK+bmdB9DLpnq8C3zzKTT37L72BTjFZ3qWnrr5Xv gbOdWujoxcNNqf6IZ0CIMHUMCpuLLX2pi7jCMJkM6r1L3lPuLbma8xR0GH3ghQ== From: Kyle Meyer Date: Thu, 27 May 2021 10:54:20 -0400 Message-Id: <20210527145421.11903-2-kyle@kyleam.com> In-Reply-To: <20210527145046.11773-1-kyle@kyleam.com> References: <20210527145046.11773-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 80842ecf0c..6d555c16d9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -109,6 +109,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) @@ -2422,6 +2423,28 @@ (define-public grokmirror based on a manifest file published by servers.") (license license:gpl3+))) +(define-public patatt + (package + (name "patatt") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "patatt" version)) + (sha256 + (base32 "0gqcrigq8alxydl6w5kxwdjfkpjhqprpwa3180sbkjlnvans71fs")))) + (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 Thu May 27 14:54:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 29628 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 9C6EF27BC81; Thu, 27 May 2021 15:55:51 +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_H4,RCVD_IN_MSPIKE_WL,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 636B327BC78 for ; Thu, 27 May 2021 15:55:51 +0100 (BST) Received: from localhost ([::1]:55358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmHQM-0002tw-ID for patchwork@mira.cbaines.net; Thu, 27 May 2021 10:55:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmHPc-0002bG-63 for guix-patches@gnu.org; Thu, 27 May 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmHPb-0005x2-ED for guix-patches@gnu.org; Thu, 27 May 2021 10:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lmHPb-0008CQ-AS for guix-patches@gnu.org; Thu, 27 May 2021 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48702] [PATCH 3/3] gnu: b4: Update to 0.7.0. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 May 2021 14:55: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 Received: via spool by 48702-submit@debbugs.gnu.org id=B48702.162212729831486 (code B ref 48702); Thu, 27 May 2021 14:55:03 +0000 Received: (at 48702) by debbugs.gnu.org; 27 May 2021 14:54:58 +0000 Received: from localhost ([127.0.0.1]:52584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmHPW-0008Bh-BD for submit@debbugs.gnu.org; Thu, 27 May 2021 10:54:58 -0400 Received: from out1.migadu.com ([91.121.223.63]:64802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmHPR-0008BH-8j for 48702@debbugs.gnu.org; Thu, 27 May 2021 10:54:53 -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=1622127292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YUrBYWNMLLSSXLrpz9RYf6nztLExIVWIuf3zFNcf/0M=; b=Z1VOKpKPjrukUnsbWDwh7rfJihreXEkdZyw+VlOe8CGxkx47Qbn7hmw9kCZzanMa3j1VGJ YqzCliH2c4r9BxJiMt1DIAcUorTe5pulOxBfYZZtO95XmKA7wKM0l5cSOSi5i6nPISMNTP ze0hy1t6Hr8T1EYY9chM0ipeZULF5nitr0em0eRfnOeg7ecmGu5LAySs8UGDLBU84aaqVZ U57Pxe2ja3qRfh0npzJ8XDvCS2e7L2aI/KSWpQrDoNPn18kOonlwV1CmXpKWE4j6WzMgIG y8gWdK4bQX3PFq2HxHTZmfekRSgEeqWz3E9Aubb6dQ9yzkKwsV0m5WdGYVSnTg== From: Kyle Meyer Date: Thu, 27 May 2021 10:54:21 -0400 Message-Id: <20210527145421.11903-3-kyle@kyleam.com> In-Reply-To: <20210527145046.11773-1-kyle@kyleam.com> References: <20210527145046.11773-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.7.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 6d555c16d9..dbb40914da 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2448,27 +2448,21 @@ (define-public patatt (define-public b4 (package (name "b4") - (version "0.6.2") + (version "0.7.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 "089j33yyx827qpy8qkw3xk1cwis650bj5xjdn2qgckxs3sfklw7i")))) (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