From patchwork Thu Jun 3 03:17:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 29806 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 BC34D27BC83; Thu, 3 Jun 2021 04:20:35 +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 7BE3127BC78 for ; Thu, 3 Jun 2021 04:20:35 +0100 (BST) Received: from localhost ([::1]:59114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loduM-0007DP-Hb for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 23:20:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lodtr-0007AZ-4y for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58451) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lodtq-0001fH-T2 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lodtq-0001BC-PK for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH v4 1/9] gnu: Add go-torproject-org-ptlib. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 03:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.16226903654379 (code B ref 42380); Thu, 03 Jun 2021 03:20:02 +0000 Received: (at 42380) by debbugs.gnu.org; 3 Jun 2021 03:19:25 +0000 Received: from localhost ([127.0.0.1]:41739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtF-00018Z-50 for submit@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:25 -0400 Received: from mx1.riseup.net ([198.252.153.129]:58340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtD-00018M-0x for 42380@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:23 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FwWMn59RXzDqgb for <42380@debbugs.gnu.org>; Wed, 2 Jun 2021 20:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1622690357; bh=xvHpty23XPQGvXLaGqUS0DmL3LtyzW5M7ygNTnuszdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EMSfcN5osKT4JeGQAQ6uHau4Yvhwt3tQP3avZPXYRGaoZbkspNQyffZB8LBSoNJ1r /p41kSauu5YsGOznibITj2SDblEfEND5WZqS6Oc00yrlnajvRLp3tu8XZx1IFZZqaU j8LRa65rGP0YFk7eRNfEww4rGb+c9o5FJabOUjxs= X-Riseup-User-ID: CF5F485FC5774CF4FCFF130B8A67C58C6E5BC3ABF43C7DF1717D8B78C39B8D4C Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FwWMm5S08z5vks; Wed, 2 Jun 2021 20:19:16 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 3 Jun 2021 00:17:38 -0300 Message-Id: In-Reply-To: References: <20201007155154.GA5226@andel> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-torproject-org-ptlib): New variable. diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8c3c81ceda..940f38af76 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Ricardo Wurmus ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -7033,3 +7034,27 @@ simplifications, and enforces style rules.") "This package provides a library for fast, structured, leveled logging in Go.") (license license:expat))) + +(define-public go-torproject-org-ptlib + (package + (name "go-torproject-org-ptlib") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.torproject.org/pluggable-transports/goptlib.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lh938194hvkf8pqgnxwf6hvjv9rv0j3kasi07r2ckrj8sxzk4jc")))) + (build-system go-build-system) + (arguments + '(#:import-path "git.torproject.org/pluggable-transports/goptlib.git")) + (home-page "https://git.torproject.org/pluggable-transports/goptlib.git") + (synopsis "Go library for Tor Pluggable Transports") + (description "Library for writing Tor Pluggable Transports in Go. Pluggable +Transports are a means of connecting to the Tor Network from places where it +is censored.") + (license license:cc0))) From patchwork Thu Jun 3 03:17:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 29807 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 12F4A27BC78; Thu, 3 Jun 2021 04:20: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 ABC5E27BC81 for ; Thu, 3 Jun 2021 04:20:35 +0100 (BST) Received: from localhost ([::1]:59122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loduM-0007E1-Oh for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 23:20:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lodtr-0007BJ-Ix for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lodtr-0001fT-AM for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lodtr-0001BJ-5n for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH v4 2/9] gnu: Add go-github-com-agl-ed25519. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 03:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.16226903704398 (code B ref 42380); Thu, 03 Jun 2021 03:20:03 +0000 Received: (at 42380) by debbugs.gnu.org; 3 Jun 2021 03:19:30 +0000 Received: from localhost ([127.0.0.1]:41742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtK-00018s-Ew for submit@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:30 -0400 Received: from mx1.riseup.net ([198.252.153.129]:35696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtJ-00018X-5x for 42380@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:29 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FwWMv6FBdzDqgb for <42380@debbugs.gnu.org>; Wed, 2 Jun 2021 20:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1622690363; bh=C18qLTrrDRys1b/YaxSfp+/wfv6ougr7XOIAxLbtrk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NV3fHlGH+56DCFuPJFiPrAFw9eIT50SwrTiaY18QrdZlhYONb4V9mJ7geEcUyGUNu GOpgDNzzPAFVYADZdzzU9F2RQtspZsW5NDAnmqvY0pJlPdTq1LnDmM4YuASGn7FPMG GI3/Jd9urpn/CMU9hsrlc8NHePEUhtFCphvh5zGo= X-Riseup-User-ID: 56FF0D3A6E5663DCE1FEA5751F3529B5F0F04C10969B6C90FA8C414C17798B2C Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FwWMt6qZLz5vks; Wed, 2 Jun 2021 20:19:22 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 3 Jun 2021 00:17:39 -0300 Message-Id: <99af7879a93ec3f94030b3e3cb266949f67d824b.1622687706.git.nandre@riseup.net> In-Reply-To: References: <20201007155154.GA5226@andel> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-agl-ed25519): New variable. diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 940f38af76..2569d450b2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7058,3 +7058,41 @@ Go.") Transports are a means of connecting to the Tor Network from places where it is censored.") (license license:cc0))) + +(define-public go-github-com-agl-ed25519 + (let ((commit "c4161f4c7483313562781c61b9a20aba73daf9de") + (revision "0")) + (package + (name "go-github-com-agl-ed25519") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/agl/ed25519") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1wjlbzi0w63rmlzgk3amw274wsl0zhcn4yx2lraffbkhqappahxc")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/agl/ed25519" + #:phases + (modify-phases %standard-phases + (add-before 'reset-gzip-timestamps 'make-files-writable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (file) (chmod file #o644)) + (find-files out "\\.gz")) + #t)))))) + (home-page "https://github.com/agl/ed25519") + (synopsis "Go library for ed25519 public-key signatures") + (description "This library is a Go implementation of ed25519 public-key +signature system which was designed to be faster than previous digital signature +systems without sacrificing security. It is currently used in the +implementation of obfs4 and should be not be used on newer projects since it +is unmaintained. Newer software should use x-crypto instead.") + ;; License file is referred but it is missing. Probably because the + ;; author decided to discontinue the project. + (license (license:non-copyleft "file://ed25519.go"))))) From patchwork Thu Jun 3 03:17:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 29808 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 8EAA027BC81; Thu, 3 Jun 2021 04:20:37 +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 5710E27BC78 for ; Thu, 3 Jun 2021 04:20:37 +0100 (BST) Received: from localhost ([::1]:59214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loduO-0007Hq-9a for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 23:20:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lodtr-0007C3-Vq for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58453) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lodtr-0001fZ-Nh for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lodtr-0001BR-Im for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH v4 3/9] gnu: Add go-github-com-dchest-siphash. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 03:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.16226903774418 (code B ref 42380); Thu, 03 Jun 2021 03:20:03 +0000 Received: (at 42380) by debbugs.gnu.org; 3 Jun 2021 03:19:37 +0000 Received: from localhost ([127.0.0.1]:41745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtQ-00019A-Mt for submit@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:36 -0400 Received: from mx1.riseup.net ([198.252.153.129]:40964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtP-00018r-GG for 42380@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:35 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FwWN21WnNzDq8t for <42380@debbugs.gnu.org>; Wed, 2 Jun 2021 20:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1622690370; bh=8ZMIZbJtQWc3sJBKWFNNgCTsIgRJxQ9Zdstx0v9ayiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UXM4/w3NBZ6RFtOXG/EGoqm5qDqTFRt5lNPqpcntvnUL1dV32hxv46fvGD5cxA0LT 89lkw2a4DjxwfxrTlaacH1nVpdfP+Qjj5Vl2XJNxQ+McpaIjrtu31bxKYl4DSPgput uHBw3dNQPOUqW6O131hwBVz6ih5+b7YSHmvBFqCQ= X-Riseup-User-ID: 72A072990D84B83BC8982F6FFFE195649ACCEE9EE650F9AE361CBAFBB09DD955 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FwWN1243jz5vks; Wed, 2 Jun 2021 20:19:29 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 3 Jun 2021 00:17:40 -0300 Message-Id: <61cb1458a6f5a8f42637e08b0d76837b65aeb57b.1622687706.git.nandre@riseup.net> In-Reply-To: References: <20201007155154.GA5226@andel> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-dchest-siphash): New variable. diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2569d450b2..037163766d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7096,3 +7096,30 @@ is unmaintained. Newer software should use x-crypto instead.") ;; License file is referred but it is missing. Probably because the ;; author decided to discontinue the project. (license (license:non-copyleft "file://ed25519.go"))))) + +(define-public go-github-com-dchest-siphash + (let ((commit "34f201214d993633bb24f418ba11736ab8b55aa7") + (revision "0")) + (package + (name "go-github-com-dchest-siphash") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dchest/siphash") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "08s076y7vmjqnq7jz0762hkm896r6r31v8b31a3gy0n8rfa01k8k")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/dchest/siphash")) + (home-page "https://github.com/dchest/siphash") + (synopsis "Go library for siphash") + (description "Go implementation of SipHash-2-4, a fast short-input +Pseudo Random Function which is suitable for usage in message authentication +codes and was based on the design created by Jean-Philippe Aumasson and Daniel +J. Bernstein. ") + (license license:cc0)))) From patchwork Thu Jun 3 03:17:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 29810 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 A6E9027BC78; Thu, 3 Jun 2021 04:20:45 +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 5247127BC81 for ; Thu, 3 Jun 2021 04:20:45 +0100 (BST) Received: from localhost ([::1]:59948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loduW-0007v3-CO for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 23:20:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lodts-0007Cr-DB for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lodts-0001fi-4Z for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lodts-0001BY-05 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH v4 4/9] gnu: Add go-github-com-dchest-uniuri. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 03:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.16226903804434 (code B ref 42380); Thu, 03 Jun 2021 03:20:03 +0000 Received: (at 42380) by debbugs.gnu.org; 3 Jun 2021 03:19:40 +0000 Received: from localhost ([127.0.0.1]:41748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtT-00019R-U8 for submit@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:40 -0400 Received: from mx1.riseup.net ([198.252.153.129]:43380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtS-000192-J5 for 42380@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:38 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FwWN524LbzDqgb for <42380@debbugs.gnu.org>; Wed, 2 Jun 2021 20:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1622690373; bh=oHcML74qaAh7gacIWbJnoxuSAmKRzwbd6wUWR45VWjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PuA5SwIiTTMUx+7mXbI3PqO8l1OnlH9wC0l79Ltf+V5vVL4B6OE8XYXbAr+Sb0ZW9 QtnCgsG+NARHLHagM3ls/IlDngSY7yzBQEmq6ipa+n6tFmHevLjp9Zy9bsS9C4TR/a 4FXKEP2m9mk4e+VxxQa7eHcFYEBlOW1/n0ZhJX84= X-Riseup-User-ID: 1A6E9F68E556D246A4CA6DDF1DF54D30FAAE58AA97AE9A2A4F58ED0724E528F5 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FwWN42lcLz5vks; Wed, 2 Jun 2021 20:19:32 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 3 Jun 2021 00:17:41 -0300 Message-Id: In-Reply-To: References: <20201007155154.GA5226@andel> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-dchest-uniuri): New variable. diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 037163766d..08b5b6ba9b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7123,3 +7123,28 @@ Pseudo Random Function which is suitable for usage in message authentication codes and was based on the design created by Jean-Philippe Aumasson and Daniel J. Bernstein. ") (license license:cc0)))) + +(define-public go-github-com-dchest-uniuri + (let ((commit "8902c56451e9b58ff940bbe5fec35d5f9c04584a") + (revision "0")) + (package + (name "go-github-com-dchest-uniuri") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dchest/uniuri") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1x5bsbm1nlphsv96zd0rbclfaa1swpz5bp14x7s5dbxp0awk2gd4")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/dchest/uniuri")) + (home-page "https://github.com/dchest/uniuri") + (synopsis "Go library for random URIs") + (description "Package uniuri generates random strings good for use in +Universal Resource Identifiers to uniquely identify objects.") + (license license:cc0)))) From patchwork Thu Jun 3 03:17:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 29809 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 5B9F227BC83; Thu, 3 Jun 2021 04:20:45 +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 1F7D627BC78 for ; Thu, 3 Jun 2021 04:20:45 +0100 (BST) Received: from localhost ([::1]:59942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loduW-0007uY-82 for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 23:20:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lodts-0007Dm-S3 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lodts-0001gE-H5 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lodts-0001Bf-E5 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH v4 5/9] gnu: Add go-github-com-dsnet-compress. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 03:20:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.16226903844453 (code B ref 42380); Thu, 03 Jun 2021 03:20:04 +0000 Received: (at 42380) by debbugs.gnu.org; 3 Jun 2021 03:19:44 +0000 Received: from localhost ([127.0.0.1]:41751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtY-00019l-59 for submit@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:44 -0400 Received: from mx1.riseup.net ([198.252.153.129]:46838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtW-00019C-1q for 42380@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:42 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FwWN84S6yzDq8t for <42380@debbugs.gnu.org>; Wed, 2 Jun 2021 20:19:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1622690376; bh=xKqqIfDFEEIsP0ZWOpxK8VjDOcOZOaIag6JKr0HK3KQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oK0EB1feOp6/RZ8bTwzJWXt15d916C7SO5t5qMNKyv2WsMRd8PAfAr5WEHDsceIer fcNvbn0NQ6BGqTJ5dtfT6/IKAy95JGRiaKhI6+o48PF+3NafusdmWE7uO6oTq3hH+7 qs8y91hZgFKTawvhg/wYlPoEDO6M3kCXbAKbuE5U= X-Riseup-User-ID: F82E41AC3E7DC83291FA3344A60F2B2982E79AC236D3CEB208AF4B7DD555046D Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FwWN752YWz5vks; Wed, 2 Jun 2021 20:19:35 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 3 Jun 2021 00:17:42 -0300 Message-Id: In-Reply-To: References: <20201007155154.GA5226@andel> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-dsnet-compress): New variable. diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 08b5b6ba9b..f554a8305e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7148,3 +7148,29 @@ J. Bernstein. ") (description "Package uniuri generates random strings good for use in Universal Resource Identifiers to uniquely identify objects.") (license license:cc0)))) + +(define-public go-github-com-dsnet-compress + (let ((commit "cc9eb1d7ad760af14e8f918698f745e80377af4f") + (revision "0")) + (package + (name "go-github-com-dsnet-compress") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dsnet/compress") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/dsnet/compress")) + (home-page "https://github.com/dsnet/compress") + (synopsis "Go library for extended compression") + (description "This is a collection of compression related libraries. +The goal of this project is to provide pure Go implementations for popular +compression algorithms bey ond what the Go standard library provides.") + (license (license:non-copyleft "file://LICENSE.md"))))) From patchwork Thu Jun 3 03:17:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 29811 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 614FA27BC81; Thu, 3 Jun 2021 04:20:53 +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 2762927BC78 for ; Thu, 3 Jun 2021 04:20:53 +0100 (BST) Received: from localhost ([::1]:60586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lodue-0008Kl-7l for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 23:20:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lodtt-0007Eq-72 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lodts-0001gv-UX for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lodts-0001Bn-Qp for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH v4 6/9] gnu: Add go-schwanenlied-me-yawning-bsaes. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 03:20:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.16226903874471 (code B ref 42380); Thu, 03 Jun 2021 03:20:04 +0000 Received: (at 42380) by debbugs.gnu.org; 3 Jun 2021 03:19:47 +0000 Received: from localhost ([127.0.0.1]:41754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtb-0001A2-CW for submit@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:47 -0400 Received: from mx1.riseup.net ([198.252.153.129]:49278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtZ-00019Q-1g for 42380@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:45 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FwWNC5Ll9zDqtG for <42380@debbugs.gnu.org>; Wed, 2 Jun 2021 20:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1622690379; bh=XEbSQTUMQ/PAjYPEpqfxb+MLH/ZiUpmriPVhhyc8c2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fzyKb9yYusxmM53EKJH/Nye3zIJYen+Q1APmdiTd0c2gFQk62sD7Y1peI5oiZCmv6 Bbwn3dlqLeiulqftouocicX6ERMgnQBIwtgeyoTfIe8Rm3TLKCa4Fm5nZs1g25fEVn UaAzpFVCAu5Px5YP/nrVboW3DXrnx68Dm9rDHFdI= X-Riseup-User-ID: 016955451BFD80454E8AD292281590A58AFED098D18D6D0FCB429E9DBAEB61DF Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FwWNB605jz5vks; Wed, 2 Jun 2021 20:19:38 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 3 Jun 2021 00:17:43 -0300 Message-Id: In-Reply-To: References: <20201007155154.GA5226@andel> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-schwanenlied-me-yawning-bsaes): New variable. diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f554a8305e..6cf7ffc90c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7174,3 +7174,32 @@ Universal Resource Identifiers to uniquely identify objects.") The goal of this project is to provide pure Go implementations for popular compression algorithms bey ond what the Go standard library provides.") (license (license:non-copyleft "file://LICENSE.md"))))) + +(define-public go-schwanenlied-me-yawning-bsaes + (let ((commit "26d1add596b6d800bdeeb3bc3b2c7b316c056b6d") + (revision "0")) + (package + (name "go-schwanenlied-me-yawning-bsaes") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.schwanenlied.me/yawning/bsaes.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0h4dsyw54n9rcwprqy93wv2v1gcvlq1vfqdp1g7wxdkq457rhvys")))) + (build-system go-build-system) + (arguments + '(#:import-path "git.schwanenlied.me/yawning/bsaes.git")) + (home-page "https://git.schwanenlied.me/yawning/bsaes.git") + (synopsis "Go AES library") + (description "Portable pure-Go constant time Advanced Encryption +Standard (AES) for eletronic data encryption. This implementation if +based on code from [BearSSL](https://bearssl.org/). On AMD64 systems +with hardware support for AES New Instructions (AES-NI) and a +sufficiently recent Go runtime, it will transparently call crypto/aes +when NewCipher is invoked.") + (license (license:non-copyleft "file://LICENSE.txt"))))) From patchwork Thu Jun 3 03:17:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 29813 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 A475E27BC81; Thu, 3 Jun 2021 04:21:21 +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 72B7A27BC78 for ; Thu, 3 Jun 2021 04:21:21 +0100 (BST) Received: from localhost ([::1]:33032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lodv6-0000Lj-HT for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 23:21:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lodtt-0007GN-Iw for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lodtt-0001hY-AW for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lodtt-0001Bu-73 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH v4 7/9] gnu: Add go-gitlab-com-yawning-utls. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 03:20:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.16226903894485 (code B ref 42380); Thu, 03 Jun 2021 03:20:05 +0000 Received: (at 42380) by debbugs.gnu.org; 3 Jun 2021 03:19:49 +0000 Received: from localhost ([127.0.0.1]:41757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtc-0001AG-Og for submit@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:48 -0400 Received: from mx1.riseup.net ([198.252.153.129]:51476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtb-00019b-Eo for 42380@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:47 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FwWNG1C9vzDqgb for <42380@debbugs.gnu.org>; Wed, 2 Jun 2021 20:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1622690382; bh=2B0o7o4a2hJ41l5gV/zHCauJVMugw8Y/mxWRz5sa44c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O47FJWE6CdNbWizXCtMHQfV9Sg8ILeeeLmvk+W/rtM1MYaRkUt6zRfYgd/thy2Rsv QNTlO3lL9ZZ22Qf8lkZALWjkg1/zcCcPAr/crbmVJtCY5nvEin11vBuhzLGeYYS0qa xOy4yz8XXZVCuiz4JxMYqOS79gpWpl31aDxj6JjY= X-Riseup-User-ID: 7FCD7028AE8FC31E66241C53B1004E58E8AF8112460D53E41BEEE42D73EEE84B Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FwWNF1v9qz5vks; Wed, 2 Jun 2021 20:19:41 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 3 Jun 2021 00:17:44 -0300 Message-Id: <0b503bc2bfa00635409e47182aa575ebc4448c3d.1622687706.git.nandre@riseup.net> In-Reply-To: References: <20201007155154.GA5226@andel> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-gitlab-com-yawning-utls): New variable. diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6cf7ffc90c..b4e8c1f338 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7203,3 +7203,34 @@ with hardware support for AES New Instructions (AES-NI) and a sufficiently recent Go runtime, it will transparently call crypto/aes when NewCipher is invoked.") (license (license:non-copyleft "file://LICENSE.txt"))))) + +(define-public go-gitlab-com-yawning-utls + (package + (name "go-gitlab-com-yawning-utls") + (version "0.0.10-1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/yawning/utls.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15c46s56r45n22rmq9spnczydnkqrnxff28h5mpnk5yvcqif3lgb")))) + (build-system go-build-system) + (arguments + '(#:tests? #f ;; Tries to connect and fails. + #:import-path "gitlab.com/yawning/utls.git")) + (propagated-inputs + `(("go-schwanenlied-me-yawning-bsaes" ,go-schwanenlied-me-yawning-bsaes) + ("go-github-com-dsnet-compress" ,go-github-com-dsnet-compress) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto))) + (home-page "https://gitlab.com/yawning/utls.git") + (synopsis "Go library for uTLS") + (description "This library is a fork of the main Transport Layer Security +protocol in Go (crypto/tls) which provides ClientHello fingerprinting resistance, +low level access to handshakes and fake session tickets among other features. +This fork was made for the specific purpose of improving obfs4proxy's meek_lite +transport protocol.") + (license license:gpl3+))) From patchwork Thu Jun 3 03:17:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 29812 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 5596827BC78; Thu, 3 Jun 2021 04:20:54 +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 C75B127BC78 for ; Thu, 3 Jun 2021 04:20:53 +0100 (BST) Received: from localhost ([::1]:60610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lodue-0008LZ-T9 for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 23:20:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lodtu-0007Hh-14 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lodtt-0001i3-OM for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lodtt-0001C1-L7 for guix-patches@gnu.org; Wed, 02 Jun 2021 23:20:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCH v4 8/9] gnu: Add obfs4. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 03:20:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.16226903914499 (code B ref 42380); Thu, 03 Jun 2021 03:20:05 +0000 Received: (at 42380) by debbugs.gnu.org; 3 Jun 2021 03:19:51 +0000 Received: from localhost ([127.0.0.1]:41760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtf-0001AU-0L for submit@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:51 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lodtd-00019t-Rt for 42380@debbugs.gnu.org; Wed, 02 Jun 2021 23:19:50 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FwWNJ3zKmzDq8t for <42380@debbugs.gnu.org>; Wed, 2 Jun 2021 20:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1622690384; bh=oTEtKk3vm1WhLN21XOcLTvg09YSk5SypoKyq1od5iAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q/J5K5DbQMUzLBW+pVbiWgX9YSw2V41hxFzxtJYKKMHqoBqnPJZrUJViwyfILZz8f WFN7DgoRqhNyT2AluAHEC3f5Vc6ebHHPzRKv60GydeAk0ZtLV5xLe2aKuIL1keV/g1 XTTuyJTm3bosZzI6O5t/TJE/7zfabCkZgu0APhxg= X-Riseup-User-ID: 54FAF121C34F5EFB976165D446D468B486D1DC1329717DC03B8876B970DA135C Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FwWNH4Qggz5vks; Wed, 2 Jun 2021 20:19:43 -0700 (PDT) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 3 Jun 2021 00:17:45 -0300 Message-Id: <66abc6eeaeab68a209c54740678b64f1d96ecd87.1622687706.git.nandre@riseup.net> In-Reply-To: References: <20201007155154.GA5226@andel> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tor.scm (obfs4): New variable. * Alphabetically order module imports. diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index bd11dd3a75..52d78cba79 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Brice Waegeneire -;;; Copyright © 2020 André Batista +;;; Copyright © 2020, 2021 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,13 +33,16 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) - #:use-module (gnu packages libevent) - #:use-module (gnu packages linux) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages golang) + #:use-module (gnu packages libevent) + #:use-module (gnu packages linux) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -423,3 +426,75 @@ statistics and status reports on: Potential client and exit connections are scrubbed of sensitive information.") (license license:gpl3+))) + +(define-public obfs4 + (package + (name "obfs4") + (version "0.0.11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.torproject.org/pluggable-transports/obfs4.git") + (commit (string-append "obfs4proxy-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y2kjwrk64l1h8b87m4iqsanib5rn68gzkdri1vd132qrlypycjn")))) + (build-system go-build-system) + (arguments + '(#:import-path "git.torproject.org/pluggable-transports/obfs4.git" + #:tests? #f ;; No test files + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key outputs configure-flags #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively + "src/git.torproject.org/pluggable-transports/obfs4.git" + "src/gitlab.com/yawning/obfs4.git" + #:log (%make-void-port "w")) + (with-directory-excursion + "src/git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy" + (invoke "go" "build" "-ldflags" "-s")) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (src "src/git.torproject.org/pluggable-transports/obfs4.git") + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (doc (string-append share "/doc")) + (man (string-append share "/man/man1"))) + (mkdir-p man) + (mkdir bin) + (mkdir doc) + (with-directory-excursion + (string-append src "/obfs4proxy") + (copy-file "obfs4proxy" + (string-append bin "/obfs4proxy"))) + (with-directory-excursion + (string-append src "/doc") + (copy-file "obfs4proxy.1" + (string-append man "/obfs4proxy.1")) + (copy-file "obfs4-spec.txt" + (string-append doc "/obfs4-spec.txt"))) + #t)))))) + (propagated-inputs + `(("go-torproject-org-ptlib" ,go-torproject-org-ptlib) + ("go-github-com-agl-ed25519" ,go-github-com-agl-ed25519) + ("go-github-com-dchest-siphash" ,go-github-com-dchest-siphash) + ("go-github-com-dchest-uniuri" ,go-github-com-dchest-uniuri) + ("go-github-com-dsnet-compress" ,go-github-com-dsnet-compress) + ("go-schwanenlied-me-yawning-bsaes" ,go-schwanenlied-me-yawning-bsaes) + ("go-gitlab-com-yawning-utls" ,go-gitlab-com-yawning-utls) + ("go-golang-org-x-net" ,go-golang-org-x-net) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) + ("go-golang-org-x-text" ,go-golang-org-x-text))) + (home-page "https://git.torproject.org/pluggable-transports/obfs4.git") + (synopsis "Obfs4 implements an obfuscation protocol") + (description "This is a look-like nothing obfuscation protocol that +incorporates ideas and concepts from Philipp Winter's ScrambleSuit protocol. +The obfs naming was chosen primarily because it was shorter, in terms of +protocol ancestery obfs4 is much closer to ScrambleSuit than obfs2/obfs3.") + (license license:gpl3+))) From patchwork Wed Oct 7 15:51:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 24498 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 CDC1B27BBE9; Wed, 7 Oct 2020 16:53:15 +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,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 65AD427BBE8 for ; Wed, 7 Oct 2020 16:53:11 +0100 (BST) Received: from localhost ([::1]:33932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQBkc-0007UT-Go for patchwork@mira.cbaines.net; Wed, 07 Oct 2020 11:53:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQBkU-0007Rc-24 for guix-patches@gnu.org; Wed, 07 Oct 2020 11:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46231) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kQBkT-0007zG-NA for guix-patches@gnu.org; Wed, 07 Oct 2020 11:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kQBkT-0007CD-J3 for guix-patches@gnu.org; Wed, 07 Oct 2020 11:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42380] [PATCHv3 9/9] gnu: Add torbrowser-unbundle. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Oct 2020 15:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 42380@debbugs.gnu.org Received: via spool by 42380-submit@debbugs.gnu.org id=B42380.160208594427607 (code B ref 42380); Wed, 07 Oct 2020 15:53:01 +0000 Received: (at 42380) by debbugs.gnu.org; 7 Oct 2020 15:52:24 +0000 Received: from localhost ([127.0.0.1]:57777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQBjj-0007B5-S5 for submit@debbugs.gnu.org; Wed, 07 Oct 2020 11:52:23 -0400 Received: from mx1.riseup.net ([198.252.153.129]:45262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kQBje-0007Au-K8 for 42380@debbugs.gnu.org; Wed, 07 Oct 2020 11:52:14 -0400 Received: from bell.riseup.net (bell-pn.riseup.net [10.0.1.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4C5zNn46jqzDsYk for <42380@debbugs.gnu.org>; Wed, 7 Oct 2020 08:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1602085929; bh=f9SnDCBOOayhM892wK19PKP5uCAQJwgLSZrFJIsKu8o=; h=Date:From:To:Subject:References:In-Reply-To:From; b=WL06TuIX/hd3XeH+B7pj3Kmi/tVhtDYwzTjwNRxeW/5DSrit22GNsewaA7TaGsPcj X+myH9flE6C0sTD17jpT5ATzSm9KKHIqQ9WFZoOghIttbmQBsYDBOoaoC+UQ+QC8pe uZkeywy40eP+RkBkXNwV2rm+0B8VameFo19SsRe0= X-Riseup-User-ID: C3348F9FED29862731067AB0F2B0D48885E3CE6F3D86538BE6EF36908900F273 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 4C5zNm3P4CzJr3l for <42380@debbugs.gnu.org>; Wed, 7 Oct 2020 08:52:08 -0700 (PDT) Date: Wed, 7 Oct 2020 12:51:54 -0300 From: =?utf-8?b?QW5kcsOp?= Batista Message-ID: <20201007155154.GA5226@andel> References: <20200715211547.GA17146@andel> <20200725144930.GA13751@andel> <20200803125556.GA18868@andel> <87blihhdz6.fsf@gnu.org> <20200909022429.GA24930@andel> <878sdjo1qv.fsf@gnu.org> <20200915142128.GA12025@andel> <20200915151614.GI13296@andel> <20200924231814.GA29727@andel> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200924231814.GA29727@andel> 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 Hello Guix, This new version of the patch addresses the following: - inherits definition from icecat[1]; - use source tarballs for tor-browser and tor-launcher[2]; - does not define torbutton anymore (it is bundled with tor-browser); - unbundles some system libs (nss, nspr, zlib, libevent and icu) 1. There are four phases which are almost exact copies from icecat. I've tried to use let, define and package-properties to remove the hardcoded strings which are in the way of inheritance, but I've had no success. The phases are: 'install-icons, 'apply-guix-specific-patches, 'neutralise-store-references and 'wrap-program. Maybe someone here can shed a light. 2. Those tarballs and also the one used for fonts are not kept for long on dist.torproject.org. Usually they are removed when there is a new browser version. So this will be a problem for time-machine. On the other hand, the git repos for fonts and torbrowser source are huge, so I'm unsure which would be preferable. From 2daf59f3a3d12d1c2ea8c94d9a0d748d26e5b1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Batista?= Date: Wed, 7 Oct 2020 11:52:21 -0300 Subject: [PATCH] gnu: Add torbrowser-unbundle. To: 42380@debbugs.gnu.org * gnu/packages/tor.scm (torbrowser-unbundle): New variable. * gnu/packages/patches/torbrowser-start-desktop.patch: New file. * gnu/packages/patches/torbrowser-start-script.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 3 + .../patches/torbrowser-start-desktop.patch | 22 + .../patches/torbrowser-start-script.patch | 181 +++++ gnu/packages/tor.scm | 691 +++++++++++++++++- 4 files changed, 896 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/torbrowser-start-desktop.patch create mode 100644 gnu/packages/patches/torbrowser-start-script.patch diff --git a/gnu/local.mk b/gnu/local.mk index 83d2d72ab1..7cfc2e901f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -37,6 +37,7 @@ # Copyright © 2020 Brice Waegeneire # Copyright © 2020 Tanguy Le Carrour # Copyright © 2020 Martin Becze +# Copyright © 2020 André Batista # # This file is part of GNU Guix. # @@ -1629,6 +1630,8 @@ dist_patch_DATA = \ %D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tk-find-library.patch \ + %D%/packages/patches/torbrowser-start-desktop.patch \ + %D%/packages/patches/torbrowser-start-script.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ diff --git a/gnu/packages/patches/torbrowser-start-desktop.patch b/gnu/packages/patches/torbrowser-start-desktop.patch new file mode 100644 index 0000000000..6832ed363b --- /dev/null +++ b/gnu/packages/patches/torbrowser-start-desktop.patch @@ -0,0 +1,22 @@ +Change TorBrowser desktop file in order for it to be agnostic to the +path when invoked. + +--- torbrowser-68.10.0esr-9.5-1/tbb-scripts/RelativeLink/start-tor-browser.desktop.orig 2020-07-05 18:47:40.689484877 -0300 ++++ torbrowser-68.10.0esr-9.5-1/tbb-scripts/RelativeLink/start-tor-browser.desktop 2020-07-24 14:36:37.720579884 -0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env ./Browser/execdesktop ++#!/usr/bin/env bash + # + # This file is a self-modifying .desktop file that can be run from the shell. + # It preserves arguments and environment for the start-tor-browser script. +@@ -28,7 +28,7 @@ + GenericName=Web Browser + Comment=Tor Browser is +1 for privacy and −1 for mass surveillance + Categories=Network;WebBrowser;Security; +-Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser --detach)' dummy %k +-X-TorBrowser-ExecShell=./Browser/start-tor-browser --detach +-Icon=web-browser ++Exec=sh -c start-tor-browser ++X-TorBrowser-ExecShell=start-tor-browser --detach ++Icon=torbrowser + StartupWMClass=Tor Browser diff --git a/gnu/packages/patches/torbrowser-start-script.patch b/gnu/packages/patches/torbrowser-start-script.patch new file mode 100644 index 0000000000..b8c8d9a26a --- /dev/null +++ b/gnu/packages/patches/torbrowser-start-script.patch @@ -0,0 +1,181 @@ +Change TorBrowser startup script in order for it to setup needed files +outside guix store. Remove tests which are not needed on guix system. + +--- torbrowser-68.10.0esr-9.5-1/tbb-scripts/RelativeLink/start-tor-browser.orig 2020-07-05 18:47:40.685485004 -0300 ++++ torbrowser-68.10.0esr-9.5-1/tbb-scripts/RelativeLink/start-tor-browser 2020-07-23 18:13:32.426282743 -0300 +@@ -5,6 +5,14 @@ + # + # Copyright 2017 The Tor Project. See LICENSE for licensing information. + ++TBB_HOME="${HOME}/.local/share/torbrowser" ++TBB_LOGFILE="${TBB_HOME}/torbrowser.log" ++TBB_DATA="${TBB_HOME}/Data" ++TBB_PROFILE="${TBB_DATA}/Browser/profile.default" ++TBB_STORE_PATH=$(dirname $(realpath "$0")) ++TBB_STORE_DATA="${TBB_STORE_PATH}/TorBrowser/Data" ++TORRC="${TBB_DATA}/Tor/torrc-defaults" ++ + complain_dialog_title="Tor Browser" + + # First, make sure DISPLAY is set. If it isn't, we're hosed; scream +@@ -134,8 +142,8 @@ + ;; + -l | --log) + if [ -z "$2" -o "${2:0:1}" == "-" ]; then +- printf "Logging Tor Browser debug information to tor-browser.log\n" +- logfile="../tor-browser.log" ++ printf "Logging Tor Browser debug information to torbrowser.log\n" ++ logfile="${TBB_LOGFILE}" + elif [ "${2:0:1}" == "/" -o "${2:0:1}" == "~" ]; then + printf "Logging Tor Browser debug information to %s\n" "$2" + logfile="$2" +@@ -187,41 +195,22 @@ + export XAUTHORITY + fi + +-# If this script is being run through a symlink, we need to know where +-# in the filesystem the script itself is, not where the symlink is. +-myname="$0" +-if [ -L "$myname" ]; then +- # XXX readlink is not POSIX, but is present in GNU coreutils +- # and on FreeBSD. Unfortunately, the -f option (which follows +- # a whole chain of symlinks until it reaches a non-symlink +- # path name) is a GNUism, so we have to have a fallback for +- # FreeBSD. Fortunately, FreeBSD has realpath instead; +- # unfortunately, that's also non-POSIX and is not present in +- # GNU coreutils. +- # +- # If this launcher were a C program, we could just use the +- # realpath function, which *is* POSIX. Too bad POSIX didn't +- # make that function accessible to shell scripts. +- +- # If realpath is available, use it; it Does The Right Thing. +- possibly_my_real_name="`realpath "$myname" 2>/dev/null`" +- if [ "$?" -eq 0 ]; then +- myname="$possibly_my_real_name" +- else +- # realpath is not available; hopefully readlink -f works. +- myname="`readlink -f "$myname" 2>/dev/null`" +- if [ "$?" -ne 0 ]; then +- # Ugh. +- complain "start-tor-browser cannot be run using a symlink on this operating system." +- fi +- fi ++# Try to be agnostic to where we're being started from, check if files are on its ++# default paths and chdir to TBB_HOME ++if [ -e "${TORRC}" ]; then ++ cd "${TBB_HOME}" ++else ++ mkdir -p "${TBB_HOME}" ++ cp -R "${TBB_STORE_DATA}" "${TBB_HOME}" ++ chmod -R 700 "${TBB_HOME}" ++ mkdir -p "${TBB_PROFILE}" ++ echo "user_pref(\"extensions.torlauncher.torrc-defaults_path\", \"${TORRC}\");"\ ++ > "${TBB_PROFILE}/user.js" ++ echo "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${TBB_STORE_PATH}/TorBrowser/Tor/PluggableTransports/obfs4proxy"\ ++ >> "${TORRC}" ++ cd "${TBB_HOME}" + fi + +-# Try to be agnostic to where we're being started from, chdir to where +-# the script is. +-mydir="`dirname "$myname"`" +-test -d "$mydir" && cd "$mydir" +- + # If ${PWD} results in a zero length string, we can try something else... + if [ ! "${PWD}" ]; then + # "hacking around some braindamage" +@@ -236,16 +225,9 @@ + ln -nsf ~/.config/ibus/bus .config/ibus + fi + +-# Fix up .desktop Icon and Exec Paths, and update the .desktop file from the +-# canonical version if it was changed by the updater. +-cp start-tor-browser.desktop ../ +-sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop +-sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-tor-browser.desktop +-sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" --detach || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser --detach)' dummy %k,g" ../start-tor-browser.desktop +- + if [ "$register_desktop_app" -eq 1 ]; then + mkdir -p "$HOME/.local/share/applications/" +- cp ../start-tor-browser.desktop "$HOME/.local/share/applications/" ++ cp "${TBB_STORE_PATH}/start-tor-browser.desktop" "$HOME/.local/share/applications/" + update-desktop-database "$HOME/.local/share/applications/" + printf "Tor Browser has been registered as a desktop app for this user in ~/.local/share/applications/\n" + exit 0 +@@ -265,21 +247,6 @@ + HOME="${PWD}" + export HOME + +-SYSARCHITECTURE=$(getconf LONG_BIT) +-TORARCHITECTURE=$(expr "$(file TorBrowser/Tor/tor)" : '.*ELF \([[:digit:]]*\)') +- +-if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then +- complain "Wrong architecture? 32-bit vs. 64-bit." +- exit 1 +-fi +- +-[% IF c("var/asan") -%] +-# We need to disable LSan which is enabled by default now. Otherwise we'll get +-# a crash during shutdown: https://bugs.torproject.org/10599#comment:59 +-ASAN_OPTIONS="detect_leaks=0" +-export ASAN_OPTIONS +-[% END -%] +- + function setControlPortPasswd() { + local ctrlPasswd=$1 + +@@ -342,13 +309,15 @@ + # your password in the following line where the word “secret” is: + setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} + +-# Set up custom bundled fonts. See fonts-conf(5). +-export FONTCONFIG_PATH="${HOME}/TorBrowser/Data/fontconfig" +-export FONTCONFIG_FILE="fonts.conf" +- + # Avoid overwriting user's dconf values. Fixes #27903. + export GSETTINGS_BACKEND=memory + ++# Set up custom bundled fonts. See fonts-conf(5). ++export FONTCONFIG_FILE="${HOME}/Data/fontconfig/fonts.conf" ++ ++sed -i "${FONTCONFIG_FILE}"\ ++ -e "s,fonts,${TBB_STORE_PATH}/fonts," ++ + cd "${HOME}" + + # We pass all additional command-line arguments we get to Firefox. +@@ -357,23 +326,23 @@ + + if [ "$show_usage" -eq 1 ]; then + # Display Firefox help, then our help +- TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ +- -profile TorBrowser/Data/Browser/profile.default --help 2>/dev/null ++ TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ${TBB_STORE_PATH}/firefox --class "Tor Browser" \ ++ -profile Data/Browser/profile.default --help 2>/dev/null + tbb_usage + elif [ "$detach" -eq 1 ] ; then +- TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ +- -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 "$logfile" 2>&1 &1 &1 "$logfile" 2>&1 "$logfile" 2>&1 " + (string-drop hash 8)))) + #t)) + ;; Tor Browser just do a stage-package here and copy files to its places. + (replace 'install + (lambda* (#:key inputs native-inputs outputs + configure-flags #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (applications (string-append out "/share/applications")) + (build "objdir/dist/firefox") + (bin (string-append out "/bin")) + (lib (string-append out "/lib")) + (start-script "tbb-scripts/RelativeLink/start-tor-browser") + (desktop-file "tbb-scripts/RelativeLink/start-tor-browser.desktop")) + (invoke "./mach" "build" "stage-package") + ;; Tor Browser doesn't use those. + ;; See: tor-browser-build.git/projects/firefox/build:167 + (format #t "Deleting spurious files ...~%") + (with-directory-excursion build + (for-each (lambda (file) + (if (file-exists? file) + (delete-file file) + (display (string-append + "Warning: file " file + " not found! Skipping...\n")))) + '("firefox-bin" "fonts/TwemojiMozilla.ttf"))) + (rmdir (string-append build "/fonts")) + (format #t "Creating install dirs ...~%") + (mkdir-p applications) + (mkdir-p lib) + (mkdir bin) + (format #t "Copying files to install dirs ...~%") + (copy-recursively build (string-append lib "/") + #:log (%make-void-port "w")) + (copy-file start-script + (string-append lib "/start-tor-browser")) + (copy-file desktop-file + (string-append lib "/start-tor-browser.desktop")) + (chmod (string-append lib "/start-tor-browser") #o555) + (chmod (string-append lib "/start-tor-browser.desktop") #o555) + (format #t "Linking start-tor-browser script ...~%") + (symlink (string-append lib "/start-tor-browser") + (string-append bin "/start-tor-browser")) + (format #t "Installing desktop file ...~%") + (install-file desktop-file applications)) + #t)) + + (add-after 'install 'install-fonts + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/")) + (fonts (string-append (or (assoc-ref native-inputs + "torbrowser-fonts") + (assoc-ref inputs + "torbrowser-fonts")) + "/share"))) + (copy-recursively fonts lib + #:log (%make-void-port "w")) + (symlink (string-append lib "/fonts") + (string-append out "/share/fonts"))) + #t)) + (add-after 'install-fonts 'install-extensions + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (ext (string-append lib "/browser/extensions")) + (torb-ext (string-append lib + "/chrome/torbutton/content/extensions")) + (httpse-id "https-everywhere") + (noscript-id "{73a6fe31-595d-460b-a920-fcc0f8843232}") + (httpse (assoc-ref inputs "https-everywhere")) + (noscript (assoc-ref inputs "noscript"))) + (mkdir-p ext) + (mkdir-p torb-ext) + (copy-file noscript (string-append + ext "/" noscript-id ".xpi")) + (copy-recursively httpse + (string-append torb-ext "/" httpse-id) + #:log (%make-void-port "w")) + (chmod (string-append ext "/" noscript-id ".xpi") #o555) + ;; Make httpse available as a builtin extension. + (with-directory-excursion lib + (make-file-writable "omni.ja") + (for-each (lambda (file) + (invoke "zip" "-X" "omni.ja" file)) + (find-files "chrome" ".*")))) + #t)) + (add-after 'install-extensions 'link-binaries + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (tordir (string-append out "/lib/TorBrowser/Tor")) + (ptdir (string-append tordir "/PluggableTransports")) + (obfs4 (string-append (assoc-ref inputs "obfs4") + "/bin/obfs4proxy")) + (tor (string-append (assoc-ref inputs "tor") + "/bin/tor"))) + (mkdir-p ptdir) + (symlink tor (string-append tordir "/tor")) + (symlink obfs4 (string-append ptdir "/obfs4proxy"))) + #t)) + (add-after 'link-binaries 'copy-bundle-data + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (tbb "tbb-scripts") + (ptconf (string-append tbb "/Bundle-Data/PTConfigs")) + (docs (string-append lib "/TorBrowser/Docs")) + (data (string-append lib "/TorBrowser/Data"))) + (mkdir-p data) + (mkdir docs) + (with-directory-excursion + (string-append tbb "/Bundle-Data/linux/Data") + (for-each (lambda (file) + (copy-recursively file + (string-append data "/" file) + #:log (%make-void-port "w"))) + '("Browser" "fontconfig" "Tor"))) + (copy-file (string-append ptconf "/linux/torrc-defaults-appendix") + (string-append data "/Tor/torrc-defaults-appendix")) + (copy-recursively (string-append tbb "/Bundle-Data/Docs") + (string-append docs "/") + #:log (%make-void-port "w"))) + #t)) + ;; This fixes the file chooser crash that happens with GTK 3 + (replace 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (gtk (assoc-ref inputs "gtk+")) + (gtk-share (string-append gtk "/share")) + (mesa (assoc-ref inputs "mesa")) + (mesa-lib (string-append mesa "/lib")) + (pulseaudio (assoc-ref inputs "pulseaudio")) + (pulseaudio-lib (string-append pulseaudio "/lib")) + (libxscrnsaver (assoc-ref inputs "libxscrnsaver")) + (libxscrnsaver-lib (string-append libxscrnsaver "/lib"))) + ;; Only difference to icecat is browser name. + (wrap-program (car (find-files lib "^firefox$")) + `("XDG_DATA_DIRS" prefix (,gtk-share)) + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,mesa-lib + ,libxscrnsaver-lib)))) + #t)))))) + (home-page "https://www.torproject.org") + (synopsis "Anonymous browser derived from Mozilla Firefox") + (description + "Tor Browser is the Tor Project version of Firefox browser. It is the only +recommended way to anonymously browse the web that is supported by the project. +It modifies Firefox in order to avoid many know application level attacks on +the privacy of Tor users. + +WARNING: This is not the official Tor Browser and is currently on testing. Use +at your own risk and please report back on guix channels if you find any +issues.") + (license license:mpl2.0))) ;and others, see toolkit/content/license.html