From patchwork Tue Aug 10 21:07:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 32010 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 1648427BC82; Tue, 10 Aug 2021 22:09:12 +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 D745527BC78 for ; Tue, 10 Aug 2021 22:09:11 +0100 (BST) Received: from localhost ([::1]:58748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDYzl-0002qv-5M for patchwork@mira.cbaines.net; Tue, 10 Aug 2021 17:09:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDYzf-0002qb-0t for guix-patches@gnu.org; Tue, 10 Aug 2021 17:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDYze-00086s-Qa for guix-patches@gnu.org; Tue, 10 Aug 2021 17:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDYze-0000C4-Lb for guix-patches@gnu.org; Tue, 10 Aug 2021 17:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49989] [PATCH 1/3] gnu: go-torproject-org-pluggable-transports-goptlib: Fix import path. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Aug 2021 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49989@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1628629692664 (code B ref -1); Tue, 10 Aug 2021 21:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2021 21:08:12 +0000 Received: from localhost ([127.0.0.1]:60935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDYyq-0000Ae-I0 for submit@debbugs.gnu.org; Tue, 10 Aug 2021 17:08:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:45446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDYyo-0000AU-2K for submit@debbugs.gnu.org; Tue, 10 Aug 2021 17:08:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDYyn-0002Eg-DK for guix-patches@gnu.org; Tue, 10 Aug 2021 17:08:09 -0400 Received: from out2.migadu.com ([188.165.223.204]:27460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDYyl-0007R6-57 for guix-patches@gnu.org; Tue, 10 Aug 2021 17:08:09 -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=mgsn.dev; s=key1; t=1628629682; 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; bh=8v8777JLXMlUn1YX3hbQeeINL5iLVmCSHC6Da8PhUoc=; b=UnM+beUxTcqNMNJoDgov6DWy4iNJ4Yck8ONQ+tsgRUAPI4ZBy3ISSpJ/ySA6h4wQhMYD9n 4Q5ymsqCFebVU/ENyiC4qrw6yc3SBuP5MIiSroxpfNHNsh+tPPuKGtVSe76jQYmkDqU076 GvH2ZEUHVggwTNYNRqFz/2MpyOeOSkI= From: Sarah Morgensen Date: Tue, 10 Aug 2021 14:07:58 -0700 Message-Id: <8f8a2f210151bdeb437bb3a12b67f43c76286aa4.1628629367.git.iskarian@mgsn.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=188.165.223.204; envelope-from=iskarian@mgsn.dev; helo=out2.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/golang.scm (go-torproject-org-pluggable-transports-goptlib) [arguments]<#:import-path>: Use actual module name from go.mod. --- Hello Guix, Just a little fix for this import path, so dependents don't have to patch its name. Tested to build on x86_64, which since this is just a change in import path name, should have caught any issues. -- Sarah gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: c8e2be3b32fe784a9db52d8a1a12902ab12ae7cb diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 15f3ea46c4..ca029345e2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -822,7 +822,7 @@ parsing and encoding support for STUN and TURN protocols.") (base32 "1lh938194hvkf8pqgnxwf6hvjv9rv0j3kasi07r2ckrj8sxzk4jc")))) (build-system go-build-system) (arguments - `(#:import-path "git.torproject.org/pluggable-transports/goptlib")) + `(#:import-path "git.torproject.org/pluggable-transports/goptlib.git")) (home-page "https://gitweb.torproject.org/pluggable-transports/goptlib.git/") (synopsis "Go pluggable transports library") (description "GoPtLib is a library for writing Tor pluggable transports in From patchwork Tue Aug 10 21:10:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 32012 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 3A8F427BC78; Tue, 10 Aug 2021 22:11:11 +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 B657927BC82 for ; Tue, 10 Aug 2021 22:11:10 +0100 (BST) Received: from localhost ([::1]:59244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDZ1h-0003Nb-Pc for patchwork@mira.cbaines.net; Tue, 10 Aug 2021 17:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDZ1a-0003Mu-Ky for guix-patches@gnu.org; Tue, 10 Aug 2021 17:11:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDZ1a-0001A9-Ef for guix-patches@gnu.org; Tue, 10 Aug 2021 17:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDZ1a-0000Fg-8K for guix-patches@gnu.org; Tue, 10 Aug 2021 17:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49989] [PATCH 2/3] gnu: go-github-com-operatorfoundation-shapeshifter-transports: Remove goptlib patch. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Aug 2021 21:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49989@debbugs.gnu.org Received: via spool by 49989-submit@debbugs.gnu.org id=B49989.1628629809897 (code B ref 49989); Tue, 10 Aug 2021 21:11:02 +0000 Received: (at 49989) by debbugs.gnu.org; 10 Aug 2021 21:10:09 +0000 Received: from localhost ([127.0.0.1]:60945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDZ0j-0000EN-6Z for submit@debbugs.gnu.org; Tue, 10 Aug 2021 17:10:09 -0400 Received: from out1.migadu.com ([91.121.223.63]:37633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDZ0h-0000E9-QK for 49989@debbugs.gnu.org; Tue, 10 Aug 2021 17:10:08 -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=mgsn.dev; s=key1; t=1628629806; 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=B9J9BKlGOT+r4ljap9eQn5I3bj/XFE/UA7K0iyq/DP8=; b=YdKBZosHkhIRATC9oBMI56Qm0S9WEF3ml6M/nwmNAmFAn5tx432MA8RdeB32JnMXRRhWKV JnAeZsVpM45diNEIbIciYDc8fNrOQ12LLtBAo+k0Assk6jSWUcYauUfW06ZcBnAUUrLgr5 2b0sHw2WITy0MNxjEMHyokWjXrNXAZc= From: Sarah Morgensen Date: Tue, 10 Aug 2021 14:10:02 -0700 Message-Id: In-Reply-To: <8f8a2f210151bdeb437bb3a12b67f43c76286aa4.1628629367.git.iskarian@mgsn.dev> References: <8f8a2f210151bdeb437bb3a12b67f43c76286aa4.1628629367.git.iskarian@mgsn.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev 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/golang.scm (go-github-com-operatorfoundation-shapeshifter-transports) [arguments]<#:phases>: Remove obsolete 'patch' phase for goptlib. --- gnu/packages/golang.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ca029345e2..166f578ee8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -127,11 +127,6 @@ filtering devices.") `(#:unpack-path "github.com/OperatorFoundation/shapeshifter-transports" #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* (find-files "." "\\.go$") - ;; To drop '.git' suffix in import path of goptlib. - (("goptlib\\.git") "goptlib")))) (replace 'build (lambda arguments (for-each From patchwork Tue Aug 10 21:10:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 32011 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 1A36727BC85; Tue, 10 Aug 2021 22:11:11 +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 B1EA827BC78 for ; Tue, 10 Aug 2021 22:11:10 +0100 (BST) Received: from localhost ([::1]:59242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDZ1h-0003NZ-Pd for patchwork@mira.cbaines.net; Tue, 10 Aug 2021 17:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDZ1a-0003NO-W8 for guix-patches@gnu.org; Tue, 10 Aug 2021 17:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDZ1a-0001AZ-Po for guix-patches@gnu.org; Tue, 10 Aug 2021 17:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDZ1a-0000Fn-Lf for guix-patches@gnu.org; Tue, 10 Aug 2021 17:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49989] [PATCH 3/3] gnu: go-github-com-operatorfoundation-obfs4: Remove goptlib patch. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Aug 2021 21:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49989@debbugs.gnu.org Received: via spool by 49989-submit@debbugs.gnu.org id=B49989.1628629809903 (code B ref 49989); Tue, 10 Aug 2021 21:11:02 +0000 Received: (at 49989) by debbugs.gnu.org; 10 Aug 2021 21:10:09 +0000 Received: from localhost ([127.0.0.1]:60947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDZ0j-0000EQ-Ec for submit@debbugs.gnu.org; Tue, 10 Aug 2021 17:10:09 -0400 Received: from out1.migadu.com ([91.121.223.63]:37644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDZ0i-0000ED-Ij for 49989@debbugs.gnu.org; Tue, 10 Aug 2021 17:10:08 -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=mgsn.dev; s=key1; t=1628629808; 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=Ypz8tQ9HM/sVzcrw+e0o5Ih16yOYw/8bjP6RhOB8p14=; b=aHU+Qfgy196Tn2xbGdLFPxbfK0/gGaIRWrizroZPhgdtiNp6QZq9Qctm91GSyVXTiOUmZ+ s3o9PKQ8pH0F/5TwtVO9qY2roTlChsPHk9ACAscRdK7tIztqvJSlNcbsfcmRvZwt1Wm30o BMEf79NdG6HLPYo3MRobgQjNcJl9+8Q= From: Sarah Morgensen Date: Tue, 10 Aug 2021 14:10:03 -0700 Message-Id: <60046061358961a17be6db7787648653358a6ef7.1628629367.git.iskarian@mgsn.dev> In-Reply-To: <8f8a2f210151bdeb437bb3a12b67f43c76286aa4.1628629367.git.iskarian@mgsn.dev> References: <8f8a2f210151bdeb437bb3a12b67f43c76286aa4.1628629367.git.iskarian@mgsn.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev 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/golang.scm (go-github-com-operatorfoundation-obfs4) [arguments]<#:phases>: Remove obsolete 'patch' phase for goptlib. --- gnu/packages/golang.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 166f578ee8..9d49a3130e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -666,11 +666,6 @@ protocol from the Pluggable Transports 2.0 specification.") `(#:unpack-path "github.com/OperatorFoundation/obfs4" #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* (find-files "." "\\.go$") - ;; To drop '.git' suffix in import path of goptlib. - (("goptlib\\.git") "goptlib")))) (replace 'build (lambda arguments (for-each