diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-19 16:59:48 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-19 17:00:16 -0700 |
| commit | f6bc130bc83c62e626d11414e876143f98d49437 (patch) | |
| tree | 0ed78c5654c6c83b5c1c836471c669fd186ccd39 /pkgs/development/libraries/libssh | |
| parent | 584effa891a4a5c71bd4085832f269c35f022e64 (diff) | |
| download | nixpkgs-f6bc130bc83c62e626d11414e876143f98d49437.tar nixpkgs-f6bc130bc83c62e626d11414e876143f98d49437.tar.gz nixpkgs-f6bc130bc83c62e626d11414e876143f98d49437.tar.bz2 nixpkgs-f6bc130bc83c62e626d11414e876143f98d49437.tar.lz nixpkgs-f6bc130bc83c62e626d11414e876143f98d49437.tar.xz nixpkgs-f6bc130bc83c62e626d11414e876143f98d49437.tar.zst nixpkgs-f6bc130bc83c62e626d11414e876143f98d49437.zip | |
libssh: 0.7.0 -> 0.7.1
Diffstat (limited to 'pkgs/development/libraries/libssh')
| -rw-r--r-- | pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch | 28 | ||||
| -rw-r--r-- | pkgs/development/libraries/libssh/default.nix | 8 |
2 files changed, 3 insertions, 33 deletions
diff --git a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch b/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch deleted file mode 100644 index 030983d5c55..00000000000 --- a/pkgs/development/libraries/libssh/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001 -From: Mike DePaulo <mikedep333@gmail.com> -Date: Fri, 15 May 2015 22:22:13 -0400 -Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194) - ---- - src/channels.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/channels.c b/src/channels.c -index 7a4e71f..db5f83a 100644 ---- a/src/channels.c -+++ b/src/channels.c -@@ -2206,6 +2206,11 @@ error: - } - - /* DEPRECATED */ -+int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) { -+ return ssh_channel_listen_forward(session, address, port, bound_port); -+} -+ -+/* DEPRECATED */ - ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) { - return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL); - } --- -2.1.4 - diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index ef4540db2b2..1766a685aaa 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.7.0"; + name = "libssh-0.7.1"; src = fetchurl { - url = "https://git.libssh.org/projects/libssh.git/snapshot/${name}.tar.gz"; - sha256 = "1wfrdqhv97f4ycd9bcpgb6gw47kr7b2iq8cz5knk8a6n9c6870k0"; + url = "https://red.libssh.org/attachments/download/154/libssh-0.7.1.tar.xz"; + sha256 = "0v84zm957z31yyrj47n62hby38nrjk5ih0ajmgccnqrjdpwwrirg"; }; - patches = [ ./0001-Reintroduce-ssh_forward_listen-Fixes-194.patch ]; - postPatch = '' # Fix headers to use libsodium instead of NaCl sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c |