[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/09: gnu: strongswan: Invoke absolute file names in ‘ipsec’ launcher.
From: |
guix-commits |
Subject: |
03/09: gnu: strongswan: Invoke absolute file names in ‘ipsec’ launcher. |
Date: |
Thu, 24 Jun 2021 18:44:56 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit d0cc1d65249d92647ced94aa8620204b542f7dcd
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Thu Jun 24 22:18:24 2021 +0200
gnu: strongswan: Invoke absolute file names in ‘ipsec’ launcher.
* gnu/packages/vpn.scm (strongswan)[arguments]: Include the ‘ipsec’
launcher script in the 'patch-command-file-names phase.
[inputs]: Add coreutils.
---
gnu/packages/vpn.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 8272a3a..aecf983 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -114,6 +114,10 @@ endpoints.")
(modify-phases %standard-phases
(add-before 'build 'patch-command-file-names
(lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/ipsec/_ipsec.in"
+ (("cat|kill|sleep|rm|uname" command)
+ (string-append (assoc-ref inputs "coreutils")
+ "/bin/" command)))
(substitute* "src/libstrongswan/utils/process.c"
(("/bin/sh")
(string-append (assoc-ref inputs "bash") "/bin/sh")))
@@ -179,7 +183,8 @@ endpoints.")
;; Use libcap by default.
"--with-capabilities=libcap")))
(inputs
- `(("curl" ,curl)
+ `(("coreutils" ,coreutils)
+ ("curl" ,curl)
("gmp" ,gmp)
("libcap" ,libcap)
("libgcrypt" ,libgcrypt)
- branch master updated (1bf1226 -> c7804cd), guix-commits, 2021/06/24
- 03/09: gnu: strongswan: Invoke absolute file names in ‘ipsec’ launcher.,
guix-commits <=
- 02/09: gnu: Add strongswan service., guix-commits, 2021/06/24
- 05/09: gnu: apache-thrift: Update to 0.14.2., guix-commits, 2021/06/24
- 06/09: gnu: vlc: Update to 3.0.16., guix-commits, 2021/06/24
- 07/09: gnu: rlwrap: Update to 0.45.2., guix-commits, 2021/06/24
- 09/09: gnu: nix: Update to 2.3.13., guix-commits, 2021/06/24
- 04/09: gnu: libzim: Update to 6.3.2., guix-commits, 2021/06/24
- 01/09: vm: Update deprecated QEMU option syntax., guix-commits, 2021/06/24
- 08/09: gnu: parallel: Update to 20210622., guix-commits, 2021/06/24