diff options
| author | R. RyanTM <ryantm-bot@ryantm.com> | 2022-01-20 00:48:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 09:48:16 +0100 |
| commit | 3cbb02087b4c2dfc3be664d7152cec51765e53ef (patch) | |
| tree | 9ede6c8cec55e025b89726747a65994bf85e5ff3 | |
| parent | 8fc6055ce7eef872f44519d82b15163671cf636c (diff) | |
socat: 1.7.4.2 -> 1.7.4.3
* socat: 1.7.4.2 -> 1.7.4.3 (#154548) * socat: remove unnecessary patch with 1.7.4.3 Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
| -rw-r--r-- | pkgs/tools/networking/socat/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch | 21 |
2 files changed, 2 insertions, 30 deletions
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index b26760a729418..c52bdb0802d1a 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -9,20 +9,13 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.7.4.2"; + version = "1.7.4.3"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ZpCp+ZkEV7UFCXonK78sv0zDVXYXb3ZkbjUksOkcF2M="; + sha256 = "sha256-1HMYEEQVB3Y1EZ3+5EvPtB3jSXN0qaABsa/24vCFgAc="; }; - patches = [ - # This adds missing feature checks for TCP_INFO, a Linux feature - # - # Discussed in https://github.com/Homebrew/homebrew-core/pull/88595 - ./socat-fix-feature-check-tcpinfo.patch - ]; - postPatch = '' patchShebangs test.sh substituteInPlace test.sh \ diff --git a/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch b/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch deleted file mode 100644 index ec0ea88359c8d..0000000000000 --- a/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/filan.c b/filan.c -index 3465f7c..77c22a4 100644 ---- a/filan.c -+++ b/filan.c -@@ -905,6 +905,7 @@ int tcpan(int fd, FILE *outfile) { - #if WITH_TCP - - int tcpan2(int fd, FILE *outfile) { -+#ifdef TCP_INFO - struct tcp_info tcpinfo; - socklen_t tcpinfolen = sizeof(tcpinfo); - int result; -@@ -930,6 +931,8 @@ int tcpan2(int fd, FILE *outfile) { - // fprintf(outfile, "%s={%u}\t", "TCPI_", tcpinfo.tcpi_); - - return 0; -+#endif -+ return -1; - } - - #endif /* WITH_TCP */ |