[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: adecc0f58f3a727d04e8b397d0e00f0825fde901 Author: James Le Cuirot gentoo org> AuthorDate: Fri Aug 2 11:22:52 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Aug 2 11:25:16 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adecc0f5 net-analyzer/openbsd-netcat: Fix cross-compiling in 1.219_p1 It needs to call the correct pkg-config. Thanks to Krzesimir Nowak for the suggestion. Signed-off-by: James Le Cuirot gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 afe9a5ea3fbf..d07c4bf17e73 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,7 +47,7 @@ src_prepare() { } src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" } src_install() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 21b99f38d7b6c0cef8d861640ef7c9fed1d4b3dd Author: WANG Xuerui gentoo org> AuthorDate: Fri Sep 29 12:31:54 2023 + Commit: WANG Xuerui gentoo org> CommitDate: Fri Sep 29 18:36:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b99f38 net-analyzer/openbsd-netcat: keyword 1.219_p1 for ~loong Signed-off-by: WANG Xuerui gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6c34b11ba295..afe9a5ea3fbf 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/netcat-openbsd-${MY_PV} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/, net-analyzer/openbsd-netcat/files/
commit: a052cb9310636fb71a20be24e54f3032743d2dcb Author: Fabian Groffen gentoo org> AuthorDate: Tue Sep 26 19:45:47 2023 + Commit: Fabian Groffen gentoo org> CommitDate: Tue Sep 26 19:46:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a052cb93 net-analyzer/openbsd-netcat: fix Darwin patch Signed-off-by: Fabian Groffen gentoo.org> ...win.patch => openbsd-netcat-1.219-darwin.patch} | 57 +++--- .../openbsd-netcat/openbsd-netcat-1.218_p5.ebuild | 3 +- .../openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 5 +- 3 files changed, 31 insertions(+), 34 deletions(-) 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 similarity index 68% rename from net-analyzer/openbsd-netcat/files/openbsd-netcat-1.195-darwin.patch rename to 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 + +--- 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 #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 #endif #include @@ -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 #include @@ -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_IPV64 +#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/pkgconfi
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 49b51676a56110b406caae6ac6891b82bed2c8ba Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 6 14:47:57 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 6 14:47:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b51676 net-analyzer/openbsd-netcat: Stabilize 1.219_p1 arm64, #905814 Signed-off-by: Arthur Zamarin gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7ab6445de7df..b60dcaa1673f 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -16,7 +16,7 @@ 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 ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: cd5eb82f0998002bea4dd2f4d08a84fbfba90a80 Author: Sam James gentoo org> AuthorDate: Sat May 6 14:30:43 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 6 14:30:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5eb82f net-analyzer/openbsd-netcat: Stabilize 1.219_p1 x86, #905814 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1151b29ed07f..7ab6445de7df 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -16,7 +16,7 @@ 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 ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 8120805613f7a5c2237496f3628b61510b15af2a Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 6 13:50:48 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 6 13:50:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81208056 net-analyzer/openbsd-netcat: Stabilize 1.219_p1 ppc64, #905814 Signed-off-by: Arthur Zamarin gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7b3cf7964cfd..1151b29ed07f 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -16,7 +16,7 @@ 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 ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 475ac309256eadf8a778d8a8d1e8947da0af067b Author: Sam James gentoo org> AuthorDate: Sat May 6 12:11:09 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 6 12:11:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475ac309 net-analyzer/openbsd-netcat: Stabilize 1.219_p1 amd64, #905814 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 df4845a47877..7b3cf7964cfd 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -16,7 +16,7 @@ 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 ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 931aa2a8be20a0d2c0daf727799488e1d84d7e73 Author: Sam James gentoo org> AuthorDate: Mon May 1 13:10:23 2023 + Commit: Sam James gentoo org> CommitDate: Mon May 1 13:19:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931aa2a8 net-analyzer/openbsd-netcat: drop 1.195-r1 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/Manifest | 2 - .../openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 61 -- 2 files changed, 63 deletions(-) diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 737ca62b79de..9d649ed1d187 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,5 +1,3 @@ -DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552 -DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51 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 diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild deleted file mode 100644 index 936638785585.. --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="The OpenBSD network swiss army knife" -HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ - https://salsa.debian.org/debian/netcat-openbsd"; -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" - -BDEPEND="virtual/pkgconfig" -RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) - !net-analyzer/netcat - !net-analyzer/netcat6 -" - -S=${WORKDIR}/netcat-openbsd-${PV} - -src_prepare() { - for i_patch in $(<"${WORKDIR}"/debian/patches/series); do - eapply "${WORKDIR}"/debian/patches/"${i_patch}" - done - if [[ ${CHOST} == *-darwin* ]] ; then - # this undoes some of the Debian/Linux changes - eapply "${FILESDIR}"/${PN}-1.195-darwin.patch - if [[ ${CHOST##*-darwin} -lt 20 ]] ; then - eapply "${FILESDIR}"/${PN}-1.190-darwin13.patch - fi - fi - if use elibc_musl ; then - eapply "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch - fi - default -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin nc - doman nc.1 - cd "${WORKDIR}"/debian || die - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/files/
commit: 75744ca5cd171495eb53f1a2e58aa3df2405ea73 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Jan 21 11:37:32 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Wed Feb 1 01:13:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75744ca5 net-analyzer/openbsd-netcat: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29202 Signed-off-by: Conrad Kostecki gentoo.org> .../files/openbsd-netcat-1.190-darwin.patch| 86 -- 1 file changed, 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.. --- 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 - #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 - #endif - #include --#include --#include -+#include -+#include -+#include - - #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 - #include - #include --#include -+#include - #include "atomicio.h" - - #define SOCKS_PORT"1080"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 3e2024dc591c5611870fe2fbbbc1705327b8 Author: Sam James gentoo org> AuthorDate: Thu Jan 19 02:26:54 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 19 02:26:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2024dc net-analyzer/openbsd-netcat: Stabilize 1.218_p5 arm64, #891361 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7ab6445de7df..b60dcaa1673f 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -16,7 +16,7 @@ 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 ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 378fa06d44d682978c89012450927a63c1119f82 Author: Sam James gentoo org> AuthorDate: Thu Jan 19 02:26:53 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 19 02:26:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378fa06d net-analyzer/openbsd-netcat: Stabilize 1.218_p5 ppc64, #891361 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2a9a0a2b3ef3..7ab6445de7df 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -16,7 +16,7 @@ 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 ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 777b11e1618624279c04512e936d5c24f3669093 Author: Sam James gentoo org> AuthorDate: Thu Jan 19 02:26:51 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 19 02:26:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=777b11e1 net-analyzer/openbsd-netcat: Stabilize 1.218_p5 x86, #891361 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e877bbe04ee7..6fa616427617 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ 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 ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 4f3a2a67922cf0f31c270ba6d6c957cdb3d4ae09 Author: Sam James gentoo org> AuthorDate: Thu Jan 19 02:26:52 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 19 02:26:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3a2a67 net-analyzer/openbsd-netcat: Stabilize 1.218_p5 amd64, #891361 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6fa616427617..2a9a0a2b3ef3 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -16,7 +16,7 @@ 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 ~x64-macos" RDEPEND=" !net-analyzer/netcat
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: d17db39d29f7ab5d126342e26dd58211d0188b77 Author: Sam James gentoo org> AuthorDate: Thu Jan 19 01:38:04 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 19 01:38:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17db39d net-analyzer/openbsd-netcat: drop 1.190, 1.195 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/Manifest | 2 - .../openbsd-netcat/openbsd-netcat-1.190.ebuild | 55 -- .../openbsd-netcat/openbsd-netcat-1.195.ebuild | 55 -- 3 files changed, 112 deletions(-) diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 178bb8f48191..737ca62b79de 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,5 +1,3 @@ -DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a -DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51 DIST netcat-openbsd_1.218-5.debian.tar.xz 52052 BLAKE2B 38ccde34bfa6f1873a8e38fa7355f94bc74cdeb125fd4081fd68819a685d49a4c8a6cc7ed243d49df2d38c7536f4ac680d598bd4c28a938bc4750c89376d2961 SHA512 a230eb143e32fe80ee108325bb81c4e163d48982b484bf4a93ef266e9eed12890e7e294c2fe3dd2ce91fe5aec7de2f1407bf25dc938c2565bfb3e0759555dddc diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild deleted file mode 100644 index 70a973b584c8.. --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="The OpenBSD network swiss army knife" -HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ - https://salsa.debian.org/debian/netcat-openbsd"; -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" - -BDEPEND="virtual/pkgconfig" -RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) - !net-analyzer/netcat - !net-analyzer/netcat6 -" - -S=${WORKDIR}/netcat-openbsd-${PV} - -src_prepare() { - for i_patch in $(<"${WORKDIR}"/debian/patches/series); do - eapply "${WORKDIR}"/debian/patches/"${i_patch}" - done - if [[ ${CHOST} == *-darwin* ]] ; then - # this undoes some of the Debian/Linux changes - eapply "${FILESDIR}"/${P}-darwin.patch - fi - default -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin nc - doman nc.1 - cd "${WORKDIR}"/debian || die - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild deleted file mode 100644 index d82b685da2a0.. --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="The OpenBSD network swiss army knife" -HOMEP
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 76187ed1090f22f49a7b7cdfe368ae7098ac7992 Author: Sam James gentoo org> AuthorDate: Thu Jan 19 01:37:29 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 19 01:37:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76187ed1 net-analyzer/openbsd-netcat: add 1.219_p1 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/Manifest | 2 + .../openbsd-netcat/openbsd-netcat-1.219_p1.ebuild | 69 ++ 2 files changed, 71 insertions(+) diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 8d8c74dd8b1d..178bb8f48191 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -4,3 +4,5 @@ DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576b DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51 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 diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild new file mode 100644 index ..df4845a47877 --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV=$(ver_cut 1-2) +DESCRIPTION="The OpenBSD network swiss army knife" +HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd"; +SRC_URI=" + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}.orig.tar.gz + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}-$(ver_cut 4).debian.tar.xz +" +S="${WORKDIR}"/netcat-openbsd-${MY_PV} + +LICENSE="BSD" +SLOT="0" +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" + +src_prepare() { + local i + for i in $(<"${WORKDIR}"/debian/patches/series) ; do + PATCHES+=( "${WORKDIR}"/debian/patches/${i} ) + done + + if [[ ${CHOST} == *-darwin* ]] ; then + # This undoes some of the Debian/Linux changes + PATCHES+=( "${FILESDIR}"/${PN}-1.195-darwin.patch ) + + if [[ ${CHOST##*-darwin} -lt 20 ]] ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch ) + fi + fi + + if use elibc_musl ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch ) + fi + + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin nc + doman nc.1 + + cd "${WORKDIR}"/debian || die + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if use kernel_linux ; then + ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 5b7eab8e3728c5a7da7f99b29fe455876ee6003d Author: Sam James gentoo org> AuthorDate: Sun Sep 25 01:14:48 2022 + Commit: Sam James gentoo org> CommitDate: Sun Sep 25 01:14:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b7eab8e net-analyzer/openbsd-netcat: add 1.218_p5 Closes: https://bugs.gentoo.org/717382 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/Manifest | 2 + .../openbsd-netcat/openbsd-netcat-1.218_p5.ebuild | 69 ++ 2 files changed, 71 insertions(+) diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index d79bf2758872..8d8c74dd8b1d 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -2,3 +2,5 @@ DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c869 DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51 +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 diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild new file mode 100644 index ..e877bbe04ee7 --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV=$(ver_cut 1-2) +DESCRIPTION="The OpenBSD network swiss army knife" +HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd"; +SRC_URI=" + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}.orig.tar.gz + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}-$(ver_cut 4).debian.tar.xz +" +S="${WORKDIR}"/netcat-openbsd-${MY_PV} + +LICENSE="BSD" +SLOT="0" +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" + +src_prepare() { + local i + for i in $(<"${WORKDIR}"/debian/patches/series) ; do + PATCHES+=( "${WORKDIR}"/debian/patches/${i} ) + done + + if [[ ${CHOST} == *-darwin* ]] ; then + # This undoes some of the Debian/Linux changes + PATCHES+=( "${FILESDIR}"/${PN}-1.195-darwin.patch ) + + if [[ ${CHOST##*-darwin} -lt 20 ]] ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch ) + fi + fi + + if use elibc_musl ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch ) + fi + + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin nc + doman nc.1 + + cd "${WORKDIR}"/debian || die + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if use kernel_linux ; then + ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 83a2c9340839e623b694c8a7071ecb20b869707d Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 12 10:33:14 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 12 10:33:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a2c934 net-analyzer/openbsd-netcat: x86 stable wrt bug #864733 Signed-off-by: Agostino Sarubbo gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index 2c65036625ad..936638785585 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd 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 ~x64-macos" BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 1186ba4250c51ee2e23750b37c6c32ad4c5eac12 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 12 10:16:31 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 12 10:16:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1186ba42 net-analyzer/openbsd-netcat: amd64 stable wrt bug #864733 Signed-off-by: Agostino Sarubbo gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index 170292950a45..2c65036625ad 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd 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 ~x64-macos" BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 1e49de73e6ba9f28cacf6b2fe281e618305bbbd2 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Aug 10 10:56:14 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Aug 10 10:56:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e49de73 net-analyzer/openbsd-netcat: Stabilize 1.195-r1 ppc64, #864733 Signed-off-by: Arthur Zamarin gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index 94538c3009a9..170292950a45 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd 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 ~x64-macos" BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: c9d9a67e52060cf77f7ab516781e8f54c2868663 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Aug 10 09:41:55 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Aug 10 09:41:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9d9a67e net-analyzer/openbsd-netcat: arm64 stable wrt bug #864733 Signed-off-by: Agostino Sarubbo gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index 10daf4381959..94538c3009a9 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd 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 ~x64-macos" BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 91706a5801928950fee1b7fc5eb1da99a314552e Author: Jakov Smolić gentoo org> AuthorDate: Fri Jun 24 20:57:44 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Fri Jun 24 20:57:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91706a58 net-analyzer/openbsd-netcat: Keyword 1.195-r1 arm, #849839 Signed-off-by: Jakov Smolić gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index c04edf0bb0da..10daf4381959 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 35ca60ce1f92d9f39b524e10f4d0c89d1275318b Author: Sam James gentoo org> AuthorDate: Sun Mar 20 18:41:46 2022 + Commit: Sam James gentoo org> CommitDate: Sun Mar 20 18:43:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ca60ce net-analyzer/openbsd-netcat: [QA] fix tc-get* quoting This can cause build problems for e.g. 32-bit (gcc -m32 ...) Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild| 2 +- net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild index 859270ce857d..70a973b584c8 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild @@ -35,7 +35,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index 48dfecb119bd..c04edf0bb0da 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -41,7 +41,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild index 90851a6bcac9..d82b685da2a0 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild @@ -35,7 +35,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() {
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 5c7ad58b3d429f519010f4f2982103c04d91b975 Author: David Seifert gentoo org> AuthorDate: Mon Jan 3 23:26:12 2022 + Commit: David Seifert gentoo org> CommitDate: Mon Jan 3 23:26:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c7ad58b net-analyzer/openbsd-netcat: remove implicit elibc_* flags Signed-off-by: David Seifert gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild| 5 ++--- net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 5 ++--- net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild| 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild index 1c797beed02f..859270ce857d 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,10 +10,9 @@ HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd"; SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"; + LICENSE="BSD" SLOT="0" -IUSE="elibc_Darwin" - KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" BDEPEND="virtual/pkgconfig" diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index 6cf8215e03c8..48dfecb119bd 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,10 +10,9 @@ HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd"; SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"; + LICENSE="BSD" SLOT="0" -IUSE="elibc_Darwin" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" BDEPEND="virtual/pkgconfig" diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild index ee806c763af0..90851a6bcac9 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,10 +10,9 @@ HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd"; SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"; + LICENSE="BSD" SLOT="0" -IUSE="elibc_Darwin" - KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x64-macos" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: b5edff5db2ac0d8d633d64d6112cae55013961fc Author: Marek Szuba gentoo org> AuthorDate: Mon Sep 27 14:22:44 2021 + Commit: Marek Szuba gentoo org> CommitDate: Mon Sep 27 14:52:48 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5edff5d net-analyzer/openbsd-netcat: keyword 1.195-r1 for ~riscv Signed-off-by: Marek Szuba gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index 5d630245ac7..6cf8215e03c 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 4c95a8f59560f3ef06f7df300a80f3c69e14c214 Author: Sam James gentoo org> AuthorDate: Mon Aug 9 01:15:21 2021 + Commit: Sam James gentoo org> CommitDate: Mon Aug 9 01:15:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c95a8f5 net-analyzer/openbsd-netcat: Keyword 1.195-r1 ppc, #806448 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild index b7288f531c8..5d630245ac7 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/files/, net-analyzer/openbsd-netcat/
commit: d79073fa489f7f736f8b64e8598e2d93ea0c0264 Author: Fabian Groffen gentoo org> AuthorDate: Fri Jun 18 07:34:25 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Fri Jun 18 08:58:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79073fa net-analyzer/openbsd-netcat-1.195-r1: fix compile for real on >=darwin19 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> .../openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch | 8 ++-- net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild| 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch index 5a643a2945f..216b8c20792 100644 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch @@ -1,4 +1,8 @@ -strtonum isn't available on
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/, net-analyzer/openbsd-netcat/files/
commit: c66ee6eae7e62e36caad12950a995cfff43fbb0b Author: Fabian Groffen gentoo org> AuthorDate: Thu Jun 17 18:43:48 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jun 17 18:44:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66ee6ea net-analyzer/openbsd-netcat-1.195-r1: fix build for musl and Darwin Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> .../files/openbsd-netcat-1.105-musl-b64_ntop.patch | 349 + .../files/openbsd-netcat-1.190-darwin.patch| 44 --- .../files/openbsd-netcat-1.190-darwin13.patch | 50 +++ ...win.patch => openbsd-netcat-1.195-darwin.patch} | 54 +--- .../openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 62 5 files changed, 471 insertions(+), 88 deletions(-) diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch new file mode 100644 index 000..a9603b38bc0 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch @@ -0,0 +1,349 @@ +diff -Naur netcat-openbsd-1.105.orig/Makefile netcat-openbsd-1.105/Makefile +--- netcat-openbsd-1.105.orig/Makefile 2017-06-18 09:01:44.293852659 -0700 netcat-openbsd-1.105/Makefile 2017-06-18 09:04:35.566687655 -0700 +@@ -1,7 +1,7 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c compat/base64.c + + LIBS= `pkg-config --libs libbsd` -lresolv + OBJS= $(SRCS:.c=.o) +diff -Naur netcat-openbsd-1.105.orig/compat/base64.c netcat-openbsd-1.105/compat/base64.c +--- netcat-openbsd-1.105.orig/compat/base64.c 1969-12-31 16:00:00.0 -0800 netcat-openbsd-1.105/compat/base64.c 2017-06-18 09:01:31.288700637 -0700 +@@ -0,0 +1,315 @@ ++/*$OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/, net-analyzer/openbsd-netcat/files/
commit: 6a7ba49face09a3dcac346983baa2c26c8dc0165 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jun 17 18:15:48 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jun 17 18:44:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7ba49f net-analyzer/openbsd-netcat: cleanup old Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> net-analyzer/openbsd-netcat/Manifest | 2 - .../files/openbsd-netcat-1.105-darwin.patch| 84 -- .../openbsd-netcat/openbsd-netcat-1.105-r1.ebuild | 54 -- .../openbsd-netcat/openbsd-netcat-1.105.ebuild | 37 -- 4 files changed, 177 deletions(-) diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 0ccf2ff4923..d79bf275887 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,5 +1,3 @@ -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 DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe 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.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch deleted file mode 100644 index a6f805af1a6..000 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch +++ /dev/null @@ -1,84 +0,0 @@ a/netcat.c -+++ b/netcat.c -@@ -43,11 +43,13 @@ - #include - #include - -+#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 */ - -@@ -96,8 +98,9 @@ - #include - #include - #include --#include --#include -+#include -+#include -+#include - #include "atomicio.h" - - #ifndef SUN_LEN -@@ -169,6 +172,43 @@ - socklen_t salen, int ctimeout); - static void quit(); - -+static char* strtonumerrs[] = { -+ "too large", -+ "too small", -+ "invalid" -+}; -+ -+static long long -+strtonum( -+ const char *nptr, -+ long long minval, -+ long long maxval, -+ const char **errstr) -+{ -+ long long val; -+ -+ while (*nptr != '\0' && isspace(*nptr)) -+ nptr++; -+ if (*nptr == '\0') { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[2]; -+ return 0; -+ } -+ val = atoll(nptr); -+ if (val < minval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[1]; -+ return 0; -+ } -+ if (val > maxval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[0]; -+ return 0; -+ } -+ *errstr = NULL; -+ return val; -+} -+ - int - main(int argc, char *argv[]) - { a/socks.c -+++ b/socks.c -@@ -38,7 +38,7 @@ - #include - #include - #include --#include -+#include - #include "atomicio.h" - - #define SOCKS_PORT"1080" diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild deleted file mode 100644 index 9b84922f8b7..000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 7431416128a530b83000c7e19990136df9768ca4 Author: Sam James gentoo org> AuthorDate: Mon Apr 19 00:22:53 2021 + Commit: Sam James gentoo org> CommitDate: Mon Apr 19 00:23:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74314161 net-analyzer/openbsd-netcat: Stabilize 1.195 ppc64, #783036 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild index 4f502c997a1..ee806c763af 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x64-macos" BDEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/files/, net-analyzer/openbsd-netcat/
commit: 094258d6ac18a136540bd6e5b65257fa5556db5f Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Apr 5 16:45:28 2021 + Commit: Sam James gentoo org> CommitDate: Mon Apr 5 23:41:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094258d6 net-analyzer/openbsd-netcat: fix patching Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/20267 Signed-off-by: Sam James gentoo.org> .../openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch | 10 -- net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch index 8c68a66ad54..a6f805af1a6 100644 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch @@ -1,7 +1,5 @@ -Allow compilation on Darwin - netcat.c -+++ netcat.c +--- a/netcat.c b/netcat.c @@ -43,11 +43,13 @@ #include #include @@ -73,8 +71,8 @@ Allow compilation on Darwin int main(int argc, char *argv[]) { socks.c -+++ socks.c +--- a/socks.c b/socks.c @@ -38,7 +38,7 @@ #include #include diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild index 7a6f5c18460..9b84922f8b7 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -29,7 +29,7 @@ src_prepare() { default if [[ ${CHOST} == *-darwin* ]] ; then # this undoes some of the Debian/Linux changes - epatch "${FILESDIR}"/${P}-darwin.patch + eapply "${FILESDIR}"/${P}-darwin.patch fi }
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 01ac1c40953e8a2b3ee2c52aa050f9143c8cbd5f Author: Sam James gentoo org> AuthorDate: Fri Apr 2 01:59:19 2021 + Commit: Sam James gentoo org> CommitDate: Sat Apr 3 15:55:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01ac1c40 net-analyzer/openbsd-netcat: drop unused eutils Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild index 298a47420fd..7a6f5c18460 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs eutils +inherit toolchain-funcs DESCRIPTION="The OpenBSD network swiss army knife" HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/";
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/files/, net-analyzer/openbsd-netcat/
commit: 376fbe9ba6cedba285000bdb909a5ea46b0955e7 Author: Fabian Groffen gentoo org> AuthorDate: Mon Feb 15 17:42:32 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Feb 15 17:43:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376fbe9b net-analyzer/openbsd-netcat: update darwin patch so it applies to 1.195 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> .../files/openbsd-netcat-1.190-darwin.patch | 17 + net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild | 4 ++-- 2 files changed, 7 insertions(+), 14 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 index e1a462e746b..a8453c09067 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 @@ -4,7 +4,7 @@ diff --git a/netcat.c b/netcat.c index a0fb51b..bbb5dd1 100644 --- a/netcat.c +++ b/netcat.c -@@ -51,11 +51,13 @@ +@@ -51,11 +51,16 @@ # include #endif @@ -18,6 +18,9 @@ index a0fb51b..bbb5dd1 100644 -# 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 @@ -87,17 +90,7 @@ index a0fb51b..bbb5dd1 100644 /* 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"); +@@ -1100,6 +1099,8 @@ return -1; } } diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild index 7994e7f7ba3..9e669ea4b2a 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,7 @@ src_prepare() { done if [[ ${CHOST} == *-darwin* ]] ; then # this undoes some of the Debian/Linux changes - eapply "${FILESDIR}"/${P}-darwin.patch + eapply "${FILESDIR}"/${PN}-1.190-darwin.patch fi default }
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 019893a64632e746ee3e3f6b0fa4859a8dec73ce Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Oct 25 23:37:59 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Oct 25 23:42:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019893a6 net-analyzer/openbsd-netcat: x86 stable (bug #740254) Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild index 70994b0ad01..56725f9b17a 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="~amd64 arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: cd740cfb7b8f18da49d0ec22c56501c8b59efc1c Author: Sam James gentoo org> AuthorDate: Sun Oct 25 23:16:57 2020 + Commit: Sam James gentoo org> CommitDate: Sun Oct 25 23:16:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd740cfb net-analyzer/openbsd-netcat: Stabilize 1.195 arm64, #740254 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild index 363c5e7a819..70994b0ad01 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 7f34cf0f0a1d19067bd05b3da35804242ba1d736 Author: Sam James gentoo org> AuthorDate: Thu Aug 20 13:16:44 2020 + Commit: Sam James gentoo org> CommitDate: Thu Aug 20 13:20:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f34cf0f net-analyzer/openbsd-netcat: Stabilize 1.190 arm64, #738076 Signed-off-by: Sam James gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild index 83108311916..7994e7f7ba3 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 267be547af3433faf9d414a1db345b89b51fcffd Author: Benda Xu gentoo org> AuthorDate: Wed May 13 03:59:13 2020 + Commit: Benda XU gentoo org> CommitDate: Wed May 13 03:59:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267be547 net-analyzer/openbsd-netcat: version bump. 1.195 is in Debian stable. Suggested-By: cubic.org> Bug: https://bugs.gentoo.org/680224 Package-Manager: Portage-2.3.88, Repoman-2.3.18 Signed-off-by: Benda Xu gentoo.org> net-analyzer/openbsd-netcat/Manifest | 2 + .../openbsd-netcat/openbsd-netcat-1.195.ebuild | 56 ++ 2 files changed, 58 insertions(+) diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 6b9fe794d87..0ccf2ff4923 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -2,3 +2,5 @@ DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb266087 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 DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe +DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552 +DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51 diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild new file mode 100644 index 000..363c5e7a819 --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="The OpenBSD network swiss army knife" +HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ + https://salsa.debian.org/debian/netcat-openbsd"; +SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz + http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"; +LICENSE="BSD" +SLOT="0" +IUSE="elibc_Darwin" + +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + +DEPEND="virtual/pkgconfig" +RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) + !net-analyzer/netcat + !net-analyzer/netcat6 +" + +S=${WORKDIR}/netcat-openbsd-${PV} + +src_prepare() { + for i_patch in $(<"${WORKDIR}"/debian/patches/series); do + eapply "${WORKDIR}"/debian/patches/"${i_patch}" + done + if [[ ${CHOST} == *-darwin* ]] ; then + # this undoes some of the Debian/Linux changes + eapply "${FILESDIR}"/${P}-darwin.patch + fi + default +} + +src_compile() { + emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin nc + doman nc.1 + cd "${WORKDIR}"/debian || die + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if [[ ${KERNEL} = "linux" ]]; then + ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 4ca1cbf089ff03b23cfde6653227e6458ed12a6c Author: Aaron Bauman gentoo org> AuthorDate: Mon Apr 8 23:18:25 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Apr 8 23:18:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca1cbf0 net-analyzer/openbsd-netcat: arm64 keyworded (bug #680266) Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild index 8d316961574..83108311916 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 4ba77fdf9ceee322a03f513579782de9b9abd62b Author: Mikle Kolyada gentoo org> AuthorDate: Wed Mar 13 13:42:03 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed Mar 13 13:42:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba77fdf net-analyzer/openbsd-netcat: amd64 stable wrt bug #680234 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild index c3641f06068..8d316961574 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 6a1356050e08b9aaa811885515236cbbf4473407 Author: Michał Górny gentoo org> AuthorDate: Wed Mar 13 13:18:56 2019 + Commit: Michał Górny gentoo org> CommitDate: Wed Mar 13 13:18:56 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a135605 net-analyzer/openbsd-netcat: x86 stable wrt bug #680234 Signed-off-by: Michał Górny gentoo.org> net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild index e94c5c4103a..c3641f06068 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/files/
commit: ecaa995bf0658be5b8295624d14cc023b3c09e58 Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 6 10:33:27 2018 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 6 10:33:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecaa995b net-analyzer/openbsd-netcat: complete Darwin patch to fix compilation Signed-off-by: Fabian Groffen gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../files/openbsd-netcat-1.190-darwin.patch| 47 ++ 1 file changed, 47 insertions(+) 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 818b13a81a5..e1a462e746b 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/files/, net-analyzer/openbsd-netcat/
commit: c0817e0ba61968f842f4f8d5fbb30d5c93be8dec Author: Xiami f2light com> AuthorDate: Thu Sep 6 11:19:39 2018 + Commit: Benda XU gentoo org> CommitDate: Wed Sep 12 02:37:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0817e0b net-analyzer/openbsd-netcat: bump to version 1.190 Bump to EAPI 7 (deprecate epatch) Use debian/patches/series to determine patch order Remove eapi-deprecated ebuild Closes: https://github.com/gentoo/gentoo/pull/9790 Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-analyzer/openbsd-netcat/Manifest | 3 +- .../files/openbsd-netcat-1.190-darwin.patch| 90 ++ .../openbsd-netcat/openbsd-netcat-1.190.ebuild | 56 ++ .../openbsd-netcat/openbsd-netcat-1.84.ebuild | 68 4 files changed, 148 insertions(+), 69 deletions(-) diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 5fc38136e0d..6b9fe794d87 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,3 +1,4 @@ -DIST nc-1.84-22.el6.src.rpm 62570 BLAKE2B d7407ec122997a05fe27a13557530d2905f7d1159e609b4600c72dceaa9347944218196a1190ac7e431b35e255eca1fa8f812f12b32898eda369c21984498d97 SHA512 a02f5a42e0db0aeff95a06964d6b9ccfa21d659ca67505d19c724966edbca42446ac4048339def769139ca6ae145cdc75e9908f12b21449bc9d748d3cac39094 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 +DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe 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 new file mode 100644 index 000..818b13a81a5 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch @@ -0,0 +1,90 @@ +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,13 @@ + # include + #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 */ + +@@ -108,8 +110,9 @@ + # include + #endif + #include +-#include +-#include ++#include ++#include ++#include + + #include "atomicio.h" + +@@ -240,6 +243,43 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa, + + static void quit(); + ++static char* strtonumerrs[] = { ++ "too large", ++ "too small", ++ "invalid" ++}; ++ ++static long long ++strtonum( ++ const char *nptr, ++ long long minval, ++ long long maxval, ++ const char **errstr) ++{ ++ long long val; ++ ++ while (*nptr != '\0' && isspace(*nptr)) ++ nptr++; ++ if (*nptr == '\0') { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[2]; ++ return 0; ++ } ++ val = atoll(nptr); ++ if (val < minval) { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[1]; ++ return 0; ++ } ++ if (val > maxval) { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[0]; ++ return 0; ++ } ++ *errstr = NULL; ++ return val; ++} ++ + int + main(int argc, char *argv[]) + { +diff --git a/socks.c b/socks.c +index 9068f39..68b68e3 100644 +--- a/socks.c b/socks.c +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + #include "atomicio.h" + + #define SOCKS_PORT"1080" diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 7690c01bbcf11900dd2267998737e72646774aa3 Author: Fabian Groffen gentoo org> AuthorDate: Wed Sep 13 15:04:57 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Sep 13 15:04:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7690c01b net-analyzer/openbsd-netcat: marked ~ppc64 Package-Manager: Portage-2.3.6, Repoman-2.3.1 net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild index 769c9b57c68..fbc35796377 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ LICENSE="BSD" SLOT="0" IUSE="elibc_Darwin" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/, net-analyzer/openbsd-netcat/files/
commit: 75def684be04605c57136532039683b5dacc5fa4 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jul 11 09:02:25 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Jul 11 09:02:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75def684 net-analyzer/openbsd-netcat: better fix for Darwin Package-Manager: portage-2.2.28 .../files/openbsd-netcat-1.105-darwin.patch| 86 ++ .../openbsd-netcat/openbsd-netcat-1.105-r1.ebuild | 8 +- 2 files changed, 89 insertions(+), 5 deletions(-) diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch new file mode 100644 index 000..8c68a66 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch @@ -0,0 +1,86 @@ +Allow compilation on Darwin + +--- netcat.c netcat.c +@@ -43,11 +43,13 @@ + #include + #include + ++#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 */ + +@@ -96,8 +98,9 @@ + #include + #include + #include +-#include +-#include ++#include ++#include ++#include + #include "atomicio.h" + + #ifndef SUN_LEN +@@ -169,6 +172,43 @@ + socklen_t salen, int ctimeout); + static void quit(); + ++static char* strtonumerrs[] = { ++ "too large", ++ "too small", ++ "invalid" ++}; ++ ++static long long ++strtonum( ++ const char *nptr, ++ long long minval, ++ long long maxval, ++ const char **errstr) ++{ ++ long long val; ++ ++ while (*nptr != '\0' && isspace(*nptr)) ++ nptr++; ++ if (*nptr == '\0') { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[2]; ++ return 0; ++ } ++ val = atoll(nptr); ++ if (val < minval) { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[1]; ++ return 0; ++ } ++ if (val > maxval) { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[0]; ++ return 0; ++ } ++ *errstr = NULL; ++ return val; ++} ++ + int + main(int argc, char *argv[]) + { +--- socks.c socks.c +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + #include "atomicio.h" + + #define SOCKS_PORT"1080" diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild index f20c5c3..e80ac3a 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit toolchain-funcs flag-o-matic +inherit toolchain-funcs eutils DESCRIPTION="The OpenBSD network swiss army knife" HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"; @@ -29,10 +29,8 @@ PATCHES=( "${WORKDIR}/debian/patches" ) src_prepare() { default if [[ ${CHOST} == *-darwin* ]] ; then - # Darwin = BSD, so remove libbsd dependency - sed -i -e '/#include/s|bsd/||' -e 's/strtonum/strtoimax/' *.[ch] || die - # Clang defaults to C99, but strtoimax isn't in C99 - append-flags -DIPTOS_LOWCOST=0x02 -std=c89 + # this undoes some of the Debian/Linux changes + epatch "${FILESDIR}"/${P}-darwin.patch fi }
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: bfd0d5d8b0839284b65841332be32b99e6b84441 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jul 4 12:24:02 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Jul 4 12:25:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd0d5d8 net-analyzer/openbsd-netcat: undo Linuxification on Darwin Package-Manager: portage-2.2.28 .../openbsd-netcat/openbsd-netcat-1.105-r1.ebuild | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild index c4d9efa..f20c5c3 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit toolchain-funcs +inherit toolchain-funcs flag-o-matic DESCRIPTION="The OpenBSD network swiss army knife" HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"; @@ -12,11 +12,12 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz"; LICENSE="BSD" SLOT="0" +IUSE="elibc_Darwin" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" -RDEPEND="dev-libs/libbsd +RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6 " @@ -25,6 +26,16 @@ S=${WORKDIR}/netcat-openbsd-${PV} PATCHES=( "${WORKDIR}/debian/patches" ) +src_prepare() { + default + if [[ ${CHOST} == *-darwin* ]] ; then + # Darwin = BSD, so remove libbsd dependency + sed -i -e '/#include/s|bsd/||' -e 's/strtonum/strtoimax/' *.[ch] || die + # Clang defaults to C99, but strtoimax isn't in C99 + append-flags -DIPTOS_LOWCOST=0x02 -std=c89 + fi +} + src_compile() { emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die }
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 095a727d0ba5c3a703a501dc71d7ddaf80e83041 Author: Fabian Groffen gentoo org> AuthorDate: Mon May 23 19:37:20 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon May 23 19:37:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=095a727d net-analyzer/openbsd-netcat: revbump to install as nc (blocking netcat), bug #582884, respect CC, CFLAGS and LDFLAGS Package-Manager: portage-2.2.28 .../openbsd-netcat/openbsd-netcat-1.105-r1.ebuild | 46 ++ 1 file changed, 46 insertions(+) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild new file mode 100644 index 000..c4d9efa --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="The OpenBSD network swiss army knife" +HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"; +SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz + http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz"; +LICENSE="BSD" +SLOT="0" + +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos" + +DEPEND="virtual/pkgconfig" +RDEPEND="dev-libs/libbsd + !net-analyzer/netcat + !net-analyzer/netcat6 +" + +S=${WORKDIR}/netcat-openbsd-${PV} + +PATCHES=( "${WORKDIR}/debian/patches" ) + +src_compile() { + emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die +} + +src_install() { + dobin nc + doman nc.1 + cd "${WORKDIR}/debian" + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if [[ ${KERNEL} = "linux" ]]; then + ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: 48e70180fe2c14ffccc19cc30f45dec1a9945053 Author: Fabian Groffen gentoo org> AuthorDate: Tue May 17 08:29:17 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Tue May 17 08:29:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e70180 net-analyzer/openbsd-netcat: marked ~x64-macos, ~amd64-linux Package-Manager: portage-2.2.28 net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild index 0aba384..70fc38d 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos" DEPEND="virtual/pkgconfig" RDEPEND="dev-libs/libbsd"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/openbsd-netcat/
commit: e25f018e70d3ac9a16cd8de46497dbb1e6f22965 Author: Benda Xu gentoo org> AuthorDate: Fri May 13 08:10:32 2016 + Commit: Benda XU gentoo org> CommitDate: Fri May 13 08:11:06 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25f018e net-analyzer/openbsd-netcat: bump to OpenBSD cvs version 1.105. Import patches from Debian. Package-Manager: portage-2.2.28 net-analyzer/openbsd-netcat/Manifest | 2 ++ .../openbsd-netcat/openbsd-netcat-1.105.ebuild | 38 ++ 2 files changed, 40 insertions(+) diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 8edf5f9..ffedf71 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1 +1,3 @@ DIST nc-1.84-22.el6.src.rpm 62570 SHA256 8aa023a96a11f47fbaccda332f7e2c73697c271d2bd25b2485470d288d0db844 SHA512 a02f5a42e0db0aeff95a06964d6b9ccfa21d659ca67505d19c724966edbca42446ac4048339def769139ca6ae145cdc75e9908f12b21449bc9d748d3cac39094 WHIRLPOOL fb4b822b88fdf0097781ff8f23489e4300563e3c6f655b00519a2ced93f17cd433d5f3acf2cd66a7f97e4b3755838c9dc8619e0c1e5fbc54136a33212a8c7613 +DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 SHA256 eee759327ffea293e81d0dde67921b7fcfcad279ffd7a2c9d037bbc8f882b363 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6 WHIRLPOOL 62878c51077b26578626f45e1282f2c1f16ae869714b355ef1797ec2911b8773ef07c81468e35bae02087f9f061b828be39200333c204e77b0bdb1ac9eceb957 +DIST netcat-openbsd_1.105.orig.tar.gz 14891 SHA256 40653fe66c1516876b61b07e093d826e2a5463c5d994f1b7e6ce328f3edb211e SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703 WHIRLPOOL 7e80dde953575b5fc21399ef1d1d40c8cd6b40a5d6cd81d8a606d14b35ce8432c304d3e1bdaf9fb4697cf6dffc017b565cd60033ec0700d2442bc3ea3ca6aa9a diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild new file mode 100644 index 000..0aba384 --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="the OpenBSD network swiss army knife" +HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"; +SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz + http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz"; +LICENSE="BSD" +SLOT="0" + +KEYWORDS="~amd64 ~x86" + +DEPEND="virtual/pkgconfig" +RDEPEND="dev-libs/libbsd" + +S=${WORKDIR}/netcat-openbsd-${PV} + +PATCHES=( "${WORKDIR}/debian/patches" ) + +src_install() { + # avoid name conflict against net-analyzer/netcat + newbin nc nc.openbsd + newman nc.1 nc.openbsd.1 + cd "${WORKDIR}/debian" + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if [[ ${KERNEL} = "linux" ]]; then + ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +}