pyrox.dev
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>
+2
-9
pkgs/tools/networking/socat/default.nix
+2
-9
pkgs/tools/networking/socat/default.nix
···
9
9
10
10
stdenv.mkDerivation rec {
11
11
pname = "socat";
12
-
version = "1.7.4.2";
12
+
version = "1.7.4.3";
13
13
14
14
src = fetchurl {
15
15
url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2";
16
-
sha256 = "sha256-ZpCp+ZkEV7UFCXonK78sv0zDVXYXb3ZkbjUksOkcF2M=";
16
+
sha256 = "sha256-1HMYEEQVB3Y1EZ3+5EvPtB3jSXN0qaABsa/24vCFgAc=";
17
17
};
18
-
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
18
26
19
postPatch = ''
27
20
patchShebangs test.sh
-21
pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch
-21
pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch
···
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 */