git: 6a5c6710db8d - main - devel/delve: Update to 1.6.1

[Li-Wen Hsu]

The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6a5c6710db8d243c01158d1d134a81902c1d47d7

commit 6a5c6710db8d243c01158d1d134a81902c1d47d7
Author:     Dmitry Wagin <dmitry.wagin at ya.ru>
AuthorDate: 2021-06-01 14:48:01 +0000
Commit:     Li-Wen Hsu <lwhsu at FreeBSD.org>
CommitDate: 2021-06-01 15:27:02 +0000

    devel/delve: Update to 1.6.1
    
    Also added https://github.com/go-delve/delve/pull/2511
    
    PR:             256330
---
 devel/delve/Makefile                               |  2 +-
 devel/delve/distinfo                               |  6 +--
 .../files/patch-pkg_proc_native_proc__freebsd.c    | 52 ++++++++++++++++++++++
 .../files/patch-pkg_proc_native_proc__freebsd.h    | 10 +++++
 4 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/devel/delve/Makefile b/devel/delve/Makefile
index 343b33aec195..226c7bf03158 100644
--- a/devel/delve/Makefile
+++ b/devel/delve/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	delve
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.0
+DISTVERSION=	1.6.1
 CATEGORIES=	devel
 
 MAINTAINER=	dmitry.wagin at ya.ru
diff --git a/devel/delve/distinfo b/devel/delve/distinfo
index 3d05feb72046..75c3386e726c 100644
--- a/devel/delve/distinfo
+++ b/devel/delve/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612113058
-SHA256 (go-delve-delve-v1.6.0_GH0.tar.gz) = a10a6fc40d87572c6d3f3becdb1a289269e17526d038749f2fa04dd9f591f26a
-SIZE (go-delve-delve-v1.6.0_GH0.tar.gz) = 7629850
+TIMESTAMP = 1622023017
+SHA256 (go-delve-delve-v1.6.1_GH0.tar.gz) = e73f7fc063632268d3bdf53486aeafd98cceb8f86f4af56903dedfebaefe690d
+SIZE (go-delve-delve-v1.6.1_GH0.tar.gz) = 7686466
diff --git a/devel/delve/files/patch-pkg_proc_native_proc__freebsd.c b/devel/delve/files/patch-pkg_proc_native_proc__freebsd.c
new file mode 100644
index 000000000000..dc77c6b3591f
--- /dev/null
+++ b/devel/delve/files/patch-pkg_proc_native_proc__freebsd.c
@@ -0,0 +1,52 @@
+--- pkg/proc/native/proc_freebsd.c.orig	2021-05-19 07:24:05 UTC
++++ pkg/proc/native/proc_freebsd.c
+@@ -3,11 +3,13 @@
+ #include <sys/queue.h>
+ #include <sys/sysctl.h>
+ #include <sys/user.h>
++#include <sys/types.h>
+ 
+ #include <libprocstat.h>
+ #include <libutil.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <errno.h>
+ 
+ #include "proc_freebsd.h"
+ 
+@@ -66,21 +68,23 @@ int find_status(int pid){
+ 	return (status);
+ }
+ 
+-int get_entry_point(int pid) {
++uintptr_t get_entry_point(int pid) {
+     void *ep = NULL;
+ 
++    errno = EINVAL;
++
+     struct procstat *ps = procstat_open_sysctl();
+     if (ps == NULL)
+-        return -1;
++        return 0;
+ 
+     uint cnt = 0;
+     struct kinfo_proc *kipp = procstat_getprocs(ps, KERN_PROC_PID, pid, &cnt);
+     if (cnt == 0)
+-        return -1;
++        return 0;
+ 
+     Elf_Auxinfo *auxv = procstat_getauxv(ps, kipp, &cnt);
+     if (auxv == NULL)
+-        return -1;
++        return 0;
+ 
+     for (int i = 0; i < cnt; i++) {
+         if (auxv[i].a_type == AT_ENTRY) {
+@@ -89,5 +93,6 @@ int get_entry_point(int pid) {
+         }
+     }
+     procstat_freeauxv(ps, auxv);
+-    return (int)ep;
++    errno = 0;
++    return (uintptr_t)ep;
+ }
diff --git a/devel/delve/files/patch-pkg_proc_native_proc__freebsd.h b/devel/delve/files/patch-pkg_proc_native_proc__freebsd.h
new file mode 100644
index 000000000000..c5ef91004fed
--- /dev/null
+++ b/devel/delve/files/patch-pkg_proc_native_proc__freebsd.h
@@ -0,0 +1,10 @@
+--- pkg/proc/native/proc_freebsd.h.orig	2021-05-19 07:24:05 UTC
++++ pkg/proc/native/proc_freebsd.h
+@@ -1,4 +1,6 @@
++#include <sys/types.h>
++
+ char * find_command_name(int pid);
+ char * find_executable(int pid);
+ int find_status(int pid);
+-int get_entry_point(int pid);
++uintptr_t get_entry_point(int pid);