From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 01T+DD9BuWDKNAAAgWs5BA (envelope-from ) for ; Thu, 03 Jun 2021 22:53:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id kIWhBz9BuWACQgAAB5/wlQ (envelope-from ) for ; Thu, 03 Jun 2021 20:53:19 +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 D7FA7ADD0 for ; Thu, 3 Jun 2021 22:53:18 +0200 (CEST) Received: from localhost ([::1]:40430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1louL7-0002am-U4 for larch@yhetil.org; Thu, 03 Jun 2021 16:53:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1louKu-0001vs-Nv for guix-patches@gnu.org; Thu, 03 Jun 2021 16:53:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1louKu-0000i3-Fv for guix-patches@gnu.org; Thu, 03 Jun 2021 16:53:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1louKu-0005KO-Eh for guix-patches@gnu.org; Thu, 03 Jun 2021 16:53:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48729] [PATCH v2 47/47] gnu: Add bitmask-vpn. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Jun 2021 20:53:04 +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@disroot.org Received: via spool by 48729-submit@debbugs.gnu.org id=B48729.162275355220393 (code B ref 48729); Thu, 03 Jun 2021 20:53:04 +0000 Received: (at 48729) by debbugs.gnu.org; 3 Jun 2021 20:52:32 +0000 Received: from localhost ([127.0.0.1]:44832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1louKK-0005Im-1b for submit@debbugs.gnu.org; Thu, 03 Jun 2021 16:52:32 -0400 Received: from out1.migadu.com ([91.121.223.63]:40539) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1louKI-0005Ic-58 for 48729@debbugs.gnu.org; Thu, 03 Jun 2021 16:52:27 -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=1622753545; 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=EiQODyiqyUKhoaDZJyo7wTcgCTEBBXdstrKas7UyIZI=; b=VVkW5i+K7L27QlwyI9/ESRaMAnawiZcC58p1IJrmSsOMft8CwyMWVmCmUoGB1TV7G/vmuH fk/3qDGa48DGkCYyMXrs/C4H6AILTPRJC/+vYxVNsGvBwbcCnK7AC0WukZ9iYebDpRh4zz ZrUqXnnsgNAzXM5Oe1tqlEOLUJOCRop6awFXKUMeBpUx0LPyHOrt2KVUxcsuGIrsNwesk/ wfpuybpK7Kf0W8CHOHOwbOmKyY2NyD2thMzt/xu/YSP/juKLCz0nqKbwSRrxXa7ZT35zEU /A8w1w6mqBhWlu4Lg1TxLnad4+dLfTtEbYCx3kGJllGulErCTzHd3dExq11m1A== Date: Thu, 3 Jun 2021 16:51:10 -0400 Message-Id: <20210603205110.7102-47-rg@raghavgururajan.name> In-Reply-To: <20210603205110.7102-40-rg@raghavgururajan.name> References: <20210603205110.7102-40-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: D7FA7ADD0 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: X4/f/b94jQT3 * gnu/packages/vpn.scm (bitmask-vpn): New variable. Co-authored-by: Jorge Gomez --- gnu/packages/vpn.scm | 150 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index a952e3f0db..12d2b6edd2 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -15,6 +15,8 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Ivan Kozlov ;;; Copyright © 2020 David Dashyan +;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2021 Jorge Gomez ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +40,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 +55,8 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) + #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) @@ -69,6 +74,151 @@ #:use-module (gnu packages tls) #:use-module (gnu packages xml)) +(define-public bitmask-vpn + (package + (name "bitmask-vpn") + (version "0.20.4") + (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 "04sh69m5fq3gml4xgzv92z8i3hay98n9llq9p7p6q9q81s8q8849")))) + (build-system go-build-system) + (arguments + `(#: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)) + (add-after 'setup-go-environment 'insert-shapeshifter + ;; For some reason these packages are left out. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((go-dialog (assoc-ref inputs "go-0xacab-org-leap-go-dialog")) + (go-dialog-src (string-append go-dialog "/src")) + (shapeshifter (assoc-ref inputs "go-0xacab-org-leap-shapeshifter")) + (shapeshifter-src (string-append shapeshifter "/src"))) + (copy-recursively go-dialog-src "src") + (copy-recursively shapeshifter-src "src")) + #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-connect" + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-helper" + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-vpn" + "0xacab.org/leap/bitmask-vpn/pkg/bitmask" + "0xacab.org/leap/bitmask-vpn/pkg/bitmaskd" + "0xacab.org/leap/bitmask-vpn/pkg/config" + "0xacab.org/leap/bitmask-vpn/pkg/helper" + "0xacab.org/leap/bitmask-vpn/pkg/standalone" + "0xacab.org/leap/bitmask-vpn/pkg/systray" + "0xacab.org/leap/bitmask-vpn/tools/transifex")) + #t)) + (replace 'check + (lambda* (#:key source system outputs search-paths tests? unpack-path inputs #:allow-other-keys) + (for-each + (lambda (directory) + ((assoc-ref %standard-phases 'check) + #:source source + #:system system + #:outputs outputs + #:search-paths search-paths + #:tests? tests? + #:unpack-path unpack-path + #:inputs inputs + #:import-path directory)) + (list + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-connect" + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-helper" + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-vpn" + "0xacab.org/leap/bitmask-vpn/pkg/bitmask" + "0xacab.org/leap/bitmask-vpn/pkg/bitmaskd" + "0xacab.org/leap/bitmask-vpn/pkg/config" + "0xacab.org/leap/bitmask-vpn/pkg/helper" + "0xacab.org/leap/bitmask-vpn/pkg/standalone" + "0xacab.org/leap/bitmask-vpn/pkg/systray" + "0xacab.org/leap/bitmask-vpn/tools/transifex")) + #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-connect" + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-helper" + "0xacab.org/leap/bitmask-vpn/cmd/bitmask-vpn" + "0xacab.org/leap/bitmask-vpn/pkg/bitmask" + "0xacab.org/leap/bitmask-vpn/pkg/bitmaskd" + "0xacab.org/leap/bitmask-vpn/pkg/config" + "0xacab.org/leap/bitmask-vpn/pkg/helper" + "0xacab.org/leap/bitmask-vpn/pkg/standalone" + "0xacab.org/leap/bitmask-vpn/pkg/systray" + "0xacab.org/leap/bitmask-vpn/tools/transifex")) + #t))))) + (native-inputs + `(("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (inputs + `(("gtk+" ,gtk+) + ("libappindicator" ,libappindicator))) + (propagated-inputs + `(("go-0xacab-org-leap-go-dialog" + ,go-0xacab-org-leap-go-dialog) + ("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-getlantern-systray" + ,go-github-com-getlantern-systray) + ("go-github-com-jmshal-go-locale" + ,go-github-com-jmshal-go-locale) + ("go-github-com-keybase-go-ps" + ,go-github-com-keybase-go-ps) + ("go-github-com-sevlyar-go-daemon" + ,go-github-com-sevlyar-go-daemon) + ("go-github-com-skratchdot-open-golang" + ,go-github-com-skratchdot-open-golang) + ("go-golang-org-x-sys" ,go-golang-org-x-sys) + ("go-golang-org-x-text" ,go-golang-org-x-text) + ("go-golang-org-x-tools" ,go-golang-org-x-tools))) + (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