From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id D3gkMW0ksmAgfAAAgWs5BA (envelope-from ) for ; Sat, 29 May 2021 13:24:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id qPQYLG0ksmCQNwAAbx9fmQ (envelope-from ) for ; Sat, 29 May 2021 11:24:29 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 795061F5B0 for ; Sat, 29 May 2021 13:24:29 +0200 (CEST) Received: from localhost ([::1]:51168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmx4u-0001Md-I7 for larch@yhetil.org; Sat, 29 May 2021 07:24:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmx4U-0001MU-U0 for guix-patches@gnu.org; Sat, 29 May 2021 07:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44668) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmx4U-0004df-Mi for guix-patches@gnu.org; Sat, 29 May 2021 07:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lmx4U-0005EY-Fj for guix-patches@gnu.org; Sat, 29 May 2021 07:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48729] [PATCH v1 24/24] gnu: Add bitmask-vpn. 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: Sat, 29 May 2021 11:24: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.162228740320061 (code B ref 48729); Sat, 29 May 2021 11:24:02 +0000 Received: (at 48729) by debbugs.gnu.org; 29 May 2021 11:23:23 +0000 Received: from localhost ([127.0.0.1]:56214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmx3q-0005DU-Uy for submit@debbugs.gnu.org; Sat, 29 May 2021 07:23:23 -0400 Received: from out1.migadu.com ([91.121.223.63]:15830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmx3p-0005DL-2p for 48729@debbugs.gnu.org; Sat, 29 May 2021 07:23:22 -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=1622287400; 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; bh=isAih8ncrfvUTAp04Md6NNTQhV+G+RuzBqgwU3RcKOE=; b=mpRXti3bfBRBzkPpbJz4LqjxwCz/j47WTmD0Ou19tO8NboKtATnBnRy2si9jala7G2B8hl UIC3f3r3Ow+YOAvAqaLKL2o2n4GxWYTPDbwxPhxktEMO85DDQYh1/jsCaeCh3TuWoVeeLX 1bs1khMFDn0BVcEtIGUxDYsk3i+536V9XeE+dCfjLoUvaiMOpivlOqOHtIrhHS9WHEdnG0 +gIO12viM6rcDzzrVZATAsc333+naSOnnyemGz+ep/zCZsrwXosb4xoeUMj/NlEcUtfl8q yanwoLX1Y6vm0hptRJ0xCPJfAuvbZZ2YMfinQpcXfyhFqIrctfO7NZOP8uSkdA== Date: Sat, 29 May 2021 07:23:03 -0400 Message-Id: <20210529112303.23925-24-rg@raghavgururajan.name> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: 795061F5B0 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: BRHPPuzz+msn * gnu/packages/vpn.scm (bitmask-vpn): New variable. Co-authored-by: jgart --- gnu/packages/vpn.scm | 114 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index a952e3f0db..d2edac06ec 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -38,6 +38,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #: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 utils) @@ -52,6 +53,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #: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) @@ -69,6 +71,118 @@ #:use-module (gnu packages tls) #:use-module (gnu packages xml)) +(define-public bitmask-vpn + (package + (name "bitmask-vpn") + (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")))) + (build-system go-build-system) + (arguments + `(#:tests? #f + #:unpack-path "0xacab.org/leap/bitmask-vpn" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* (find-files "." "\\.go$") + (("github.com/ProtonMail/go-autostart") + "github.com/emersion/go-autostart")) + #t)) + (replace 'build + (lambda* (#:key source system outputs search-paths build-flags unpack-path inputs #:allow-other-keys) + (for-each + (lambda (directory) + ((assoc-ref %standard-phases 'build) + #:source source + #:system system + #:outputs outputs + #:search-paths search-paths + #:build-flags build-flags + #:unpack-path unpack-path + #:inputs inputs + #:import-path directory)) + (list + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-helper" + "0xacab.org/leap/bitmask-vpn/gui" + "0xacab.org/leap/bitmask-vpn/pkg/backend" + "0xacab.org/leap/bitmask-vpn/pkg/bitmask" + "0xacab.org/leap/bitmask-vpn/pkg/config" + "0xacab.org/leap/bitmask-vpn/pkg/helper" + "0xacab.org/leap/bitmask-vpn/pkg/pickle" + "0xacab.org/leap/bitmask-vpn/pkg/pid" + "0xacab.org/leap/bitmask-vpn/pkg/vpn")) + #t)) + (replace 'install + (lambda* (#:key source system outputs search-paths install-source? unpack-path inputs #:allow-other-keys) + (for-each + (lambda (directory) + ((assoc-ref %standard-phases 'install) + #:source source + #:system system + #:outputs outputs + #:search-paths search-paths + #:install-source? install-source? + #:unpack-path unpack-path + #:inputs inputs + #:import-path directory)) + (list + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-helper" + "0xacab.org/leap/bitmask-vpn/gui" + "0xacab.org/leap/bitmask-vpn/pkg/backend" + "0xacab.org/leap/bitmask-vpn/pkg/bitmask" + "0xacab.org/leap/bitmask-vpn/pkg/config" + "0xacab.org/leap/bitmask-vpn/pkg/helper" + "0xacab.org/leap/bitmask-vpn/pkg/pickle" + "0xacab.org/leap/bitmask-vpn/pkg/pid" + "0xacab.org/leap/bitmask-vpn/pkg/vpn")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) + (propagated-inputs + `(("go-github-com-apparentlymart-go-openvpn-mgmt" + ,go-github-com-apparentlymart-go-openvpn-mgmt) + ("go-github-com-dchest-siphash" + ,go-github-com-dchest-siphash) + ("go-github-com-emersion-go-autostart" + ,go-github-com-emersion-go-autostart) + ("go-github-com-kardianos-osext" + ,go-github-com-kardianos-osext) + ("go-github-com-keybase-go-ps" + ,go-github-com-keybase-go-ps) + ("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-operatorfoundation-shapeshifter-transports" + ,go-github-com-operatorfoundation-shapeshifter-transports) + ("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-crypto" ,go-golang-org-x-crypto) + ("go-golang-org-x-net" ,go-golang-org-x-net) + ("go-golang-org-x-sys" ,go-golang-org-x-sys) + ("go-0xacab-org-leap-shapeshifter" + ,go-0xacab-org-leap-shapeshifter))) + (synopsis "Bitmask VPN Client") + (description "Bitmask-VPN is LEAP’s very own VPN client. 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") -- 2.31.1