libssh: 0.7.6 -> 0.8.4

Note that this is unrelated to the security vulnerability in earlier
versions, which is already fixed in 0.7.6.
This commit is contained in:
Linus Heckemann 2018-10-18 14:21:44 +02:00 committed by Frederik Rietdijk
parent 8fbfa6f4ef
commit d6f54b0dea

View file

@ -1,23 +1,13 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }:
stdenv.mkDerivation rec {
name = "libssh-0.7.6";
name = "libssh-0.8.4";
src = fetchurl {
url = "https://www.libssh.org/files/0.7/libssh-0.7.6.tar.xz";
sha256 = "14hhdpn2hflywsi9d5bz2pfjxqkyi07znjij89cpakr7b4w7sq0x";
url = "https://www.libssh.org/files/0.8/${name}.tar.xz";
sha256 = "06xqfm1alfb6faqzjhyhjs0arjcd8rnc7ci046x8d18s089pgc3b";
};
patches = [
# Fix mysql-workbench compilation
# https://bugs.mysql.com/bug.php?id=91923
(fetchpatch {
name = "include-fix-segfault-in-getissuebanner-add-missing-wrappers-in-libsshpp.patch";
url = https://git.libssh.org/projects/libssh.git/patch/?id=5ea81166bf885d0fd5d4bb232fc22633f5aaf3c4;
sha256 = "12q818l3nasqrfrsghxdvjcyya1bfcg0idvsf8xwm5zj7criln0a";
})
];
postPatch = ''
# Fix headers to use libsodium instead of NaCl
sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c