JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

socat: 1.7.3.1 -> 1.7.3.2

Browse Source 
fixes compatibility with openssl 1.1.0 (and libressl)
This commit is contained in:
Robin Gloster 2017-02-02 02:02:26 +01:00
parent 31ff2ac057
commit 108c6d1a03
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/socat/default.nix
View File

@ -1,17 +1,15 @@
{ stdenv, fetchurl, openssl, readline }: { stdenv, fetchurl, openssl, readline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "socat-1.7.3.1"; name = "socat-1.7.3.2";
src = fetchurl { src = fetchurl {
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj"; sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3";
}; };
buildInputs = [ openssl readline ]; buildInputs = [ openssl readline ];
patches = [ ./enable-ecdhe.patch ./libressl-fixes.patch ];
hardeningEnable = [ "pie" ]; hardeningEnable = [ "pie" ];
meta = { meta = {

19
pkgs/tools/networking/socat/enable-ecdhe.patch
View File

@ -1,19 +0,0 @@
--- socat-1.7.3.0/xio-openssl.c 2015-01-24 15:33:42.000000000 +0100
+++ socat-1.7.3.0-ecdhe/xio-openssl.c 2015-01-25 13:38:54.353641097 +0100
@@ -960,7 +960,6 @@
}
}
-#if defined(EC_KEY) /* not on Openindiana 5.11 */
{
/* see http://openssl.6102.n7.nabble.com/Problem-with-cipher-suite-ECDHE-ECDSA-AES256-SHA384-td42229.html */
int nid;
@@ -982,7 +981,6 @@
SSL_CTX_set_tmp_ecdh(*ctx, ecdh);
}
-#endif /* !defined(EC_KEY) */
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
if (opt_compress) {