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

socate: Update to 1.7.2.2, 2.0.0-b6

Browse Source 
CVE-2013-3571
This commit is contained in:
Eelco Dolstra 2013-11-04 19:27:57 +01:00
parent 0e831bd525
commit 59cad4dc07
4 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/tools/networking/socat/2.0.0-b3.nix
View File

@ -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;
};
}

20
pkgs/tools/networking/socat/2.x.nix Normal file
View File

@ -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;
};
}

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

@ -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 ];

6
pkgs/top-level/all-packages.nix
View File

@ -1803,15 +1803,13 @@ let
socat = callPackage ../tools/networking/socat { };
socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { });
sourceHighlight = callPackage ../tools/text/source-highlight {
# Boost 1.54 causes the "test_regexranges" test to fail
boost = boost153;
};
socat2pre = lowPrio (builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix {
inherit fetchurl stdenv openssl;
});
squashfsTools = callPackage ../tools/filesystems/squashfs { };
sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { };