git.iko.soy/typeable/nixpkgs
on master help sign in
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>

commit3cbb02087b4c2dfc3be664d7152cec51765e53ef authorR. RyanTM <ryantm-bot@ryantm.com> dateThu 20 Jan 2022, 00:48 (5 years ago) parent8fc6055
2 files changed+2−30
pkgs/tools/networking/socat/default.nix+2−9 pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch−21
pkgs/tools/networking/socat/default.nix+2−9
@@ -9,20 +9,13 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "socat";
12− version = "1.7.4.2";
12+ version = "1.7.4.3";
1313
1414 src = fetchurl {
1515 url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2";
16− sha256 = "sha256-ZpCp+ZkEV7UFCXonK78sv0zDVXYXb3ZkbjUksOkcF2M=";
16+ sha256 = "sha256-1HMYEEQVB3Y1EZ3+5EvPtB3jSXN0qaABsa/24vCFgAc=";
1717 };
1818
19− patches = [
20− # This adds missing feature checks for TCP_INFO, a Linux feature
21− #
22− # Discussed in https://github.com/Homebrew/homebrew-core/pull/88595
23− ./socat-fix-feature-check-tcpinfo.patch
24− ];
25−
2619 postPatch = ''
2720 patchShebangs test.sh
2821 substituteInPlace test.sh \
pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patchdeleted−21
@@ -1,21 +0,0 @@
1−diff --git a/filan.c b/filan.c
2−index 3465f7c..77c22a4 100644
3−--- a/filan.c
4−+++ b/filan.c
5−@@ -905,6 +905,7 @@ int tcpan(int fd, FILE *outfile) {
6− #if WITH_TCP
7−
8− int tcpan2(int fd, FILE *outfile) {
9−+#ifdef TCP_INFO
10− struct tcp_info tcpinfo;
11− socklen_t tcpinfolen = sizeof(tcpinfo);
12− int result;
13−@@ -930,6 +931,8 @@ int tcpan2(int fd, FILE *outfile) {
14− // fprintf(outfile, "%s={%u}\t", "TCPI_", tcpinfo.tcpi_);
15−
16− return 0;
17−+#endif
18−+ return -1;
19− }
20−
21− #endif /* WITH_TCP */