diff options
| author |   Michael Mair-Keimberger <mmk@levelnine.at> | 2023-01-21 12:37:32 +0100 |
|---|---|---|
| committer |   Conrad Kostecki <conikost@gentoo.org> | 2023-02-01 02:13:41 +0100 |
| commit | 75744ca5cd171495eb53f1a2e58aa3df2405ea73 (patch) | |
| tree | 46ba395052f22a6a2091b08bcf9e771be38e0e49 | |
| parent | media-gfx/tuxpaint: remove unused patch (diff) | |
| download | gentoo-75744ca5.tar.gz gentoo-75744ca5.tar.bz2 gentoo-75744ca5.zip | |
net-analyzer/openbsd-netcat: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29202
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
| -rw-r--r-- | net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch | 86 |
1 files changed, 0 insertions, 86 deletions
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" |