| 1 |
commit: d79073fa489f7f736f8b64e8598e2d93ea0c0264 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 18 07:34:25 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 18 08:58:32 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79073fa |
| 7 |
|
| 8 |
net-analyzer/openbsd-netcat-1.195-r1: fix compile for real on >=darwin19 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
.../openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch | 8 ++++++-- |
| 14 |
net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild | 2 +- |
| 15 |
2 files changed, 7 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index 5a643a2945f..216b8c20792 100644 |
| 19 |
--- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch |
| 20 |
+++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch |
| 21 |
@@ -1,4 +1,8 @@ |
| 22 |
-strtonum isn't available on <Darwin-10.15 |
| 23 |
+strtonum isn't available on <Darwin-11 |
| 24 |
+ |
| 25 |
+however, it is in the header files on systems like 10.15 with an |
| 26 |
+availability clause, so don't define strtonum static such that it |
| 27 |
+matches the prototype from stdlib.h |
| 28 |
|
| 29 |
diff --git a/netcat.c b/netcat.c |
| 30 |
index a0fb51b..bbb5dd1 100644 |
| 31 |
@@ -14,7 +18,7 @@ index a0fb51b..bbb5dd1 100644 |
| 32 |
+ "invalid" |
| 33 |
+}; |
| 34 |
+ |
| 35 |
-+static long long |
| 36 |
++long long |
| 37 |
+strtonum( |
| 38 |
+ const char *nptr, |
| 39 |
+ long long minval, |
| 40 |
|
| 41 |
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild |
| 42 |
index 6fd1b2b6f90..b7288f531c8 100644 |
| 43 |
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild |
| 44 |
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195-r1.ebuild |
| 45 |
@@ -31,7 +31,7 @@ src_prepare() { |
| 46 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 47 |
# this undoes some of the Debian/Linux changes |
| 48 |
eapply "${FILESDIR}"/${PN}-1.195-darwin.patch |
| 49 |
- if [[ ${CHOST##*-darwin} -lt 19 ]] ; then |
| 50 |
+ if [[ ${CHOST##*-darwin} -lt 20 ]] ; then |
| 51 |
eapply "${FILESDIR}"/${PN}-1.190-darwin13.patch |
| 52 |
fi |
| 53 |
fi |
Archives