gentoo auto-resync : 01:02:2023 - 03:03:44

3 files changed, 0 insertions, 87 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5fe107cf9ca4..5c006199894c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index b3108aae5dd3..51bdef4c1d62 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -1,5 +1,4 @@
 AUX openbsd-netcat-1.105-musl-b64_ntop.patch 12296 BLAKE2B 6c67948bc99aebe60e43dc960f123e245f46ffb14afdc2ff81f45e6786ab1044152d37997b5d3a18872a230e68073de343d3210ea4a584e378ee733bdee02d10 SHA512 65f00cbcef90d55967a2af70a963d8851292bf13affe4c69f02a508c1e9189591dd9b4d115b73337a46089c81b8503d5cf3281b113160c161b06a38b03421ce3
-AUX openbsd-netcat-1.190-darwin.patch 2045 BLAKE2B d2e0633b38eeb19d6e8dd3dfc6c11fc5b9e47898a5bd1a7793a29a19eff32eb2aa389d8056eb41749a2a75f9254c1bc39b19d29798eea0b9eb85a6a0cf828284 SHA512 527ec082c617e81aaa48e648d07437eddfb65f7dd8ba6e69042c53e00921ddeec53298e85421e847046bcfd7a93425deca5fccf6a9ff2d31b1bcddce3012ce40
 AUX openbsd-netcat-1.190-darwin13.patch 1055 BLAKE2B 9aa8cd60a0d36f58a2c10476e6a754c5961375bc3747dceb7ad7a000fa423f9d139be8f9e78986b15a72fbe20c0f48409e461719cff1a27f4fa1867466cf8941 SHA512 ccdafb9dc20e7f03dd54967d1abf9b0840a5c9dfe54bb33342eb8f70c41dea588a00d6a4b423663a83e26e87c685bc32c711587a53b76a53ec4eb45c361a4071
 AUX openbsd-netcat-1.195-darwin.patch 2312 BLAKE2B 3f3f463b7e438772522e6e8e64dda8be6feeb674b424326e2b3d4eac1031d455544d7c047336c4a64a9ab4c5982eae8d6269d0d8901f7f10df326cbe324847ba SHA512 31f3dd9713daad1844a96f3bb5691d6dfaaf69e81a8c6a67b985e65868365e3e4b8b7b67798d8a82e64f3c1f53a21c7cd7b4df6d94062bcf90022c741b1dad66
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
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
deleted file mode 100644
index 72a3fe8ed9f5..000000000000
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Allow compilation on Darwin
-
-diff --git a/netcat.c b/netcat.c
-index a0fb51b..bbb5dd1 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -51,11 +51,16 @@
- # include <bsd/readpassphrase.h>
- #endif
- 
-+#ifndef IPTOS_LOWCOST
-+# define IPTOS_LOWCOST 0x02
-+#endif
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
- # define IPTOS_THROUGHPUT 0x08
- # define IPTOS_RELIABILITY 0x04
--# define IPTOS_LOWCOST 0x02
- # define IPTOS_MINCOST IPTOS_LOWCOST
- #endif /* IPTOS_LOWDELAY */
-+#ifndef SOCK_CLOEXEC
-+# define SOCK_CLOEXEC 0
-+#endif
- 
-@@ -108,8 +110,9 @@
- # include <tls.h>
- #endif
- #include <unistd.h>
--#include <bsd/stdlib.h>
--#include <bsd/string.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <ctype.h>
- 
- #include "atomicio.h"
- 
-@@ -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");
- 				}
-@@ -1100,6 +1099,8 @@
- 			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
-+++ b/socks.c
-@@ -38,7 +38,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <resolv.h>
--#include <bsd/readpassphrase.h>
-+#include <readpassphrase.h>
- #include "atomicio.h"
- 
- #define SOCKS_PORT	"1080"