diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-05-09 14:44:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-05-09 14:44:48 +0200 |
| commit | da3be3ff4f6d8b643ed9bdf6834df366b1bcea44 (patch) | |
| tree | 913ff6010447b6a31dfbe4be6eccc06b11fd83cf /gnu/packages/ssh.scm | |
| parent | f5fe0082abe4547f3fb9f29d8351473cfb3a387b (diff) | |
| parent | 4980630d1e3e6f9a6dc05438c7593a727207d9a0 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 8a61b6e97a..7f3b02013e 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -189,7 +189,8 @@ a server that supports the SSH-2 protocol.") (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" "openssh-" version ".tar.gz")) - (patches (search-patches "openssh-hurd.patch")) + (patches (search-patches "openssh-hurd.patch" + "openssh-trust-guix-store-directory.patch")) (sha256 (base32 "1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx")))) @@ -249,6 +250,11 @@ a server that supports the SSH-2 protocol.") (substitute* "Makefile" (("PRIVSEP_PATH=/var/empty") (string-append "PRIVSEP_PATH=" out "/var/empty")))))) + (add-after 'configure 'set-store-location + (lambda* _ + (substitute* "misc.c" + (("@STORE_DIRECTORY@") + (string-append "\"" (%store-directory) "\""))))) (add-before 'check 'patch-tests (lambda _ (substitute* "regress/test-exec.sh" |