From patchwork Thu Jul 1 04:57:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 30889 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 190BA27BC81; Thu, 1 Jul 2021 06:09:31 +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,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 CA20927BC78 for ; Thu, 1 Jul 2021 06:09:30 +0100 (BST) Received: from localhost ([::1]:47556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyox7-0005ow-RR for patchwork@mira.cbaines.net; Thu, 01 Jul 2021 01:09:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyom2-0005YT-8i for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyom2-0003Yj-1M for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyom1-0004bK-VV for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48729] [PATCH v7 21/25] gnu: Add go-github-com-kataras-golog. References: <574ccbc7-599c-082b-51ca-17e625d4575f@raghavgururajan.name> In-Reply-To: <574ccbc7-599c-082b-51ca-17e625d4575f@raghavgururajan.name> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Jul 2021 04:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 48729@debbugs.gnu.org Cc: Raghav Gururajan , jgart@dismail.de Received: via spool by 48729-submit@debbugs.gnu.org id=B48729.162511547417647 (code B ref 48729); Thu, 01 Jul 2021 04:58:01 +0000 Received: (at 48729) by debbugs.gnu.org; 1 Jul 2021 04:57:54 +0000 Received: from localhost ([127.0.0.1]:59291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyolt-0004aY-MT for submit@debbugs.gnu.org; Thu, 01 Jul 2021 00:57:53 -0400 Received: from out2.migadu.com ([188.165.223.204]:63570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyolq-0004aB-MA for 48729@debbugs.gnu.org; Thu, 01 Jul 2021 00:57:52 -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=raghavgururajan.name; s=key1; t=1625115468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NXyzAu3ppIxRhqb4dEkvmr/bivXXsrMoPHqohDhQMOM=; b=AehBb1uvwKZ0ImS76qN2QycQ01MCLoR1NfFTVdA+Ce+5Co9lWGmsx2/Zz4qDCJf+r9uUhB 8U8FC2dnlGMcrA/MPljSvNgoLK/CDakqGgRTftFzAU+IBHBW3AQyXUsT004SldgFU3Wz30 y3T5EvgCHPDOPAg41iuKzDrvhd8oO+rC0RB1qRlxIqYwR1atvFcCwey/Tr2wLjhOuhYlDx JuAHqMHvvfVrBuD+HmSK9+h07vq8wnNCxEzWGWNgApW6jFym+QmpoiYVIv4PCosSfMbEDj OlJMoxR+H1IUqFjp1oc3K9ixZMcSxPbV6MVgSI+ldsll6OkCUDHRKhJaHwTOSA== Date: Thu, 1 Jul 2021 00:57:24 -0400 Message-Id: <20210701045728.7293-21-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-kataras-golog): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0cf2f22642..d378e1feaa 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -73,6 +73,31 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1)) +(define-public go-github-com-kataras-golog + (package + (name "go-github-com-kataras-golog") + (version "0.1.7") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/kataras/golog") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ll24g50j48wqikzf67cyaq0m0f57v1ap24nbz3cmv3yzqi6wdl9")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/kataras/golog")) + (propagated-inputs + `(("go-github-com-kataras-pio" + ,go-github-com-kataras-pio))) + (home-page "https://github.com/kataras/golog") + (synopsis "Logging foundation for Go applications") + (description "GoLog is a level-based logger written in Go.") + (license license:bsd-3))) + (define-public go-github-com-kataras-pio (package (name "go-github-com-kataras-pio") From patchwork Thu Jul 1 04:57:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 30890 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 CB0A227BC78; Thu, 1 Jul 2021 06:09: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,SPF_HELO_PASS,TVD_SPACE_RATIO,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 957ED27BC81 for ; Thu, 1 Jul 2021 06:09:36 +0100 (BST) Received: from localhost ([::1]:47762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyoxD-0005ya-M4 for patchwork@mira.cbaines.net; Thu, 01 Jul 2021 01:09:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyom2-0005Za-RG for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyom2-0003Yo-BA for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyom2-0004bR-Bq for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48729] [PATCH v7 22/25] gnu: Add go-github-com-operatorfoundation-shapeshifter-transports. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Jul 2021 04:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 48729@debbugs.gnu.org Cc: Raghav Gururajan , jgart@dismail.de Received: via spool by 48729-submit@debbugs.gnu.org id=B48729.162511547417655 (code B ref 48729); Thu, 01 Jul 2021 04:58:02 +0000 Received: (at 48729) by debbugs.gnu.org; 1 Jul 2021 04:57:54 +0000 Received: from localhost ([127.0.0.1]:59293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyolt-0004aa-Te for submit@debbugs.gnu.org; Thu, 01 Jul 2021 00:57:54 -0400 Received: from out2.migadu.com ([188.165.223.204]:63585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyolq-0004aD-NF for 48729@debbugs.gnu.org; Thu, 01 Jul 2021 00:57:52 -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=raghavgururajan.name; s=key1; t=1625115470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3XI/IT/3TdRqYUSpX0V3eal07hXj7Tct9h4+TxhWFIs=; b=N5SnwAoHYEh3m1oenEw6ymuVn3azfor8Iw2CeKjNhYET+eT9w7NEyFyKDdLHPRXqKe09c2 n37uYUboHQN1sCPxSM0iZTomrpXScEB6i+OMvu98A9vu6wzrTUgKMmgpp0STTmmYWZDLwY BsJmkAVdzEPOTa0bQAbRdH4PcVsUuiCs0UQZFoBqgrA9KJ0NcqoELxx2TIvbF8Acyeq4mH xZF6C/U1uPfIjkrnAOepyJS0xf2cd5lXdvKuNxwnGwO8n/JLD32o/KdEyrF8SpDeOXWPSP ffCb1D8Bkl+sTAqnuZrgUfU11ceVTg8zVLtO8S8Jcm8Zk55Zet7UqOEykN0Zsw== Date: Thu, 1 Jul 2021 00:57:25 -0400 Message-Id: <20210701045728.7293-22-rg@raghavgururajan.name> In-Reply-To: <20210701045728.7293-21-rg@raghavgururajan.name> References: <20210701045728.7293-21-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-github-com-operatorfoundation-shapeshifter-transports): New variable. --- gnu/packages/golang.scm | 135 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d378e1feaa..16fb75d8bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -73,6 +73,141 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1)) +(define-public go-github-com-operatorfoundation-shapeshifter-transports + (package + (name "go-github-com-operatorfoundation-shapeshifter-transports") + (version "3.0.12") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/OperatorFoundation/shapeshifter-transports") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f1hzhk3q2fgqdg14zlg3z0s0ib1y9xwj89qnjk95b37zbgqjgsb")))) + (build-system go-build-system) + (arguments + `(#: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 + (lambda (directory) + (apply (assoc-ref %standard-phases 'build) + `(,@arguments #:import-path ,directory))) + (list + "github.com/OperatorFoundation/shapeshifter-transports/transports/Dust/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Dust/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Optimizer/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Optimizer/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Replicant/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Replicant/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/meekserver/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/meekserver/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3")))) + (replace 'check + (lambda arguments + (for-each + (lambda (directory) + (apply (assoc-ref %standard-phases 'check) + `(,@arguments #:import-path ,directory))) + (list + ;;; ERROR: invalid memory address or nil pointer dereference. + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/Dust/v2" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/Dust/v3" + ;;; ERROR: failed with status 1. + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/Optimizer/v2" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/Optimizer/v3" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/Replicant/v2" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/Replicant/v3" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v2" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3" + ;;; ERROR: bind: permission denied. + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/meekserver/v2" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/meekserver/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3")))) + ;;; ERROR: failed with status 1. + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v2" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v2" + ;;"github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3")))) + (replace 'install + (lambda arguments + (for-each + (lambda (directory) + (apply (assoc-ref %standard-phases 'install) + `(,@arguments #:import-path ,directory))) + (list + "github.com/OperatorFoundation/shapeshifter-transports/transports/Dust/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Dust/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Optimizer/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Optimizer/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Replicant/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/Replicant/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/meeklite/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/meekserver/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/meekserver/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs2/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/obfs4/v3" + "github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v2" + "github.com/OperatorFoundation/shapeshifter-transports/transports/shadow/v3"))))))) + (native-inputs + `(("go-github-com-stretchr-testify" + ,go-github-com-stretchr-testify))) + (propagated-inputs + `(("go-github-com-aead-chacha20" + ,go-github-com-aead-chacha20) + ("go-github-com-blanu-dust" + ,go-github-com-blanu-dust) + ("go-github-com-deckarep-golang-set" + ,go-github-com-deckarep-golang-set) + ("go-github-com-kataras-golog" + ,go-github-com-kataras-golog) + ("go-github-com-mufti1-interconv" + ,go-github-com-mufti1-interconv) + ("go-github-com-opentracing-opentracing-go" + ,go-github-com-opentracing-opentracing-go) + ("go-github-com-operatorfoundation-monolith-go" + ,go-github-com-operatorfoundation-monolith-go) + ("go-github-com-operatorfoundation-obfs4" + ,go-github-com-operatorfoundation-obfs4) + ("go-github-com-operatorfoundation-shapeshifter-ipc" + ,go-github-com-operatorfoundation-shapeshifter-ipc) + ("go-github-com-shadowsocks-go-shadowsocks2" + ,go-github-com-shadowsocks-go-shadowsocks2) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) + ("go-golang-org-x-net" ,go-golang-org-x-net) + ("go-torproject-org-pluggable-transports-goptlib" + ,go-torproject-org-pluggable-transports-goptlib))) + (home-page "https://github.com/OperatorFoundation/shapeshifter-transports") + (synopsis "Go implementation of Pluggable Transports") + (description "Shapeshifter-Transports is a set of Pluggable Transports +implementing the Go API from the Pluggable Transports 2.0 specification. +Each transport implements a different method of shapeshifting network traffic. +The goal is for application traffic to be sent over the network in a shapeshifted +form that bypasses network filtering, allowing the application to work on +networks where it would otherwise be blocked or heavily throttled.") + (license license:expat))) + (define-public go-github-com-kataras-golog (package (name "go-github-com-kataras-golog") From patchwork Thu Jul 1 04:57:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 30888 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 BAE1927BC81; Thu, 1 Jul 2021 06:00:16 +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,SPF_HELO_PASS,TVD_SPACE_RATIO,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 70EAC27BC78 for ; Thu, 1 Jul 2021 06:00:16 +0100 (BST) Received: from localhost ([::1]:39730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyoo9-00007W-Nn for patchwork@mira.cbaines.net; Thu, 01 Jul 2021 01:00:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyom2-0005Zk-Vy for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyom2-0003Yr-NM for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyom2-0004bZ-Nx for guix-patches@gnu.org; Thu, 01 Jul 2021 00:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48729] [PATCH v7 23/25] gnu: Add go-0xacab-org-leap-shapeshifter. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Jul 2021 04:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 48729@debbugs.gnu.org Cc: Raghav Gururajan , jgart@dismail.de Received: via spool by 48729-submit@debbugs.gnu.org id=B48729.162511547417662 (code B ref 48729); Thu, 01 Jul 2021 04:58:02 +0000 Received: (at 48729) by debbugs.gnu.org; 1 Jul 2021 04:57:54 +0000 Received: from localhost ([127.0.0.1]:59295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyolu-0004ai-D0 for submit@debbugs.gnu.org; Thu, 01 Jul 2021 00:57:54 -0400 Received: from out2.migadu.com ([188.165.223.204]:63593) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyols-0004aG-BP for 48729@debbugs.gnu.org; Thu, 01 Jul 2021 00:57:52 -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=raghavgururajan.name; s=key1; t=1625115471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YqV3oTzE6+mRfEy+rjvvMKjBjccEOE4LRbnIKpR0O94=; b=rUaKGvQz16bVlRDgxVIQbkmdyjA3duxoJJeO4ICjozuwTOew70vukOsmt7dthzEl4HnOE1 jeAN4HpWfz9j20+kSqmuFcO9ZPm/oYgoprY4KUmmB4sBNzqfwXPGbFwLb0noFvkgWyI1LU RKHy7lmYUyzKLUTU7h27P2kaU6Xbv/nS8DiiBHEMEc0cilKTif5Ca1ulEVtNpch13sf3Dz oYPxX5LuCIEoBg/LDfbpHFJHr6I3Tm58WWzyDqELnVYzwAPjLYQPlDsedoZRSKWN1xIquC yc6rkwzUwQ8dj88DyWb7D+1TM3ffBtsubEpCjzJLE2mnhlRceoY3MeXnqSfTmQ== Date: Thu, 1 Jul 2021 00:57:26 -0400 Message-Id: <20210701045728.7293-23-rg@raghavgururajan.name> In-Reply-To: <20210701045728.7293-21-rg@raghavgururajan.name> References: <20210701045728.7293-21-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (go-0xacab-org-leap-shapeshifter): New variable. --- gnu/packages/golang.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 16fb75d8bf..6c2467b09e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -73,6 +73,39 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1)) +(define-public go-0xacab-org-leap-shapeshifter + (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474") + (revision "12")) + (package + (name "go-0xacab-org-leap-shapeshifter") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://0xacab.org/leap/shapeshifter") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m4fla9ppl53k9syms4dsad92wakr74cdvids3xxv3amdh4d1w4i")))) + (build-system go-build-system) + (arguments + `(#:import-path "0xacab.org/leap/shapeshifter")) + (propagated-inputs + `(("go-github-com-operatorfoundation-obfs4" + ,go-github-com-operatorfoundation-obfs4) + ("go-github-com-operatorfoundation-shapeshifter-transports" + ,go-github-com-operatorfoundation-shapeshifter-transports) + ("go-golang-org-x-net" ,go-golang-org-x-net))) + (home-page "https://0xacab.org/leap/shapeshifter") + (synopsis "Shapeshifter Dispatcher Library") + (description "Shapeshifter provides network protocol shapeshifting +technology. The purpose of this technology is to change the characteristics of +network traffic so that it is not identified and subsequently blocked by network +filtering devices.") + (license license:bsd-2)))) + (define-public go-github-com-operatorfoundation-shapeshifter-transports (package (name "go-github-com-operatorfoundation-shapeshifter-transports") From patchwork Thu Jul 1 04:57:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 30887 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 BC9DC27BC78; Thu, 1 Jul 2021 05:59:55 +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,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 B4B4E27BC81 for ; Thu, 1 Jul 2021 05:59:54 +0100 (BST) Received: from localhost ([::1]:39506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyonp-0008Q9-K1 for patchwork@mira.cbaines.net; Thu, 01 Jul 2021 00:59:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyon0-0007Gl-F6 for guix-patches@gnu.org; Thu, 01 Jul 2021 00:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyon0-0004Iv-7V for guix-patches@gnu.org; Thu, 01 Jul 2021 00:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyon0-0004dC-7j for guix-patches@gnu.org; Thu, 01 Jul 2021 00:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48729] [PATCH v7 24/25] gnu: Add bitmask. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Jul 2021 04:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 48729@debbugs.gnu.org Cc: Raghav Gururajan , jgart@dismail.de Received: via spool by 48729-submit@debbugs.gnu.org id=B48729.162511548417728 (code B ref 48729); Thu, 01 Jul 2021 04:59:02 +0000 Received: (at 48729) by debbugs.gnu.org; 1 Jul 2021 04:58:04 +0000 Received: from localhost ([127.0.0.1]:59301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyolw-0004b2-NJ for submit@debbugs.gnu.org; Thu, 01 Jul 2021 00:58:03 -0400 Received: from out2.migadu.com ([188.165.223.204]:63603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyolu-0004ag-CL for 48729@debbugs.gnu.org; Thu, 01 Jul 2021 00:57:55 -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=raghavgururajan.name; s=key1; t=1625115473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i3p7BFtOozZyobCneUY0EMkzkIgM5fSWJCOD8UT2Tmc=; b=Hgq1eD6humALdYcXUvxTuawiIXe0QlOmg5iYtR1uZ95f4ipFSeOZq9tUKA0eCnFjtqJCbN GRmGsQf3lcoupYTrb2H++8Ue0smSTtywdtPwwlyqa8Q5Ye+SJQkLBg7MQ+dzMIKI0UBFVb 6xWu1j2JEtWS48tcj1Fv2LAcZHkKCtfM9195+kpWp3MIfvxzLuIvUj7fPLHbBVP4MrGuAj VLJ+zCjPe1rE7EBRO/zfH6DT8CLuGozBmJ+ebHdRmUEcwfn4i5/CysS/zZB4zeRUG/RWji SSHcVBCRVotQHW5VHNlcn+Ad8/zaDjamPJBzE428V3H0t0OpQlaXVexhLLmSTA== Date: Thu, 1 Jul 2021 00:57:27 -0400 Message-Id: <20210701045728.7293-24-rg@raghavgururajan.name> In-Reply-To: <20210701045728.7293-21-rg@raghavgururajan.name> References: <20210701045728.7293-21-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/packages/vpn.scm (bitmask): New variable. Co-authored-by: jgart --- gnu/packages/vpn.scm | 205 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index aecf9831ca..b38d989d8c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -16,6 +16,8 @@ ;;; Copyright © 2020 Ivan Kozlov ;;; Copyright © 2020 David Dashyan ;;; Copyright © 2021 Domagoj Stolfa +;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,9 +40,12 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system linux-module) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -54,7 +59,9 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages gl) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) @@ -63,6 +70,7 @@ #:use-module (gnu packages nss) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages polkit) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) @@ -73,6 +81,203 @@ #:use-module (gnu packages tls) #:use-module (gnu packages xml)) +(define-public bitmask + (package + (name "bitmask") + (version "0.21.2") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://0xacab.org/leap/bitmask-vpn") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1b0cdgh4mqvalvknck1zjy7dhmjfyhbmn9knya6ymx8dqan308sr")) + (modules + '((guix build utils))) + (snippet + `(begin + ;; To remove bundled thirdparty sources. + (delete-file-recursively "branding/thirdparty") + ;; To generate version.go file. + (call-with-output-file "pkg/config/version/version.go" + (lambda (port) + (format port "package version\n") + (format port "\n") + (format port (string-append "var VERSION = \"" ,version "\"")))) + #t)))) + (build-system go-build-system) + (arguments + `(#:imported-modules + ((guix build cmake-build-system) + (guix build copy-build-system) + (guix build python-build-system) + (guix build qt-build-system) + ,@%go-build-system-modules) + #:modules + (((guix build copy-build-system) + #:prefix copy:) + ((guix build python-build-system) + #:prefix python:) + ((guix build qt-build-system) + #:prefix qt:) + (guix build utils) + (guix build go-build-system)) + #:unpack-path "0xacab.org/leap/bitmask-vpn" + #:import-path "0xacab.org/leap/bitmask-vpn/cmd/bitmask-helper" + #:phases + (modify-phases %standard-phases + (add-after 'setup-go-environment 'insert-missing-sources + ;; For some reason this package is left out. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((shapeshifter + (assoc-ref inputs "go-0xacab-org-leap-shapeshifter")) + (shapeshifter-src (string-append shapeshifter "/src"))) + (copy-recursively shapeshifter-src "src")))) + (add-after 'unpack 'patch + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion "src/0xacab.org/leap/bitmask-vpn" + ;; To use 'emersion/go-autostart', + ;; instead of 'ProtonMail/go-autostart', + ;; as the latter no longer exists. + (substitute* (find-files "." "\\.go$") + (("github.com/ProtonMail/go-autostart") + "github.com/emersion/go-autostart")) + ;; To use correct paths for referenced items. + (let* ((out (assoc-ref outputs "out")) + (policy-dir (string-append out "/share/polkit-1/actions")) + (policy-file "se.leap.bitmask.policy") + (policy-path (string-append policy-dir "/" policy-file)) + (ip (string-append (assoc-ref inputs "iproute") + "/sbin/ip")) + (iptables (string-append (assoc-ref inputs "iptables") + "/sbin/iptables")) + (ip6tables (string-append (assoc-ref inputs "iptables") + "/sbin/ip6tables")) + (sysctl (string-append (assoc-ref inputs "procps") + "/sbin/sysctl")) + (pkttyagent (string-append (assoc-ref inputs "polkit") + "/bin/pkttyagent")) + (openvpn (string-append (assoc-ref inputs "openvpn") + "/sbin/openvpn")) + (bitmask-root (string-append (assoc-ref outputs "out") + "/sbin/bitmask-root"))) + (substitute* (find-files "." "(\\.go$|\\.policy$|bitmask-root)") + (("swhich\\(\"ip\"\\)") + (string-append "\"" ip "\"")) + (("swhich\\(\"iptables\"\\)") + (string-append "\"" iptables "\"")) + (("swhich\\(\"ip6tables\"\\)") + (string-append "\"" ip6tables "\"")) + (("swhich\\(\"sysctl\"\\)") + (string-append "\"" sysctl "\"")) + (("/usr/(bin|lib|libexec)/.*(kit|agent|agent-1)") pkttyagent) + (("fingerprint-polkit-agent") "pkttyagent") + (("/usr/sbin/openvpn") openvpn) + (("/usr/sbin/bitmask-root") bitmask-root) + (("/usr/local/sbin/bitmask-root") bitmask-root) + (("/usr/share.*\\.policy") policy-path))) + (substitute* (find-files "." "\\.pro$") + ;; To use correct path for goshim files, + ;; which are generated in 'build-continued phase. + (("-L.*/lib") "-L./lib") + ;; FIXME: Unable to build i18n files. + (("TRANSLATIONS.*i18n.*$") "") + (("RESOURCES.*i18n.*$") ""))))) + (add-after 'build 'build-continued + (lambda _ + ;; To generate goshim library and header files. + (let* ((dir "src/0xacab.org/leap/bitmask-vpn") + (source (string-append dir "/gui/backend.go")) + (target (string-append dir "/lib/libgoshim.a"))) + (mkdir-p (string-append dir "/lib")) + (invoke "go" "build" "-buildmode=c-archive" "-o" target source)) + ;; To build bitmask application. + (with-directory-excursion "src/0xacab.org/leap/bitmask-vpn" + (delete-file "Makefile") + (invoke "qmake" "bitmask.pro") + (invoke "make" "release/bitmask")))) + (add-after 'check 'check-continued + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; To run bitmask test. + (with-directory-excursion "src/0xacab.org/leap/bitmask-vpn" + (delete-file "Makefile") + (invoke "qmake" "test.pro") + ;; Tests require display-server. + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Tests look for $XDG_RUNTIME_DIR. + (setenv "XDG_RUNTIME_DIR" (getenv "TEMP")) + ;; Tests write to $HOME. + (setenv "HOME" (getenv "TEMP")) + (invoke "make" "check"))))) + (add-after 'install 'install-continued + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + ;; To install bitmask program. + '(("src/0xacab.org/leap/bitmask-vpn/release" + "bin" + #:include ("bitmask")) + ;; To install bitmask-root script. + ("src/0xacab.org/leap/bitmask-vpn/helpers" + "sbin" + #:include ("bitmask-root")) + ;; To install polkit policy. + ("src/0xacab.org/leap/bitmask-vpn/helpers" + "share/polkit-1/actions" + #:include ("se.leap.bitmask.policy"))) + args))) + (add-after 'install-continued 'post-install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bitmask (string-append out "/bin/bitmask")) + (bitmask-root (string-append out "/sbin/bitmask-root"))) + ;; To make bitmask-root script executable. + (chmod bitmask-root #o776)))) + (add-after 'post-install 'python-wrap + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'python-wrap 'qt-wrap + (assoc-ref qt:%standard-phases 'qt-wrap))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("iproute" ,iproute) + ("iptables" ,iptables) + ("mesa" ,mesa) + ("openvpn" ,openvpn) + ("polkit" ,polkit) + ("procps" ,procps) + ("python" ,python) + ("qtbase" ,qtbase-5) + ("qtdeclarative" ,qtdeclarative) + ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols2" ,qtquickcontrols2))) + (propagated-inputs + `(("go-0xacab-org-leap-shapeshifter" + ,go-0xacab-org-leap-shapeshifter) + ("go-github-com-apparentlymart-go-openvpn-mgmt" + ,go-github-com-apparentlymart-go-openvpn-mgmt) + ("go-github-com-emersion-go-autostart" + ,go-github-com-emersion-go-autostart) + ("go-github-com-keybase-go-ps" + ,go-github-com-keybase-go-ps) + ("go-github-com-rakyll-statik" + ,go-github-com-rakyll-statik) + ("go-github-com-sevlyar-go-daemon" + ,go-github-com-sevlyar-go-daemon) + ("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (synopsis "White-label VPN client by LEAP") + (description "Bitmask, by @acronym{LEAP, LEAP Encryption Access Project}, +is an application to provide easy and secure encrypted communication with a +@acronym{VPN, Virtual Private Network}. It allows you to select from a variety +of trusted service provider all from one app. Current providers include Riseup +Networks and The Calyx Institute.") + (home-page "https://bitmask.net/") + (license license:gpl3+))) + (define-public gvpe (package (name "gvpe") From patchwork Thu Jul 1 04:57:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 30891 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 82FB827BC81; Thu, 1 Jul 2021 06:09:48 +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,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 4843B27BC78 for ; Thu, 1 Jul 2021 06:09:48 +0100 (BST) Received: from localhost ([::1]:48060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyoxP-0006BC-Dz for patchwork@mira.cbaines.net; Thu, 01 Jul 2021 01:09:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyon0-0007Hp-Re for guix-patches@gnu.org; Thu, 01 Jul 2021 00:59:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyon0-0004JI-Jj for guix-patches@gnu.org; Thu, 01 Jul 2021 00:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyon0-0004dK-KJ for guix-patches@gnu.org; Thu, 01 Jul 2021 00:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48729] [PATCH v7 25/25] services: Add bitmask-service-type. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Jul 2021 04:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 48729@debbugs.gnu.org Cc: Raghav Gururajan , jgart@dismail.de Received: via spool by 48729-submit@debbugs.gnu.org id=B48729.162511548417734 (code B ref 48729); Thu, 01 Jul 2021 04:59:02 +0000 Received: (at 48729) by debbugs.gnu.org; 1 Jul 2021 04:58:04 +0000 Received: from localhost ([127.0.0.1]:59306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyom4-0004bt-12 for submit@debbugs.gnu.org; Thu, 01 Jul 2021 00:58:04 -0400 Received: from out2.migadu.com ([188.165.223.204]:63614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyolw-0004b1-38 for 48729@debbugs.gnu.org; Thu, 01 Jul 2021 00:57:56 -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=raghavgururajan.name; s=key1; t=1625115475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8j9aI8O0roZ1Tjv4iKO+9P6JztHHYK+89msATycRH6Q=; b=dfhsC/AwGFJ4UWk7f8YQk8NGBs9NJjhkdYAOw5pjdU0s6D3UkHmubOyNxunG+fSUJ/ZAwJ MU3nwo0O1BxxOMEM1w2+Ss8wOUnXxaEpmLl2O6LE/bCK1aVGUqNSTi/IxROxokGttFtUE3 kMZIMohBojB9ybhGW0rMWRPYchFaAcGmXYw/fWIrXGOb2AqUsdEAwSOMeAjINr+jnBmgoe MN3UDwpyFmwwitnMkdoWYmlv0v7gJrPrqNuqfN428AE9jZOdPDyc71wdIEYbpKZIal2tte NdsOo+Zk1/rLTaWcg0bMlFc8emd9J8/7Q6eKZSsVTM2ObIKt4/06v4ItoG5afw== Date: Thu, 1 Jul 2021 00:57:28 -0400 Message-Id: <20210701045728.7293-25-rg@raghavgururajan.name> In-Reply-To: <20210701045728.7293-21-rg@raghavgururajan.name> References: <20210701045728.7293-21-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/services/vpn.scm (bitmask-service-type): New variable. Co-authored-by: jgart --- gnu/services/vpn.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index a51dda3873..55b4bd0b16 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -6,6 +6,8 @@ ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Domagoj Stolfa ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +27,7 @@ (define-module (gnu services vpn) #:use-module (gnu services) #:use-module (gnu services configuration) + #:use-module (gnu services dbus) #:use-module (gnu services shepherd) #:use-module (gnu system shadow) #:use-module (gnu packages admin) @@ -69,6 +72,22 @@ wireguard-service-type)) +;;; +;;; Bitmask VPN +;;; + +(define-public bitmask-service-type + (service-type + (name 'bitmask) + (description "Setup the @uref{https://bitmask.net, Bitmask} VPN application.") + (default-value bitmask) + (extensions + (list + ;; To configure polkit policy of bitmask. + (service-extension polkit-service-type list) + ;; To add bitmask to the system profile. + (service-extension profile-service-type list))))) + ;;; ;;; OpenVPN. ;;;