From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- net-analyzer/openbsd-netcat/Manifest | 2 +- .../files/openbsd-netcat-1.190-darwin.patch | 47 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) (limited to 'net-analyzer/openbsd-netcat') diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 224b7c069bab..a7fd68e7c6a3 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,5 +1,5 @@ AUX openbsd-netcat-1.105-darwin.patch 1591 BLAKE2B 9df26c2efec9d234fa3bc8d1d20438b8bb5a1dce85e0d1c2636ffa7b79467af1b228f2a347bdc7795865784c3ce9d98b5e9801887bc1a4a7fbe9da0ce649463b SHA512 12a36f277b5a88491bcd8b3cb1c564bf9e3251c2a2b0f113ee425aa554bbb29b5cd2a87cdf0f67ad6b9cf3bc9a56d8a175d73ce4cb86fb4c531fd146b85b0ee9 -AUX openbsd-netcat-1.190-darwin.patch 1715 BLAKE2B 5dacad5dbec8e2b8ce3ed454aaf856105b8acf01167afd7f1215040b36e339acf96c2d128955c885edbc73c1cb0544e79272187b7fdb9f6d2e4f04da0f7ff176 SHA512 689c032d4aaafda55020356663faeb00f2888a0a9f76e47831c2089c4231090f65444f6ed27408518948acaf3f2bb0508d26b54bc432a6ab5203118693a6b2b8 +AUX openbsd-netcat-1.190-darwin.patch 3090 BLAKE2B d4e02d4f7acfccba697ae31ae61c7e843fbb3d2521f012e698a78e6cfe5f1c21020f64d69c83e6f4eb4ab43b8d4ffcf55118509f407b36d3d6e3a75fd75fc29c SHA512 7989c5161d7416878fb9335f18bab9d5ab4a972ef4f4ce971935a14eed4019170e79c393818ed89828fb5783ded617750e0a160ca78130cd85f654cc9e34940b DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb26608746806ba97d15b9320954b5d531a73f3f76ed22238395797e90bc3e60dd9cf5b31e696eec59843f37001093013ed0ef82ae590126 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6 DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703 DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch index 818b13a81a59..e1a462e746b7 100644 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch @@ -75,6 +75,53 @@ index a0fb51b..bbb5dd1 100644 int main(int argc, char *argv[]) { +@@ -814,9 +814,8 @@ + # endif + } else { + len = sizeof(cliaddr); +- connfd = accept4(s, (struct sockaddr *)&cliaddr, +- &len, SOCK_NONBLOCK); +- if (connfd == -1) { ++ connfd = accept(s, (struct sockaddr *)&cliaddr, &len); ++ if (connfd == -1 || fcntl(connfd, F_SETFL, O_NONBLOCK) == -1) { + /* For now, all errnos are fatal */ + err(1, "accept"); + } +@@ -1092,14 +1091,16 @@ + int s, save_errno; + + if (uflag) { +- if ((s = unix_bind(unix_dg_tmp_socket, SOCK_CLOEXEC)) < 0) ++ if ((s = unix_bind(unix_dg_tmp_socket, 0)) < 0) + return -1; + } else { +- if ((s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) { ++ if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { + errx(1,"create unix socket failed"); + return -1; + } + } ++ if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) ++ return -1; + + memset(&s_un, 0, sizeof(struct sockaddr_un)); + s_un.sun_family = AF_UNIX; +@@ -1174,9 +1175,13 @@ + port, gai_strerror(error)); + + for (res = res0; res; res = res->ai_next) { +- if ((s = socket(res->ai_family, res->ai_socktype | +- SOCK_NONBLOCK, res->ai_protocol)) < 0) ++ if ((s = socket(res->ai_family, res->ai_socktype, ++ res->ai_protocol)) < 0) ++ continue; ++ if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) { ++ close(s); + continue; ++ } + + /* Bind to a local port or source address if specified. */ + if (sflag || pflag) { diff --git a/socks.c b/socks.c index 9068f39..68b68e3 100644 --- a/socks.c -- cgit v1.2.3