diff options
Diffstat (limited to 'net-analyzer/openbsd-netcat')
| -rw-r--r-- | net-analyzer/openbsd-netcat/Manifest | 6 | ||||
| -rw-r--r-- | net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch (renamed from net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-darwin.patch) | 57 | ||||
| -rw-r--r-- | net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild | 3 | ||||
| -rw-r--r-- | net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 5 |
4 files changed, 34 insertions, 37 deletions
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 5623c81ed436..dd121f609baa 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,10 +1,10 @@ AUX openbsd-netcat-1.105-musl-b64_ntop.patch 12296 BLAKE2B 6c67948bc99aebe60e43dc960f123e245f46ffb14afdc2ff81f45e6786ab1044152d37997b5d3a18872a230e68073de343d3210ea4a584e378ee733bdee02d10 SHA512 65f00cbcef90d55967a2af70a963d8851292bf13affe4c69f02a508c1e9189591dd9b4d115b73337a46089c81b8503d5cf3281b113160c161b06a38b03421ce3 AUX openbsd-netcat-1.190-darwin13.patch 1055 BLAKE2B 9aa8cd60a0d36f58a2c10476e6a754c5961375bc3747dceb7ad7a000fa423f9d139be8f9e78986b15a72fbe20c0f48409e461719cff1a27f4fa1867466cf8941 SHA512 ccdafb9dc20e7f03dd54967d1abf9b0840a5c9dfe54bb33342eb8f70c41dea588a00d6a4b423663a83e26e87c685bc32c711587a53b76a53ec4eb45c361a4071 -AUX openbsd-netcat-1.195-darwin.patch 2312 BLAKE2B 3f3f463b7e438772522e6e8e64dda8be6feeb674b424326e2b3d4eac1031d455544d7c047336c4a64a9ab4c5982eae8d6269d0d8901f7f10df326cbe324847ba SHA512 31f3dd9713daad1844a96f3bb5691d6dfaaf69e81a8c6a67b985e65868365e3e4b8b7b67798d8a82e64f3c1f53a21c7cd7b4df6d94062bcf90022c741b1dad66 +AUX openbsd-netcat-1.219-darwin.patch 2474 BLAKE2B cfc905e2bc0057b188e871db862151254d362f6e2b537bd519b8a55343f4ca450b4c7ebbbe633d9b5b5381eb0fd65854ec4a3673b517e1e66a5291eed5891367 SHA512 cc0e2ebfac6d4710953f41c8072170e43c89626da491e973225480d035258eca78f403a0a02f3b02d0cc7a7467dc23ceb898353df338f4047b6dcd55dd70f5f1 DIST netcat-openbsd_1.218-5.debian.tar.xz 52052 BLAKE2B 38ccde34bfa6f1873a8e38fa7355f94bc74cdeb125fd4081fd68819a685d49a4c8a6cc7ed243d49df2d38c7536f4ac680d598bd4c28a938bc4750c89376d2961 SHA512 a230eb143e32fe80ee108325bb81c4e163d48982b484bf4a93ef266e9eed12890e7e294c2fe3dd2ce91fe5aec7de2f1407bf25dc938c2565bfb3e0759555dddc DIST netcat-openbsd_1.218.orig.tar.gz 22964 BLAKE2B 2dba29cc93ef5295ec24db7632454564fa640fba139116d2732aff465c9a4b37238f65d51ad727f9b29d304b73ce05282b82ec468444c63f5611a90a1384ac62 SHA512 a830f0e3efdff01ba1bb0b344f49d545b9c184001cd641e523a6d24670b97d52dc723318660a5ec8f3215cb57ebe62ca4c06387000b6c8b6495a5c653a4206c6 DIST netcat-openbsd_1.219-1.debian.tar.xz 52048 BLAKE2B 62c2e4a6446fbdb01ea34a70c10dc72a980e62b4d8e06e4564f05932b9fb291be73558a1b8c11f448c509b0fc3c5fe42381a1a9f0a14bba0c2e087dd1e6da9f1 SHA512 badc1afbe8a467c068fa1d3bf12817d568eae5bb9774f9f11d3b30c065eb3a8b39724bb456329d7153ea3160cd10fab159a6756f7eeafd9bfc8c5d78114f7da6 DIST netcat-openbsd_1.219.orig.tar.gz 22940 BLAKE2B 4e871124a22fec2ba572f2a614b7eb5134565acd5d952973f7e7f76ead6b22d0811efcc916726da1e7719c5d3014f94ea53ad09804a77b55c4b15fc571bf0e95 SHA512 9f6d531d33410457b8f1e6a3eb0d105dbd819d5e4fe9753d32d7fd4583680ceba102a60307a8b5ef26b47047492b207388742b725da3708d30d360d4a196f115 -EBUILD openbsd-netcat-1.218_p5.ebuild 1761 BLAKE2B b4a16c5f9abdbce151c6acbc093d98f38e047af5af44a1b90db220b50216450eac71dd0055533f64828d6da5bda4364254ba8c7ddb93bb3cd9bcd644bbc5ca3b SHA512 00debb58166901d4b4221cfe44c857ea4fe1738aae36856632948d7d517d6209d825c9e2261276a53deb7177f30a25472310409a620c831a3fa91b054ae93317 -EBUILD openbsd-netcat-1.219_p1.ebuild 1761 BLAKE2B b4a16c5f9abdbce151c6acbc093d98f38e047af5af44a1b90db220b50216450eac71dd0055533f64828d6da5bda4364254ba8c7ddb93bb3cd9bcd644bbc5ca3b SHA512 00debb58166901d4b4221cfe44c857ea4fe1738aae36856632948d7d517d6209d825c9e2261276a53deb7177f30a25472310409a620c831a3fa91b054ae93317 +EBUILD openbsd-netcat-1.218_p5.ebuild 1738 BLAKE2B 07aa42fa2a1aeaf331c2699d9a9fb82c71543e894d5a7251f699bdefb606a0ebe9ce51bc8382c6b7aadb5c543a0ef9b0b08554f794d8951c3dc531647182e4c4 SHA512 d7baf7ec345471e61ba42a5e08825f84910250a3ab52f5b28cba8ccba76143c0ac6d2226d1f8a6a10fe369a18be43b11a52d3d1b75c653256a7d533b9d270f36 +EBUILD openbsd-netcat-1.219_p1.ebuild 1751 BLAKE2B f4f59969f2da3fb6d7c9b37ddeb46a39b65add3b6c8189a0bef4f012fe9c52df971402123e1a4139e2ed17d41e11ea378388c2ac7ae5b1012ddd38589b0441ca SHA512 5ebf58a060ce88ab905ddcf9f8900244f3590228fe3301773f66a91b40ea41ce870f0c9bd3f7c81c61825151b320a083b22bb049ebed1c804e39727095c61572 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06 diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch index 489eceedf6c0..564c414fc750 100644 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-darwin.patch +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch @@ -1,10 +1,10 @@ -Allow compilation on Darwin +Allow compilation on Darwin, reverting parts of Linux/Debian patch -diff --git a/netcat.c b/netcat.c -index a0fb51b..bbb5dd1 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -51,11 +51,16 @@ +Signed-off-by: Fabian Groffen <grobian@gentoo.org> + +--- a/netcat.c 2023-09-26 15:04:51.169658537 +0200 ++++ b/netcat.c 2023-09-26 15:07:00.270929256 +0200 +@@ -50,13 +50,18 @@ # include <bsd/readpassphrase.h> #endif @@ -22,7 +22,9 @@ index a0fb51b..bbb5dd1 100644 +# define SOCK_CLOEXEC 0 +#endif -@@ -108,8 +110,9 @@ + # ifndef IPTOS_DSCP_AF11 + # define IPTOS_DSCP_AF11 0x28 +@@ -108,8 +113,9 @@ # include <tls.h> #endif #include <unistd.h> @@ -34,9 +36,9 @@ index a0fb51b..bbb5dd1 100644 #include "atomicio.h" -@@ -814,9 +814,8 @@ - # endif - } else { +@@ -814,9 +820,8 @@ + int connfd; + len = sizeof(cliaddr); - connfd = accept4(s, (struct sockaddr *)&cliaddr, - &len, SOCK_NONBLOCK); @@ -46,35 +48,33 @@ index a0fb51b..bbb5dd1 100644 /* For now, all errnos are fatal */ err(1, "accept"); } -@@ -1100,6 +1099,8 @@ - return -1; - } +@@ -1069,6 +1074,8 @@ + } else + err(1, "poll failed"); } + 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 @@ + return ret; + } +@@ -1218,9 +1225,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) +- SOCK_NONBLOCK, res->ai_protocol)) == -1) + if ((s = socket(res->ai_family, res->ai_socktype, -+ res->ai_protocol)) < 0) -+ continue; ++ res->ai_protocol)) == -1) + continue; + if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) { + close(s); - continue; ++ 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 +--- a/socks.c 2023-09-26 15:04:51.085185645 +0200 ++++ b/socks.c 2023-09-26 15:07:30.947097100 +0200 @@ -38,7 +38,7 @@ #include <string.h> #include <unistd.h> @@ -84,13 +84,12 @@ index 9068f39..68b68e3 100644 #include "atomicio.h" #define SOCKS_PORT "1080" ---- a/socks.c -+++ b/socks.c -@@ -53,5 +53,7 @@ +@@ -53,6 +53,8 @@ #define SOCKS_DOMAIN 3 #define SOCKS_IPV6 4 +#define explicit_bzero(S,L) bzero(S,L) -+ - int remote_connect(const char *, const char *, struct addrinfo); ++ + int remote_connect(const char *, const char *, struct addrinfo, char *); int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild index b60dcaa1673f..c2ded9744780 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -20,7 +20,6 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" RDEPEND=" !net-analyzer/netcat - !net-analyzer/netcat6 !elibc_Darwin? ( dev-libs/libbsd ) " BDEPEND="virtual/pkgconfig" @@ -33,7 +32,7 @@ src_prepare() { if [[ ${CHOST} == *-darwin* ]] ; then # This undoes some of the Debian/Linux changes - PATCHES+=( "${FILESDIR}"/${PN}-1.195-darwin.patch ) + PATCHES+=( "${FILESDIR}"/${PN}-1.219-darwin.patch ) if [[ ${CHOST##*-darwin} -lt 20 ]] ; then PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch ) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild index b60dcaa1673f..6c34b11ba295 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -16,11 +16,10 @@ S="${WORKDIR}"/netcat-openbsd-${MY_PV} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos" RDEPEND=" !net-analyzer/netcat - !net-analyzer/netcat6 !elibc_Darwin? ( dev-libs/libbsd ) " BDEPEND="virtual/pkgconfig" @@ -33,7 +32,7 @@ src_prepare() { if [[ ${CHOST} == *-darwin* ]] ; then # This undoes some of the Debian/Linux changes - PATCHES+=( "${FILESDIR}"/${PN}-1.195-darwin.patch ) + PATCHES+=( "${FILESDIR}"/${PN}-1.219-darwin.patch ) if [[ ${CHOST##*-darwin} -lt 20 ]] ; then PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch ) |