tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
libssh: 0.7.0 -> 0.7.1
William A. Kennington III
10 years ago
f6bc130b
584effa8
+3
-33
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
libssh
0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
default.nix
-28
pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch
reviewed
···
1
1
-
From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001
2
2
-
From: Mike DePaulo <mikedep333@gmail.com>
3
3
-
Date: Fri, 15 May 2015 22:22:13 -0400
4
4
-
Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194)
5
5
-
6
6
-
---
7
7
-
src/channels.c | 5 +++++
8
8
-
1 file changed, 5 insertions(+)
9
9
-
10
10
-
diff --git a/src/channels.c b/src/channels.c
11
11
-
index 7a4e71f..db5f83a 100644
12
12
-
--- a/src/channels.c
13
13
-
+++ b/src/channels.c
14
14
-
@@ -2206,6 +2206,11 @@ error:
15
15
-
}
16
16
-
17
17
-
/* DEPRECATED */
18
18
-
+int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) {
19
19
-
+ return ssh_channel_listen_forward(session, address, port, bound_port);
20
20
-
+}
21
21
-
+
22
22
-
+/* DEPRECATED */
23
23
-
ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) {
24
24
-
return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL);
25
25
-
}
26
26
-
--
27
27
-
2.1.4
28
28
-
+3
-5
pkgs/development/libraries/libssh/default.nix
reviewed
···
1
1
{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
-
name = "libssh-0.7.0";
4
4
+
name = "libssh-0.7.1";
5
5
6
6
src = fetchurl {
7
7
-
url = "https://git.libssh.org/projects/libssh.git/snapshot/${name}.tar.gz";
8
8
-
sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0";
7
7
+
url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz";
8
8
+
sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg";
9
9
};
10
10
-
11
11
-
patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ];
12
10
13
11
postPatch = ''
14
12
# Fix headers to use libsodium instead of NaCl