security/honeytrap: fix build on riscv64

Bump golang.org/x/{crypto,net,sys} dependencies to versions
new enough to support riscv64-freebsd.  Remove thus obsoleted
patches.  Add missing riscv64-specific bits to dependency
github.com/boltdb/bolt.  Fix wrong -extldflags entries.

Sponsored by:	Berliner Linux User Group e.V.
Obtained from:	go.etcd.io/bbolt
Approved by:	portmgr (build fix blanket)

6 files changed, 31 insertions, 296 deletions

diff --git a/security/honeytrap/Makefile b/security/honeytrap/Makefile
index b00041b853bf..c7ba28d67fdc 100644
--- a/security/honeytrap/Makefile
+++ b/security/honeytrap/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	honeytrap
 DISTVERSION=	g20210510
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	security
 
 MAINTAINER=	ezri.mudde@dutchsec.com
@@ -16,7 +16,7 @@ GO_BUILDFLAGS=	-ldflags \
 		-X github.com/honeytrap/honeytrap/cmd.ReleaseTag=DEVELOPMENT.2021-05-10T00-00-00Z \
 		-X github.com/honeytrap/honeytrap/cmd.CommitID=110030494f54421d01edfb57343aee3a102dc37d \
 		-X github.com/honeytrap/honeytrap/cmd.ShortCommitID=110030494f54 \
-		-extldflags "static"'
+		-extldflags "-static"'
 USE_GITHUB=	yes
 GH_TAGNAME=	1100304
 GH_TUPLE=	\
@@ -39,11 +39,12 @@ GH_TUPLE=	\
 		fuyufjh:splunk-hec-go:v0.3.3:fuyufjh_splunk_hec_go/vendor/github.com/fuyufjh/splunk-hec-go \
 		glycerine:rbuf:54320fe9f6f3:glycerine_rbuf/vendor/github.com/glycerine/rbuf \
 		go-asn1-ber:asn1-ber:379148ca0225:go_asn1_ber_asn1_ber/vendor/github.com/go-asn1-ber/asn1-ber \
-		golang:crypto:69ecbb4d6d5d:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:eb5bcb51f2a3:golang_net/vendor/golang.org/x/net \
+		golang:crypto:089bfa567519:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:v0.8.0:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:553a64147049:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sys:d101bd2416d5:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:v0.6.0:golang_sys/vendor/golang.org/x/sys \
+		golang:term:v0.6.0:golang_term/vendor/golang.org/x/term \
 		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
 		google:gopacket:v1.1.14:google_gopacket/vendor/github.com/google/gopacket \
 		gorilla:websocket:v1.2.0:gorilla_websocket/vendor/github.com/gorilla/websocket \
diff --git a/security/honeytrap/distinfo b/security/honeytrap/distinfo
index 62653cdd8443..8073b36b4d9d 100644
--- a/security/honeytrap/distinfo
+++ b/security/honeytrap/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1632492215
+TIMESTAMP = 1680116467
 SHA256 (honeytrap-honeytrap-g20210510-1100304_GH0.tar.gz) = 03279a7dd22181f31a6cf03ad3045c8d50ae73a7853ee7482a6785a3779c389f
 SIZE (honeytrap-honeytrap-g20210510-1100304_GH0.tar.gz) = 372365
 SHA256 (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = c87bf25d12aa9ef597c6a465dd2959d6d7e06d8341030d6d75c8a81ccc388ccd
@@ -39,16 +39,18 @@ SHA256 (glycerine-rbuf-54320fe9f6f3_GH0.tar.gz) = 8550d62758095e6a24f9f64c0a98a5
 SIZE (glycerine-rbuf-54320fe9f6f3_GH0.tar.gz) = 12134
 SHA256 (go-asn1-ber-asn1-ber-379148ca0225_GH0.tar.gz) = ab6b124786f841d93c6fb853d752a224c4ea8dabe150902e1a4edf39cc653b29
 SIZE (go-asn1-ber-asn1-ber-379148ca0225_GH0.tar.gz) = 12423
-SHA256 (golang-crypto-69ecbb4d6d5d_GH0.tar.gz) = 006815c146fa85ab4b28f862748df3d7866f51688d5803d015c8a397019de0f9
-SIZE (golang-crypto-69ecbb4d6d5d_GH0.tar.gz) = 1719992
-SHA256 (golang-net-eb5bcb51f2a3_GH0.tar.gz) = 191dd6c41872d0afa48ad594314ec60455fab7c98a2aca88ed0df28c32062348
-SIZE (golang-net-eb5bcb51f2a3_GH0.tar.gz) = 976944
+SHA256 (golang-crypto-089bfa567519_GH0.tar.gz) = 2ed1af12d13ad0cfe08ac49d51dfad4b8d7f5e4693fbddfa3ef53bd80c9555ab
+SIZE (golang-crypto-089bfa567519_GH0.tar.gz) = 1734789
+SHA256 (golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831
+SIZE (golang-net-v0.8.0_GH0.tar.gz) = 1244302
 SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
 SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
 SHA256 (golang-snappy-553a64147049_GH0.tar.gz) = 7e322fd3c30642ad1297c9163f86b4775e522e9320cdda09d49bc2fe56428213
 SIZE (golang-snappy-553a64147049_GH0.tar.gz) = 62046
-SHA256 (golang-sys-d101bd2416d5_GH0.tar.gz) = c1de80d233d3df630ed34bf80cbb3f186199e7b5218726abe0234520c8eddb8b
-SIZE (golang-sys-d101bd2416d5_GH0.tar.gz) = 1537146
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
+SHA256 (golang-term-v0.6.0_GH0.tar.gz) = 4fdff852a658e927e7886629ef7cd88874a11ddf0c8b3633a50961afc8902093
+SIZE (golang-term-v0.6.0_GH0.tar.gz) = 14795
 SHA256 (golang-time-555d28b269f0_GH0.tar.gz) = 8ce368da65025dad4e4ed302a5835e2b3579f3a111721f9b275803519a5d10b3
 SIZE (golang-time-555d28b269f0_GH0.tar.gz) = 9577
 SHA256 (google-gopacket-v1.1.14_GH0.tar.gz) = cb67f185cd2547652b9161829e82ebdeafc8984e827825647fd8d3f4e9f93250
diff --git a/security/honeytrap/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go b/security/honeytrap/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go
new file mode 100644
index 000000000000..8b11be4f4104
--- /dev/null
+++ b/security/honeytrap/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go
@@ -0,0 +1,16 @@
+--- /dev/null	2023-03-29 16:51:35 UTC
++++ vendor/github.com/boltdb/bolt/bolt_riscv64.go
+@@ -0,0 +1,13 @@
++//go:build riscv64
++// +build riscv64
++
++package bolt
++
++// maxMapSize represents the largest mmap size supported by Bolt.
++const maxMapSize = 0xFFFFFFFFFFFF // 256TB
++
++// maxAllocSize is the size used when creating array pointers.
++const maxAllocSize = 0x7FFFFFFF
++
++// are unaligned reads/writes not supported?
++var brokenUnaligned = false
diff --git a/security/honeytrap/files/patch-vendor_golang.org_x_net_internal_socket_zsys__freebsd__arm64.go b/security/honeytrap/files/patch-vendor_golang.org_x_net_internal_socket_zsys__freebsd__arm64.go
deleted file mode 100644
index 1abc00eb598c..000000000000
--- a/security/honeytrap/files/patch-vendor_golang.org_x_net_internal_socket_zsys__freebsd__arm64.go
+++ /dev/null
@@ -1,63 +0,0 @@
---- vendor/golang.org/x/net/internal/socket/zsys_freebsd_arm64.go.orig	2020-06-09 20:01:03 UTC
-+++ vendor/golang.org/x/net/internal/socket/zsys_freebsd_arm64.go
-@@ -0,0 +1,60 @@
-+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-+// cgo -godefs defs_freebsd.go
-+
-+package socket
-+
-+const (
-+	sysAF_UNSPEC = 0x0
-+	sysAF_INET   = 0x2
-+	sysAF_INET6  = 0x1c
-+	sysSOCK_RAW = 0x3
-+)
-+
-+type iovec struct {
-+	Base *byte
-+	Len  uint64
-+}
-+
-+type msghdr struct {
-+	Name       *byte
-+	Namelen    uint32
-+	Pad_cgo_0  [4]byte
-+	Iov        *iovec
-+	Iovlen     int32
-+	Pad_cgo_1  [4]byte
-+	Control    *byte
-+	Controllen uint32
-+	Flags      int32
-+}
-+
-+type cmsghdr struct {
-+	Len   uint32
-+	Level int32
-+	Type  int32
-+}
-+
-+type sockaddrInet struct {
-+	Len    uint8
-+	Family uint8
-+	Port   uint16
-+	Addr   [4]byte /* in_addr */
-+	Zero   [8]int8
-+}
-+
-+type sockaddrInet6 struct {
-+	Len      uint8
-+	Family   uint8
-+	Port     uint16
-+	Flowinfo uint32
-+	Addr     [16]byte /* in6_addr */
-+	Scope_id uint32
-+}
-+
-+const (
-+	sizeofIovec   = 0x10
-+	sizeofMsghdr  = 0x30
-+	sizeofCmsghdr = 0xc
-+
-+	sizeofSockaddrInet  = 0x10
-+	sizeofSockaddrInet6 = 0x1c
-+)
diff --git a/security/honeytrap/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go b/security/honeytrap/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go
deleted file mode 100644
index fb9681d998cb..000000000000
--- a/security/honeytrap/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go
+++ /dev/null
@@ -1,96 +0,0 @@
---- vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go.orig	2020-03-30 16:34:45 UTC
-+++ vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go
-@@ -0,0 +1,93 @@
-+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-+// cgo -godefs defs_freebsd.go
-+
-+package ipv4
-+
-+const (
-+	sysIP_OPTIONS     = 0x1
-+	sysIP_HDRINCL     = 0x2
-+	sysIP_TOS         = 0x3
-+	sysIP_TTL         = 0x4
-+	sysIP_RECVOPTS    = 0x5
-+	sysIP_RECVRETOPTS = 0x6
-+	sysIP_RECVDSTADDR = 0x7
-+	sysIP_SENDSRCADDR = 0x7
-+	sysIP_RETOPTS     = 0x8
-+	sysIP_RECVIF      = 0x14
-+	sysIP_ONESBCAST   = 0x17
-+	sysIP_BINDANY     = 0x18
-+	sysIP_RECVTTL     = 0x41
-+	sysIP_MINTTL      = 0x42
-+	sysIP_DONTFRAG    = 0x43
-+	sysIP_RECVTOS     = 0x44
-+
-+	sysIP_MULTICAST_IF           = 0x9
-+	sysIP_MULTICAST_TTL          = 0xa
-+	sysIP_MULTICAST_LOOP         = 0xb
-+	sysIP_ADD_MEMBERSHIP         = 0xc
-+	sysIP_DROP_MEMBERSHIP        = 0xd
-+	sysIP_MULTICAST_VIF          = 0xe
-+	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x46
-+	sysIP_DROP_SOURCE_MEMBERSHIP = 0x47
-+	sysIP_BLOCK_SOURCE           = 0x48
-+	sysIP_UNBLOCK_SOURCE         = 0x49
-+	sysMCAST_JOIN_GROUP          = 0x50
-+	sysMCAST_LEAVE_GROUP         = 0x51
-+	sysMCAST_JOIN_SOURCE_GROUP   = 0x52
-+	sysMCAST_LEAVE_SOURCE_GROUP  = 0x53
-+	sysMCAST_BLOCK_SOURCE        = 0x54
-+	sysMCAST_UNBLOCK_SOURCE      = 0x55
-+
-+	sizeofSockaddrStorage = 0x80
-+	sizeofSockaddrInet    = 0x10
-+
-+	sizeofIPMreq         = 0x8
-+	sizeofIPMreqn        = 0xc
-+	sizeofIPMreqSource   = 0xc
-+	sizeofGroupReq       = 0x88
-+	sizeofGroupSourceReq = 0x108
-+)
-+
-+type sockaddrStorage struct {
-+	Len         uint8
-+	Family      uint8
-+	X__ss_pad1  [6]uint8
-+	X__ss_align int64
-+	X__ss_pad2  [112]uint8
-+}
-+
-+type sockaddrInet struct {
-+	Len    uint8
-+	Family uint8
-+	Port   uint16
-+	Addr   [4]byte /* in_addr */
-+	Zero   [8]uint8
-+}
-+
-+type ipMreq struct {
-+	Multiaddr [4]byte /* in_addr */
-+	Interface [4]byte /* in_addr */
-+}
-+
-+type ipMreqn struct {
-+	Multiaddr [4]byte /* in_addr */
-+	Address   [4]byte /* in_addr */
-+	Ifindex   int32
-+}
-+
-+type ipMreqSource struct {
-+	Multiaddr  [4]byte /* in_addr */
-+	Sourceaddr [4]byte /* in_addr */
-+	Interface  [4]byte /* in_addr */
-+}
-+
-+type groupReq struct {
-+	Interface uint32
-+	Group     sockaddrStorage
-+}
-+
-+type groupSourceReq struct {
-+	Interface uint32
-+	Group     sockaddrStorage
-+	Source    sockaddrStorage
-+}
diff --git a/security/honeytrap/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go b/security/honeytrap/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go
deleted file mode 100644
index c7ed963fe175..000000000000
--- a/security/honeytrap/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go
+++ /dev/null
@@ -1,125 +0,0 @@
---- vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go.orig	2020-03-30 16:34:37 UTC
-+++ vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go
-@@ -0,0 +1,122 @@
-+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-+// cgo -godefs defs_freebsd.go
-+
-+package ipv6
-+
-+const (
-+	sysIPV6_UNICAST_HOPS   = 0x4
-+	sysIPV6_MULTICAST_IF   = 0x9
-+	sysIPV6_MULTICAST_HOPS = 0xa
-+	sysIPV6_MULTICAST_LOOP = 0xb
-+	sysIPV6_JOIN_GROUP     = 0xc
-+	sysIPV6_LEAVE_GROUP    = 0xd
-+	sysIPV6_PORTRANGE      = 0xe
-+	sysICMP6_FILTER        = 0x12
-+
-+	sysIPV6_CHECKSUM = 0x1a
-+	sysIPV6_V6ONLY   = 0x1b
-+
-+	sysIPV6_IPSEC_POLICY = 0x1c
-+
-+	sysIPV6_RTHDRDSTOPTS = 0x23
-+
-+	sysIPV6_RECVPKTINFO  = 0x24
-+	sysIPV6_RECVHOPLIMIT = 0x25
-+	sysIPV6_RECVRTHDR    = 0x26
-+	sysIPV6_RECVHOPOPTS  = 0x27
-+	sysIPV6_RECVDSTOPTS  = 0x28
-+
-+	sysIPV6_USE_MIN_MTU = 0x2a
-+	sysIPV6_RECVPATHMTU = 0x2b
-+
-+	sysIPV6_PATHMTU = 0x2c
-+
-+	sysIPV6_PKTINFO  = 0x2e
-+	sysIPV6_HOPLIMIT = 0x2f
-+	sysIPV6_NEXTHOP  = 0x30
-+	sysIPV6_HOPOPTS  = 0x31
-+	sysIPV6_DSTOPTS  = 0x32
-+	sysIPV6_RTHDR    = 0x33
-+
-+	sysIPV6_RECVTCLASS = 0x39
-+
-+	sysIPV6_AUTOFLOWLABEL = 0x3b
-+
-+	sysIPV6_TCLASS   = 0x3d
-+	sysIPV6_DONTFRAG = 0x3e
-+
-+	sysIPV6_PREFER_TEMPADDR = 0x3f
-+
-+	sysIPV6_BINDANY = 0x40
-+
-+	sysIPV6_MSFILTER = 0x4a
-+
-+	sysMCAST_JOIN_GROUP         = 0x50
-+	sysMCAST_LEAVE_GROUP        = 0x51
-+	sysMCAST_JOIN_SOURCE_GROUP  = 0x52
-+	sysMCAST_LEAVE_SOURCE_GROUP = 0x53
-+	sysMCAST_BLOCK_SOURCE       = 0x54
-+	sysMCAST_UNBLOCK_SOURCE     = 0x55
-+
-+	sysIPV6_PORTRANGE_DEFAULT = 0x0
-+	sysIPV6_PORTRANGE_HIGH    = 0x1
-+	sysIPV6_PORTRANGE_LOW     = 0x2
-+
-+	sizeofSockaddrStorage = 0x80
-+	sizeofSockaddrInet6   = 0x1c
-+	sizeofInet6Pktinfo    = 0x14
-+	sizeofIPv6Mtuinfo     = 0x20
-+
-+	sizeofIPv6Mreq       = 0x14
-+	sizeofGroupReq       = 0x88
-+	sizeofGroupSourceReq = 0x108
-+
-+	sizeofICMPv6Filter = 0x20
-+)
-+
-+type sockaddrStorage struct {
-+	Len         uint8
-+	Family      uint8
-+	X__ss_pad1  [6]uint8
-+	X__ss_align int64
-+	X__ss_pad2  [112]uint8
-+}
-+
-+type sockaddrInet6 struct {
-+	Len      uint8
-+	Family   uint8
-+	Port     uint16
-+	Flowinfo uint32
-+	Addr     [16]byte /* in6_addr */
-+	Scope_id uint32
-+}
-+
-+type inet6Pktinfo struct {
-+	Addr    [16]byte /* in6_addr */
-+	Ifindex uint32
-+}
-+
-+type ipv6Mtuinfo struct {
-+	Addr sockaddrInet6
-+	Mtu  uint32
-+}
-+
-+type ipv6Mreq struct {
-+	Multiaddr [16]byte /* in6_addr */
-+	Interface uint32
-+}
-+
-+type groupReq struct {
-+	Interface uint32
-+	Group     sockaddrStorage
-+}
-+
-+type groupSourceReq struct {
-+	Interface uint32
-+	Group     sockaddrStorage
-+	Source    sockaddrStorage
-+}
-+
-+type icmpv6Filter struct {
-+	Filt [8]uint32
-+}