diff options
| author | Robin Gloster <mail@glob.in> | 2017-02-02 02:02:26 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-02-17 00:11:03 +0100 |
| commit | 108c6d1a03ea945a9c6d9de8b36dce3c262a8686 (patch) | |
| tree | 8ac18a4e54e3184ea54eb6ed3d9ad80feef1435d /pkgs/tools/networking/socat | |
| parent | 31ff2ac05792a5132ae87c968c35bd51419750d1 (diff) | |
socat: 1.7.3.1 -> 1.7.3.2
fixes compatibility with openssl 1.1.0 (and libressl)
Diffstat (limited to 'pkgs/tools/networking/socat')
| -rw-r--r-- | pkgs/tools/networking/socat/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/socat/enable-ecdhe.patch | 19 |
2 files changed, 2 insertions, 23 deletions
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 19cdb884bd1..0e9efb028ba 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, openssl, readline }: stdenv.mkDerivation rec { - name = "socat-1.7.3.1"; + name = "socat-1.7.3.2"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj"; + sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3"; }; buildInputs = [ openssl readline ]; - patches = [ ./enable-ecdhe.patch ./libressl-fixes.patch ]; - hardeningEnable = [ "pie" ]; meta = { diff --git a/pkgs/tools/networking/socat/enable-ecdhe.patch b/pkgs/tools/networking/socat/enable-ecdhe.patch deleted file mode 100644 index ad63ec287bc..00000000000 --- a/pkgs/tools/networking/socat/enable-ecdhe.patch +++ /dev/null @@ -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) { - |