GNU bug report logs - #53880
[PATCH 0/2] Fix build of protonvpn-cli

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53880 in the body.
You can then email your comments to 53880 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: guix-patches <at> gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>
Subject: [PATCH 0/2] Fix build of protonvpn-cli
Date: Tue,  8 Feb 2022 19:03:33 +0100

Hello,

These two patches fix the build failure of protonvpn-cli.  The first
one fixes the wrap target, since the wrapper code now properly handles
re-wrapping a wrapped binary.  The second removes the sanity-check
phase as the main entry point tries to create a directory under ~user,
which fails, and setting HOME=/tmp will not work since expanding ~user
uses the passwd database.

Best,

Josselin Poiret (2):
  gnu: protonvpn-cli: Do not try to wrap the wrapper.
  gnu: protonvpn-cli: Remove sanity-check phase.

 gnu/packages/vpn.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

-- 
2.34.0

Message #8 received at 53880 <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: 53880 <at> debbugs.gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>
Subject: [PATCH 1/2] gnu: protonvpn-cli: Do not try to wrap the wrapper.
Date: Tue,  8 Feb 2022 19:05:40 +0100

* gnu/packages/vpn.scm (protonvpn-cli)[arguments]: Try to wrap the
original program, and not the wrapper, as wrap-program handles that
properly.
---
 gnu/packages/vpn.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 7f1d10d1eb..150dfa31b5 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -753,7 +753,7 @@ (define-public protonvpn-cli
            ;; Wrap entrypoint with paths to its hard dependencies.
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((entrypoint (string-append (assoc-ref outputs "out")
-                                              "/bin/.protonvpn-real")))
+                                              "/bin/protonvpn")))
                (wrap-program entrypoint
                             #:sh (search-input-file inputs "bin/bash")
                             `("PATH" ":" prefix
-- 
2.34.0

Message #11 received at 53880 <at> debbugs.gnu.org (full text, mbox):

From: Josselin Poiret <dev <at> jpoiret.xyz>
To: 53880 <at> debbugs.gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>
Subject: [PATCH 2/2] gnu: protonvpn-cli: Remove sanity-check phase.
Date: Tue,  8 Feb 2022 19:05:41 +0100

* gnu/packages/vpn.scm (protonvpn-cli)[arguments]: Remove sanity-check
phase.
---
 gnu/packages/vpn.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 150dfa31b5..170ec1b663 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -768,7 +768,11 @@ (define-public protonvpn-cli
                                           "openvpn"
                                           "procps"
                                           "which")))))
-             #t)))))
+             #t))
+         ;; The `protonvpn' script wants to write to `~user' to initialize its
+         ;; logger, so simply setting HOME=/tmp won't cut it.  Remove
+         ;; sanity-check.
+         (delete 'sanity-check))))
     (native-inputs
      (list python-docopt))
     (inputs
-- 
2.34.0

Message #16 received at 53880-done <at> debbugs.gnu.org (full text, mbox):

From: Brice Waegeneire <brice <at> waegenei.re>
To: Josselin Poiret <dev <at> jpoiret.xyz>
Cc: 53855-done <at> debbugs.gnu.org, 53880-done <at> debbugs.gnu.org
Subject: Re: bug#53880: [PATCH 0/2] Fix build of protonvpn-cli
Date: Sat, 12 Feb 2022 14:21:15 +0100

Hello Josselin,

Josselin Poiret <dev <at> jpoiret.xyz> writes:

> Josselin Poiret (2):
>   gnu: protonvpn-cli: Do not try to wrap the wrapper.
>   gnu: protonvpn-cli: Remove sanity-check phase.
>
>  gnu/packages/vpn.scm | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

Thank you for the patch, it fixes <https://bugs.gnu.org/53855>. I've build the
package and ran the binary succesfully.  It's pushed as
9c8f68f4796f23c11173fa3f90c69bc85b224ac6 with an added copyright header.

Cheers,
- Brice

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.