diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-04 19:27:57 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-04 21:10:59 +0100 |
commit | 59cad4dc0768d081d291206f8af20c25fe0e047d (patch) | |
tree | d883184db3f6c4dbd51004f2ae70d8ab428cdacd /pkgs/tools/networking/socat | |
parent | 0e831bd525cf3eb3b88c9073a049741b1e65431a (diff) |
socate: Update to 1.7.2.2, 2.0.0-b6
CVE-2013-3571
Diffstat (limited to 'pkgs/tools/networking/socat')
-rw-r--r-- | pkgs/tools/networking/socat/2.0.0-b3.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/networking/socat/2.x.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/networking/socat/default.nix | 4 |
3 files changed, 22 insertions, 31 deletions
diff --git a/pkgs/tools/networking/socat/2.0.0-b3.nix b/pkgs/tools/networking/socat/2.0.0-b3.nix deleted file mode 100644 index 6567e5dfcc402..0000000000000 --- a/pkgs/tools/networking/socat/2.0.0-b3.nix +++ /dev/null @@ -1,29 +0,0 @@ -args : with args; -let - version = "2.0.0-b3"; - patches = []; -in -rec { - src = /* Here a fetchurl expression goes */ - fetchurl { - url = http://www.dest-unreach.org/socat/download/socat-2.0.0-b3.tar.bz2; - sha256 = "0p4v8m898dzcardsw02xdda3y3b1rky7v956rm27x43783w5qmsx"; - }; - - buildInputs = [openssl]; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - - name = "socat-" + version; - meta = { - description = "Socat - a different replacement for netcat"; - longDesc = " - Socat, one more analogue of netcat, but not mimicking it. - 'netcat++' (extended design, new implementation) -"; - homepage = "http://www.dest-unreach.org/socat/"; - srcs = patches; - }; -} diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix new file mode 100644 index 0000000000000..6218031344266 --- /dev/null +++ b/pkgs/tools/networking/socat/2.x.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "socat-2.0.0-b6"; + + src = fetchurl { + url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; + sha256 = "03n70v7ygsl4ji7rwvyv8f70d3q32jnas26j29amkf3fm4agnhvz"; + }; + + buildInputs = [ openssl ]; + + meta = { + description = "A utility for bidirectional data transfer between two independent data channels"; + homepage = http://www.dest-unreach.org/socat/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + maintainers = stdenv.lib.maintainers.eelco; + }; +} diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 727bbe0860598..45de7015d7abf 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "socat-1.7.2.1"; + name = "socat-1.7.2.2"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "0xw2qmmixv7jwsrgx2vy54bq695d6my3pm3z4dcpmf9vqvb2xsps"; + sha256 = "0g4miazc9w3gxbk5vvw228jp3qxn775jspkgqv5hjf2d3bqpl5ls"; }; buildInputs = [ openssl ]; |