commit: d79073fa489f7f736f8b64e8598e2d93ea0c0264
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 07:34:25 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 08:58:32 2021 +0000
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 <grobian <AT> 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 <Darwin-10.15
+strtonum isn't available on <Darwin-11
+
+however, it is in the header files on systems like 10.15 with an
+availability clause, so don't define strtonum static such that it
+matches the prototype from stdlib.h
diff --git a/netcat.c b/netcat.c
index a0fb51b..bbb5dd1 100644
@@ -14,7 +18,7 @@ index a0fb51b..bbb5dd1 100644
+ "invalid"
+};
+
-+static long long
++long long
+strtonum(
+ const char *nptr,
+ long long minval,
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 6fd1b2b6f90..b7288f531c8 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
if [[ ${CHOST} == *-darwin* ]] ; then
# this undoes some of the Debian/Linux changes
eapply "${FILESDIR}"/${PN}-1.195-darwin.patch
- if [[ ${CHOST##*-darwin} -lt 19 ]] ; then
+ if [[ ${CHOST##*-darwin} -lt 20 ]] ; then
eapply "${FILESDIR}"/${PN}-1.190-darwin13.patch
fi
fi
