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>
This commit is contained in:
R. RyanTM 2022-01-20 00:48:16 -08:00 committed by GitHub
parent 8fc6055ce7
commit 3cbb02087b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 30 deletions

View File

@ -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 \

View File

@ -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 */