From unknown Mon Jun 23 23:54:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#41431] [PATCH] gnu: Add protonvpn-cli. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 May 2020 03:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41431 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41431@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Reply-To: Ryan Prior Received: via spool by submit@debbugs.gnu.org id=B.159003181232251 (code B ref -1); Thu, 21 May 2020 03:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 May 2020 03:30:12 +0000 Received: from localhost ([127.0.0.1]:54907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbbuN-0008O7-Nc for submit@debbugs.gnu.org; Wed, 20 May 2020 23:30:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:52464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbbuM-0008O0-Cu for submit@debbugs.gnu.org; Wed, 20 May 2020 23:30:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbbuM-0007GZ-6G for guix-patches@gnu.org; Wed, 20 May 2020 23:30:10 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:57005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbbuK-0000IZ-2K for guix-patches@gnu.org; Wed, 20 May 2020 23:30:09 -0400 Date: Thu, 21 May 2020 03:29:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1590031797; bh=CQ8Rj9cpCVzDQq6hJKqoT3LIBPq4jyBywSSUMxsYHbQ=; h=Date:To:From:Reply-To:Subject:From; b=pSC4auoJLowj8b/CWVtnF1Xk/fjvJprHP5qambcR1DwXThHHnw+mYcvRZSATx9j7V WhUeKyNLnhxb4dbRr0qT5N5Ca4q0nZdIXwF9+HxmrzTYoYAicmJu63XCg+z0k2m6UT Sx0CVj/9XSj+FIVI+Z9BKbNSQIL6v5Ez0L+TpxhM= From: Ryan Prior Message-ID: <20200521032943.26115-1-rprior@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Received-SPF: pass client-ip=185.70.40.18; envelope-from=rprior@protonmail.com; helo=mail1.protonmail.ch X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 23:29:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/vpn.scm (protonvpn-cli): New variable. --- gnu/packages/vpn.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index da881493bf..b47cad2ae0 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -12,6 +12,7 @@ ;;; Copyright =C2=A9 2019 Rutger Helling ;;; Copyright =C2=A9 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2020 Brice Waegeneire +;;; Copyright =C2=A9 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) #:use-module (gnu packages tls) #:use-module (gnu packages xml)) =20 @@ -311,6 +313,38 @@ security protocol that utilizes SSL/TLS for key exchan= ge. It is capable of traversing network address translators (@dfn{NAT}s) and firewalls.") (license license:gpl2))) =20 +(define-public protonvpn-cli + (package + (name "protonvpn-cli") + (version "2.2.2") + (source + (origin + ;; PyPI has a ".whl" file but not a proper source release. + ;; Thus, fetch code from Git. + (method git-fetch) + (uri (git-reference + (url "https://github.com/ProtonVPN/linux-cli.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ixjb02kj4z79whm1izd8mrn2h0rp9cmw4im1qvp93rahqxdd4n8")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) + (native-inputs + `(("docopt" ,python-docopt))) + (inputs + `(("pythondialog" ,python-pythondialog) + ("requests" ,python-requests))) + (propagated-inputs + `(("openvpn" ,openvpn))) + (synopsis "Command-line client for ProtonVPN") + (description + "ProtonVPN is a secure point-to-point virtual private networking serv= ice +with a gratis tier.") + (home-page "https://github.com/ProtonVPN/linux-cli") + (license license:gpl3))) + (define-public tinc (package (name "tinc") --=20 2.26.2 From unknown Mon Jun 23 23:54:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#41431] [PATCH] gnu: Add protonvpn-cli. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 14:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41431 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ryan Prior Cc: 41431@debbugs.gnu.org Received: via spool by 41431-submit@debbugs.gnu.org id=B41431.15902434846614 (code B ref 41431); Sat, 23 May 2020 14:19:01 +0000 Received: (at 41431) by debbugs.gnu.org; 23 May 2020 14:18:04 +0000 Received: from localhost ([127.0.0.1]:35245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcUyR-0001ic-QY for submit@debbugs.gnu.org; Sat, 23 May 2020 10:18:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcUyQ-0001hs-OT for 41431@debbugs.gnu.org; Sat, 23 May 2020 10:18:03 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43620) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcUyL-0006hq-DD; Sat, 23 May 2020 10:17:57 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=52286 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jcUyB-0008NH-Vi; Sat, 23 May 2020 10:17:55 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200521032943.26115-1-rprior@protonmail.com> Date: Sat, 23 May 2020 16:17:46 +0200 In-Reply-To: <20200521032943.26115-1-rprior@protonmail.com> (Ryan Prior's message of "Thu, 21 May 2020 03:29:46 +0000") Message-ID: <87o8qe68hh.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Ryan Prior skribis: > * gnu/packages/vpn.scm (protonvpn-cli): New variable. Overall LGTM, with minor issues: > + (arguments '(#:tests? #f)) When enabling the tests, I get: --8<---------------cut here---------------start------------->8--- starting phase `check' running "python setup.py" with command "test" and parameters () running test running egg_info writing protonvpn_cli.egg-info/PKG-INFO writing dependency_links to protonvpn_cli.egg-info/dependency_links.txt writing entry points to protonvpn_cli.egg-info/entry_points.txt writing requirements to protonvpn_cli.egg-info/requires.txt writing top-level names to protonvpn_cli.egg-info/top_level.txt reading manifest file 'protonvpn_cli.egg-info/SOURCES.txt' writing manifest file 'protonvpn_cli.egg-info/SOURCES.txt' running build_ext error: [Errno 13] Permission denied: '/.pvpn-cli' command "python" "-c" "import setuptools, tokenize;__file__=3D'setup.py';f= =3Dgetattr(tokenize, 'open', open)(__file__);code=3Df.read().replace('\\r\\= n', '\\n');f.close();exec(compile(code, __file__, 'exec'))" "test" failed w= ith status 1 --8<---------------cut here---------------end--------------->8--- So there are definitely tests, but for some reason they=E2=80=99re not work= ing as expected. Could you take a look? (In general we don=E2=80=99t disable = tests unless there=E2=80=99s a compelling reason to do so.) > + (description > + "ProtonVPN is a secure point-to-point virtual private networking se= rvice > +with a gratis tier.") > + (home-page "https://github.com/ProtonVPN/linux-cli") > + (license license:gpl3))) This is =E2=80=98gpl3+=E2=80=99 AFAICS since nothing says =E2=80=9Cversion = 3 only.=E2=80=9D Could you send an updated patch? Bonus points if you expound the description a bit. :-) Thanks, Ludo=E2=80=99. From unknown Mon Jun 23 23:54:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#41431] [PATCH] gnu: Add protonvpn-cli. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 19:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41431 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 41431@debbugs.gnu.org Reply-To: Ryan Prior Received: via spool by 41431-submit@debbugs.gnu.org id=B41431.15902611002243 (code B ref 41431); Sat, 23 May 2020 19:12:01 +0000 Received: (at 41431) by debbugs.gnu.org; 23 May 2020 19:11:40 +0000 Received: from localhost ([127.0.0.1]:35690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZYU-0000a0-A2 for submit@debbugs.gnu.org; Sat, 23 May 2020 15:11:40 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:35525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcZYP-0000Zi-Da for 41431@debbugs.gnu.org; Sat, 23 May 2020 15:11:32 -0400 Date: Sat, 23 May 2020 19:11:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1590261083; bh=veZcTUV2WpUJLL/1M2dHGkJY+Rq6SRxGveW3JqxgaXY=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=MVbIoA3qxvTCofo+An+j0ARq14GOBAmmN9rleeiDNc3EC278s4kUjmv7LVeh/QaHo t+8fB30HNDaXBr9Thgv5SyR5vtvBFyBPV5v9Z13vu3AwH+8YGJxovkYDtaRDyXSvCH vCBzrSauCAf1lZyTAIPJs3283OQzGtL2NlYZv/dI= From: Ryan Prior Message-ID: In-Reply-To: <87o8qe68hh.fsf@gnu.org> References: <20200521032943.26115-1-rprior@protonmail.com> <87o8qe68hh.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_3e227dc87ec24481037db3b50e049c2d" X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --b1_3e227dc87ec24481037db3b50e049c2d Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 Original Me= ssage =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 On Saturday, May 23, 2020 2:17 PM, Ludovic Court=C3=A8s wrot= e: > there are definitely tests What makes you so sure? `grep -r '\Wtest' .` suggests that the only referen= ce to testing in the whole repo is in protonvpn_cli/utils.py (wait_for_netw= ork) which tests for a network connection at runtime. I don't think they ar= e shipping any tests; setup.py can test to make sure you can actually insta= ll your dependencies, but that's not a meaningful upstream test, it's a def= ault behavior. > > - (license license:gpl3))) > > This is =E2=80=98gpl3+=E2=80=99 AFAICS since nothing says =E2=80=9Cversio= n 3 only.=E2=80=9D Nothing says "or any later version" either=E2=80=94I had been under the imp= ression that the "plus" was opt-in, but reading GPLv3 again it appears to b= e opt-out. I don't know, that's not my area of expertise. I've updated the = patch to gpl3+ with your recommendation in any case. > Could you send an updated patch? > > Bonus points if you expound the description a bit. :-) Of course! Here you go. Thanks, Ryan --b1_3e227dc87ec24481037db3b50e049c2d Content-Type: text/x-patch; name="0001-gnu-Add-protonvpn-cli.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-Add-protonvpn-cli.patch RnJvbSBlMjRjYTAwNzczN2FiN2Y2ZTc1NzJjZWUyYjgyNzU3OGZmNDJhMzZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSeWFuIFByaW9yIDxycHJpb3JAcHJvdG9ubWFpbC5jb20+CkRh dGU6IFdlZCwgMjAgTWF5IDIwMjAgMjI6Mjg6MTEgLTA1MDAKU3ViamVjdDogW1BBVENIXSBnbnU6 IEFkZCBwcm90b252cG4tY2xpLgoKKiBnbnUvcGFja2FnZXMvdnBuLnNjbSAocHJvdG9udnBuLWNs aSk6IE5ldyB2YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvdnBuLnNjbSB8IDM2ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDM2IGluc2VydGlv bnMoKykKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvdnBuLnNjbSBiL2dudS9wYWNrYWdlcy92 cG4uc2NtCmluZGV4IGRhODgxNDkzYmYuLjhmN2ZiM2I1NzcgMTAwNjQ0Ci0tLSBhL2dudS9wYWNr YWdlcy92cG4uc2NtCisrKyBiL2dudS9wYWNrYWdlcy92cG4uc2NtCkBAIC0xMiw2ICsxMiw3IEBA CiA7OzsgQ29weXJpZ2h0IMKpIDIwMTkgUnV0Z2VyIEhlbGxpbmcgPHJoZWxsaW5nQG15a29sYWIu Y29tPgogOzs7IENvcHlyaWdodCDCqSAyMDE5IFJpY2FyZG8gV3VybXVzIDxyZWthZG9AZWxlcGhs eS5uZXQ+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjAgQnJpY2UgV2FlZ2VuZWlyZSA8YnJpY2VAd2Fl Z2VuZWkucmU+Cis7OzsgQ29weXJpZ2h0IMKpIDIwMjAgUnlhbiBQcmlvciA8cnByaW9yQHByb3Rv bm1haWwuY29tPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsK QEAgLTU1LDYgKzU2LDcgQEAKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGtnLWNvbmZp ZykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcHl0aG9uKQogICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyBweXRob24teHl6KQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBw eXRob24td2ViKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB0bHMpCiAgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIHhtbCkpCiAKQEAgLTMxMSw2ICszMTMsNDAgQEAgc2VjdXJpdHkg cHJvdG9jb2wgdGhhdCB1dGlsaXplcyBTU0wvVExTIGZvciBrZXkgZXhjaGFuZ2UuICBJdCBpcyBj YXBhYmxlIG9mCiB0cmF2ZXJzaW5nIG5ldHdvcmsgYWRkcmVzcyB0cmFuc2xhdG9ycyAoQGRmbntO QVR9cykgYW5kIGZpcmV3YWxscy4iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMikpKQogCiso ZGVmaW5lLXB1YmxpYyBwcm90b252cG4tY2xpCisgIChwYWNrYWdlCisgICAgKG5hbWUgInByb3Rv bnZwbi1jbGkiKQorICAgICh2ZXJzaW9uICIyLjIuMiIpCisgICAgKHNvdXJjZQorICAgICAob3Jp Z2luCisgICAgICAgOzsgUHlQSSBoYXMgYSAiLndobCIgZmlsZSBidXQgbm90IGEgcHJvcGVyIHNv dXJjZSByZWxlYXNlLgorICAgICAgIDs7IFRodXMsIGZldGNoIGNvZGUgZnJvbSBHaXQuCisgICAg ICAgKG1ldGhvZCBnaXQtZmV0Y2gpCisgICAgICAgKHVyaSAoZ2l0LXJlZmVyZW5jZQorICAgICAg ICAgICAgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9Qcm90b25WUE4vbGludXgtY2xpLmdpdCIp CisgICAgICAgICAgICAgKGNvbW1pdCAoc3RyaW5nLWFwcGVuZCAidiIgdmVyc2lvbikpKSkKKyAg ICAgICAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCisgICAgICAgKHNo YTI1NgorICAgICAgICAoYmFzZTMyCisgICAgICAgICAiMGl4amIwMmtqNHo3OXdobTFpemQ4bXJu MmgwcnA5Y213NGltMXF2cDkzcmFocXhkZDRuOCIpKSkpCisgICAgKGJ1aWxkLXN5c3RlbSBweXRo b24tYnVpbGQtc3lzdGVtKQorICAgIChhcmd1bWVudHMgJygjOnRlc3RzPyAjZikpIDsgbm8gdGVz dHMgaW4gcmVwbworICAgIChuYXRpdmUtaW5wdXRzCisgICAgIGAoKCJkb2NvcHQiICxweXRob24t ZG9jb3B0KSkpCisgICAgKGlucHV0cworICAgICBgKCgicHl0aG9uZGlhbG9nIiAscHl0aG9uLXB5 dGhvbmRpYWxvZykKKyAgICAgICAoInJlcXVlc3RzIiAscHl0aG9uLXJlcXVlc3RzKSkpCisgICAg KHByb3BhZ2F0ZWQtaW5wdXRzCisgICAgIGAoKCJvcGVudnBuIiAsb3BlbnZwbikpKQorICAgIChz eW5vcHNpcyAiQ29tbWFuZC1saW5lIGNsaWVudCBmb3IgUHJvdG9uVlBOIikKKyAgICAoZGVzY3Jp cHRpb24KKyAgICAgIk9mZmljaWFsIENMSSBmb3IgUHJvdG9uVlBOLCBhIHNlY3VyZSBwb2ludC10 by1wb2ludCB2aXJ0dWFsIHByaXZhdGUKK25ldHdvcmtpbmcgc2VydmljZSB3aXRoIGEgZ3JhdGlz IHRpZXIuICBJdCBjYW4gYXV0b21hdGljYWxseSBmaW5kIGFuZCBjb25uZWN0Cit0byB0aGUgZmFz dGVzdCBzZXJ2ZXJzIG9yIHVzZSBUT1Igb3ZlciBWUE4uICBUaGUgZ3JhdGlzIHRpZXIgb2ZmZXJz IHVubGltaXRlZAorYmFuZHdpZHRoIGZvciB1cCB0byAxMCBkZXZpY2VzLiIpCisgICAgKGhvbWUt cGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL1Byb3RvblZQTi9saW51eC1jbGkiKQorICAgIChsaWNl bnNlIGxpY2Vuc2U6Z3BsMyspKSkKKwogKGRlZmluZS1wdWJsaWMgdGluYwogICAocGFja2FnZQog ICAgIChuYW1lICJ0aW5jIikKLS0gCjIuMjYuMgoK --b1_3e227dc87ec24481037db3b50e049c2d-- From unknown Mon Jun 23 23:54:36 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ryan Prior Subject: bug#41431: closed (Re: [bug#41431] [PATCH] gnu: Add protonvpn-cli.) Message-ID: References: <87zh9x2j9z.fsf@gnu.org> <20200521032943.26115-1-rprior@protonmail.com> X-Gnu-PR-Message: they-closed 41431 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 41431@debbugs.gnu.org Date: Sun, 24 May 2020 20:03:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1590350582-4890-1" This is a multi-part message in MIME format... ------------=_1590350582-4890-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #41431: [PATCH] gnu: Add protonvpn-cli. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 41431@debbugs.gnu.org. --=20 41431: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D41431 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1590350582-4890-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 41431-done) by debbugs.gnu.org; 24 May 2020 20:03:01 +0000 Received: from localhost ([127.0.0.1]:38870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcwpl-0001Gd-N3 for submit@debbugs.gnu.org; Sun, 24 May 2020 16:03:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcwpk-0001GR-UP for 41431-done@debbugs.gnu.org; Sun, 24 May 2020 16:02:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36920) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcwpf-000505-EU; Sun, 24 May 2020 16:02:51 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=54746 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jcwpe-0003E3-3B; Sun, 24 May 2020 16:02:50 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Ryan Prior Subject: Re: [bug#41431] [PATCH] gnu: Add protonvpn-cli. References: <20200521032943.26115-1-rprior@protonmail.com> <87o8qe68hh.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 6 Prairial an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 24 May 2020 22:02:48 +0200 In-Reply-To: (Ryan Prior's message of "Sat, 23 May 2020 19:11:18 +0000") Message-ID: <87zh9x2j9z.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41431-done Cc: 41431-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Ryan Prior skribis: > =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 Original = Message =E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90=E2=80=90 > On Saturday, May 23, 2020 2:17 PM, Ludovic Court=C3=A8s wr= ote: > >> there are definitely tests > > What makes you so sure? `grep -r '\Wtest' .` suggests that the only refer= ence to testing in the whole repo is in protonvpn_cli/utils.py (wait_for_ne= twork) which tests for a network connection at runtime. I don't think they = are shipping any tests; setup.py can test to make sure you can actually ins= tall your dependencies, but that's not a meaningful upstream test, it's a d= efault behavior. Oh my bad. I was fooled by the fact that =E2=80=9Csomething=E2=80=9D seeme= d to be happening when enabling tests. >> > - (license license:gpl3))) >> >> This is =E2=80=98gpl3+=E2=80=99 AFAICS since nothing says =E2=80=9Cversi= on 3 only.=E2=80=9D > > Nothing says "or any later version" either=E2=80=94I had been under the i= mpression that the "plus" was opt-in, but reading GPLv3 again it appears to= be opt-out. I don't know, that's not my area of expertise. I've updated th= e patch to gpl3+ with your recommendation in any case. Right, there=E2=80=99s this paragraph in the license: Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. In Guix we encode it by adding =E2=80=9C+=E2=80=9D as in =E2=80=9Cor any la= ter version=E2=80=9D. > From: Ryan Prior > Date: Wed, 20 May 2020 22:28:11 -0500 > Subject: [PATCH] gnu: Add protonvpn-cli. > > * gnu/packages/vpn.scm (protonvpn-cli): New variable. Applied, thanks! Ludo=E2=80=99. ------------=_1590350582-4890-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 May 2020 03:30:12 +0000 Received: from localhost ([127.0.0.1]:54907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbbuN-0008O7-Nc for submit@debbugs.gnu.org; Wed, 20 May 2020 23:30:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:52464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbbuM-0008O0-Cu for submit@debbugs.gnu.org; Wed, 20 May 2020 23:30:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbbuM-0007GZ-6G for guix-patches@gnu.org; Wed, 20 May 2020 23:30:10 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:57005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbbuK-0000IZ-2K for guix-patches@gnu.org; Wed, 20 May 2020 23:30:09 -0400 Date: Thu, 21 May 2020 03:29:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1590031797; bh=CQ8Rj9cpCVzDQq6hJKqoT3LIBPq4jyBywSSUMxsYHbQ=; h=Date:To:From:Reply-To:Subject:From; b=pSC4auoJLowj8b/CWVtnF1Xk/fjvJprHP5qambcR1DwXThHHnw+mYcvRZSATx9j7V WhUeKyNLnhxb4dbRr0qT5N5Ca4q0nZdIXwF9+HxmrzTYoYAicmJu63XCg+z0k2m6UT Sx0CVj/9XSj+FIVI+Z9BKbNSQIL6v5Ez0L+TpxhM= To: guix-patches@gnu.org From: Ryan Prior Subject: [PATCH] gnu: Add protonvpn-cli. Message-ID: <20200521032943.26115-1-rprior@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Received-SPF: pass client-ip=185.70.40.18; envelope-from=rprior@protonmail.com; helo=mail1.protonmail.ch X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 23:29:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Ryan Prior Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/vpn.scm (protonvpn-cli): New variable. --- gnu/packages/vpn.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index da881493bf..b47cad2ae0 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -12,6 +12,7 @@ ;;; Copyright =C2=A9 2019 Rutger Helling ;;; Copyright =C2=A9 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2020 Brice Waegeneire +;;; Copyright =C2=A9 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) #:use-module (gnu packages tls) #:use-module (gnu packages xml)) =20 @@ -311,6 +313,38 @@ security protocol that utilizes SSL/TLS for key exchan= ge. It is capable of traversing network address translators (@dfn{NAT}s) and firewalls.") (license license:gpl2))) =20 +(define-public protonvpn-cli + (package + (name "protonvpn-cli") + (version "2.2.2") + (source + (origin + ;; PyPI has a ".whl" file but not a proper source release. + ;; Thus, fetch code from Git. + (method git-fetch) + (uri (git-reference + (url "https://github.com/ProtonVPN/linux-cli.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ixjb02kj4z79whm1izd8mrn2h0rp9cmw4im1qvp93rahqxdd4n8")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) + (native-inputs + `(("docopt" ,python-docopt))) + (inputs + `(("pythondialog" ,python-pythondialog) + ("requests" ,python-requests))) + (propagated-inputs + `(("openvpn" ,openvpn))) + (synopsis "Command-line client for ProtonVPN") + (description + "ProtonVPN is a secure point-to-point virtual private networking serv= ice +with a gratis tier.") + (home-page "https://github.com/ProtonVPN/linux-cli") + (license license:gpl3))) + (define-public tinc (package (name "tinc") --=20 2.26.2 ------------=_1590350582-4890-1--