- Update to 0.13.2

Submitted by:	Christopher Hall <hsw@bitmark.com> (maintainer)
Differential Revision:	https://reviews.freebsd.org/D24556

6 files changed, 62 insertions, 50 deletions

diff --git a/net-p2p/bitmark/Makefile b/net-p2p/bitmark/Makefile
index d8a02aeb197d..4175321f8821 100644
--- a/net-p2p/bitmark/Makefile
+++ b/net-p2p/bitmark/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bitmark
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.12.4
+DISTVERSION=	0.13.2
 CATEGORIES=	net-p2p
 
 MAINTAINER=	hsw@bitmark.com
@@ -40,33 +40,33 @@ GH_PROJECT=	bitmarkd
 GH_TUPLE=	bitmark-inc:certgen:v0.1.1:bitmark_inc_certgen/vendor/github.com/bitmark-inc/certgen \
 		bitmark-inc:exitwithstatus:v0.1.2:bitmark_inc_exitwithstatus/vendor/github.com/bitmark-inc/exitwithstatus \
 		bitmark-inc:getoptions:v0.1.1:bitmark_inc_getoptions/vendor/github.com/bitmark-inc/getoptions \
-		bitmark-inc:go-argon2:v0.1.4:bitmark_inc_go_argon2/vendor/github.com/bitmark-inc/go-argon2 \
-		bitmark-inc:logger:v0.3.4:bitmark_inc_logger/vendor/github.com/bitmark-inc/logger \
-		btcsuite:btcd:c26ffa870fd8:btcsuite_btcd/vendor/github.com/btcsuite/btcd \
+		bitmark-inc:go-argon2:v0.1.5:bitmark_inc_go_argon2/vendor/github.com/bitmark-inc/go-argon2 \
+		bitmark-inc:logger:v0.3.5:bitmark_inc_logger/vendor/github.com/bitmark-inc/logger \
+		bitmark-inc:btcd:16c0ce95d92a:btcsuite_btcd/vendor/github.com/btcsuite/btcd \
 		btcsuite:btclog:84c8d2346e9f:btcsuite_btclog/vendor/github.com/btcsuite/btclog \
 		btcsuite:btcutil:9e5f4b9a998d:btcsuite_btcutil/vendor/github.com/btcsuite/btcutil \
 		btcsuite:go-socks:4720035b7bfd:btcsuite_go_socks/vendor/github.com/btcsuite/go-socks \
 		cihub:seelog:f561c5e57575:cihub_seelog/vendor/github.com/cihub/seelog \
+		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man/v2 \
 		davecgh:go-spew:v1.1.0:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
+		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:9756ffdc2472:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:ba9fcec4b297:golang_net/vendor/golang.org/x/net \
-		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
+		golang:crypto:f7b00557c8c4:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:aa69164e4478:golang_net/vendor/golang.org/x/net \
+		golang:snappy:2e65f85255db:golang_snappy/vendor/github.com/golang/snappy \
 		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:749cb33beabd:golang_sys/vendor/golang.org/x/sys \
-		golang:time:9d24e82272b4:golang_time/vendor/golang.org/x/time \
-		miekg:dns:v1.1.16:miekg_dns/vendor/github.com/miekg/dns \
+		golang:sys:aed5e4c7ecf9:golang_sys/vendor/golang.org/x/sys \
+		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
+		miekg:dns:v1.1.28:miekg_dns/vendor/github.com/miekg/dns \
 		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
-		pebbe:zmq4:v1.0.0:pebbe_zmq4/vendor/github.com/pebbe/zmq4 \
+		pebbe:zmq4:v1.2.0:pebbe_zmq4/vendor/github.com/pebbe/zmq4 \
+		russross:blackfriday:v2.0.1:russross_blackfriday/vendor/github.com/russross/blackfriday/v2 \
+		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
 		syndtr:goleveldb:v1.0.0:syndtr_goleveldb/vendor/github.com/syndtr/goleveldb \
-		urfave:cli:v1.21.0:urfave_cli/vendor/github.com/urfave/cli \
+		urfave:cli:v1.22.3:urfave_cli/vendor/github.com/urfave/cli \
 		yuin:gluamapper:d836955830e7:yuin_gluamapper/vendor/github.com/yuin/gluamapper \
-		yuin:gopher-lua:1cd887cd7036:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
-
-# stripping can break go binaries
-STRIP=
+		yuin:gopher-lua:ab39c6098bdb:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
 
 SLAVE_PORT?=	NO
 
diff --git a/net-p2p/bitmark/distinfo b/net-p2p/bitmark/distinfo
index 258649ae2d0a..07240605945a 100644
--- a/net-p2p/bitmark/distinfo
+++ b/net-p2p/bitmark/distinfo
@@ -1,18 +1,18 @@
-TIMESTAMP = 1578977731
-SHA256 (bitmark-inc-bitmarkd-v0.12.4_GH0.tar.gz) = 36401fcee56c3d19f4cddcd34098a33a94a7fad23e0b4d807cf9f756246ce61f
-SIZE (bitmark-inc-bitmarkd-v0.12.4_GH0.tar.gz) = 446701
+TIMESTAMP = 1590565748
+SHA256 (bitmark-inc-bitmarkd-v0.13.2_GH0.tar.gz) = 040e38ea68082cddf168090b7d20951670b319ef79d2560c39b6eaafd8f7689d
+SIZE (bitmark-inc-bitmarkd-v0.13.2_GH0.tar.gz) = 483747
 SHA256 (bitmark-inc-certgen-v0.1.1_GH0.tar.gz) = 8f298113dc155afb0d8991afcc9611f9f6fa213d89c5d35a7fa7a526b1baaf7c
 SIZE (bitmark-inc-certgen-v0.1.1_GH0.tar.gz) = 2349
 SHA256 (bitmark-inc-exitwithstatus-v0.1.2_GH0.tar.gz) = 1c54ae7d58cfc09b252f2f62b295b11ce66dd0a4d17d28a742b49d39a5129073
 SIZE (bitmark-inc-exitwithstatus-v0.1.2_GH0.tar.gz) = 1813
 SHA256 (bitmark-inc-getoptions-v0.1.1_GH0.tar.gz) = 7d817d764b1b7bcec6d8110f906f805bb938904134f300df53330cc5b506dc47
 SIZE (bitmark-inc-getoptions-v0.1.1_GH0.tar.gz) = 4087
-SHA256 (bitmark-inc-go-argon2-v0.1.4_GH0.tar.gz) = 0eb9e51725dc6997ecbd959296ff9b4487a8d3b661cb0c7335be056871418c67
-SIZE (bitmark-inc-go-argon2-v0.1.4_GH0.tar.gz) = 7430
-SHA256 (bitmark-inc-logger-v0.3.4_GH0.tar.gz) = 7ae8ea52f6a2e395d073477572bddcd8ea8b1e43e782c9c882c1dab7f727096e
-SIZE (bitmark-inc-logger-v0.3.4_GH0.tar.gz) = 6060
-SHA256 (btcsuite-btcd-c26ffa870fd8_GH0.tar.gz) = 4396980fa0dae026b4de0b648270343905bee38a1913f0103c5b4c4a9e9db240
-SIZE (btcsuite-btcd-c26ffa870fd8_GH0.tar.gz) = 2840544
+SHA256 (bitmark-inc-go-argon2-v0.1.5_GH0.tar.gz) = d69504d16237caad9c0b24f5c26c54bae6a9d4fbd7a715744267d0083c8aa71a
+SIZE (bitmark-inc-go-argon2-v0.1.5_GH0.tar.gz) = 7339
+SHA256 (bitmark-inc-logger-v0.3.5_GH0.tar.gz) = 87f9e9cea36363b594d1340f4aa499c5800ed2a22d4747005e032b58f7b37d65
+SIZE (bitmark-inc-logger-v0.3.5_GH0.tar.gz) = 7933
+SHA256 (bitmark-inc-btcd-16c0ce95d92a_GH0.tar.gz) = 688439ef9fe9283cfd45a6a451bc6c1f191baff956ba603d79326524cdf5d09e
+SIZE (bitmark-inc-btcd-16c0ce95d92a_GH0.tar.gz) = 2845568
 SHA256 (btcsuite-btclog-84c8d2346e9f_GH0.tar.gz) = f31154671fc11e8731ef563f37a25dedc69819bc7f1c7d2395a58314e6b89ee1
 SIZE (btcsuite-btclog-84c8d2346e9f_GH0.tar.gz) = 7045
 SHA256 (btcsuite-btcutil-9e5f4b9a998d_GH0.tar.gz) = 32c79162921b370c7402ca22ad1c48c6fd60e7a64d433077267764ea4f53481b
@@ -21,37 +21,43 @@ SHA256 (btcsuite-go-socks-4720035b7bfd_GH0.tar.gz) = 22c5444550941cc67c1117d2fcf
 SIZE (btcsuite-go-socks-4720035b7bfd_GH0.tar.gz) = 3391
 SHA256 (cihub-seelog-f561c5e57575_GH0.tar.gz) = e7fae3b72e1e5c5a3898ae76accd411903996e7ec75d7af3b97bba12dcdf762f
 SIZE (cihub-seelog-f561c5e57575_GH0.tar.gz) = 66529
+SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576
+SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021
 SHA256 (davecgh-go-spew-v1.1.0_GH0.tar.gz) = 1f7e0bd2db0341925b5f2ee5834e99380f4c2b1bd36cf0fa62d7717899d39d62
 SIZE (davecgh-go-spew-v1.1.0_GH0.tar.gz) = 42337
-SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
-SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139
+SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
+SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
 SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
 SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (golang-crypto-9756ffdc2472_GH0.tar.gz) = 6af409930c3a9313b33f9b8da1a2c24da8ffa07c4fcd55356a77a2f09a0d6326
-SIZE (golang-crypto-9756ffdc2472_GH0.tar.gz) = 1693048
-SHA256 (golang-net-ba9fcec4b297_GH0.tar.gz) = eae512644d59db05f5420315897daf1315beee1b07c723703922d6174f28b993
-SIZE (golang-net-ba9fcec4b297_GH0.tar.gz) = 1100029
-SHA256 (golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c47838effb0ec9e322506514a50fee85
-SIZE (golang-snappy-v0.0.1_GH0.tar.gz) = 62605
+SHA256 (golang-crypto-f7b00557c8c4_GH0.tar.gz) = 029c7e2c21a3b1a5df481e441b58f89d7c6ade793d6155ca01e23094047e3598
+SIZE (golang-crypto-f7b00557c8c4_GH0.tar.gz) = 1727281
+SHA256 (golang-net-aa69164e4478_GH0.tar.gz) = b538bbdda3b9f7c93b6bbac94874d8fa85d25e43577f3b356fd825f39410be0f
+SIZE (golang-net-aa69164e4478_GH0.tar.gz) = 1100688
+SHA256 (golang-snappy-2e65f85255db_GH0.tar.gz) = 3f0d9ed5fbea9b10b33c38321afe9a9e8a45dc3f0dbed9c3c1b640e69da05f76
+SIZE (golang-snappy-2e65f85255db_GH0.tar.gz) = 62580
 SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
 SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
-SHA256 (golang-sys-749cb33beabd_GH0.tar.gz) = 28c13d4255f8f0ecb56011e096bf4daa98bebbe691d23f9e9d2fad84315c638e
-SIZE (golang-sys-749cb33beabd_GH0.tar.gz) = 1468372
-SHA256 (golang-time-9d24e82272b4_GH0.tar.gz) = 7452a7b879ee5984709b2165f6212ad9464977f06d440140b8690e61695aa404
-SIZE (golang-time-9d24e82272b4_GH0.tar.gz) = 9313
-SHA256 (miekg-dns-v1.1.16_GH0.tar.gz) = d9b7ea5d9fab6b0557efdeea92a32988af5d92395233e71a5f140331e1c8f958
-SIZE (miekg-dns-v1.1.16_GH0.tar.gz) = 175581
+SHA256 (golang-sys-aed5e4c7ecf9_GH0.tar.gz) = 80849fe6940e50c7c4647678c5280f40d23db1c315b6f9329f5a9827aeb2e7f2
+SIZE (golang-sys-aed5e4c7ecf9_GH0.tar.gz) = 1493914
+SHA256 (golang-time-555d28b269f0_GH0.tar.gz) = 8ce368da65025dad4e4ed302a5835e2b3579f3a111721f9b275803519a5d10b3
+SIZE (golang-time-555d28b269f0_GH0.tar.gz) = 9577
+SHA256 (miekg-dns-v1.1.28_GH0.tar.gz) = c00d149f35f8299270e2fde152a8b5dc02b97a399dfa4eb5b32c042dba7410a2
+SIZE (miekg-dns-v1.1.28_GH0.tar.gz) = 183985
 SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b
 SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980
 SHA256 (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 3ab025f2f580f8818a5357db52596fef1b0ad5945816a022c8b805ba46dc93be
 SIZE (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 13572
-SHA256 (pebbe-zmq4-v1.0.0_GH0.tar.gz) = 269e0fb8b51a2c9a9086f4f7c8699a075362ffecb09f653da0bf6f7a6ee8e785
-SIZE (pebbe-zmq4-v1.0.0_GH0.tar.gz) = 115287
+SHA256 (pebbe-zmq4-v1.2.0_GH0.tar.gz) = d4637dfeb7ab747b17cbd71dfd4a4b1b24c0aa7f93e9f9ad6fcc204497051979
+SIZE (pebbe-zmq4-v1.2.0_GH0.tar.gz) = 117827
+SHA256 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff
+SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613
+SHA256 (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f
+SIZE (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 2143
 SHA256 (syndtr-goleveldb-v1.0.0_GH0.tar.gz) = c80191f7f77b41d6cb3d1c6de1d42a9b8177656ee49c256d2df2b95a893cf8b8
 SIZE (syndtr-goleveldb-v1.0.0_GH0.tar.gz) = 142710
-SHA256 (urfave-cli-v1.21.0_GH0.tar.gz) = 70cfdfbd3eae784238bae4b3e14b84c369aef85faa4e02062013418fd2bf2f92
-SIZE (urfave-cli-v1.21.0_GH0.tar.gz) = 68419
+SHA256 (urfave-cli-v1.22.3_GH0.tar.gz) = df0d62d708a2ccf67cb25126843268ba4034002e22c1b8a44c97594f9fb49fb5
+SIZE (urfave-cli-v1.22.3_GH0.tar.gz) = 77683
 SHA256 (yuin-gluamapper-d836955830e7_GH0.tar.gz) = 966a0062fa11526c7eb3b97a7b47a24be792cc60babaab93a918f15f113fcad4
 SIZE (yuin-gluamapper-d836955830e7_GH0.tar.gz) = 3472
-SHA256 (yuin-gopher-lua-1cd887cd7036_GH0.tar.gz) = f561feeff662cc54008645264743ac006981ebe61d841d1daa93176902f54478
-SIZE (yuin-gopher-lua-1cd887cd7036_GH0.tar.gz) = 159542
+SHA256 (yuin-gopher-lua-ab39c6098bdb_GH0.tar.gz) = 709a4aeb7a033157f678db2a5f785a1bfc541cbeb5cf53a1e92ba8d8fd93fd07
+SIZE (yuin-gopher-lua-ab39c6098bdb_GH0.tar.gz) = 161569
diff --git a/net-p2p/bitmark/files/bitmarkd.in b/net-p2p/bitmark/files/bitmarkd.in
index f360b2fb0040..ec50b186fdb1 100644
--- a/net-p2p/bitmark/files/bitmarkd.in
+++ b/net-p2p/bitmark/files/bitmarkd.in
@@ -80,6 +80,9 @@ command_args="${command_args} -P ${pidfile} -R 60 -- ${_bitmarkd_program} ${_bit
 # list of items for keygen
 generate_list='gen-peer-identity gen-proof-identity gen-rpc-cert'
 
+# setup environment to reduce memory loading
+export GODEBUG='madvdontneed=1'
+export MALLOC_CONF='abort:true,narenas:1'
 
 bitmarkd_checkdirs()
 {
diff --git a/net-p2p/bitmark/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go b/net-p2p/bitmark/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go
index 61a4c40564e8..bd2ca9b3b70a 100644
--- a/net-p2p/bitmark/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go
+++ b/net-p2p/bitmark/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go
@@ -1,5 +1,5 @@
---- vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go.orig	2020-03-30 16:34:45.209286000 +0200
-+++ vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go	2020-03-30 16:33:50.132563000 +0200
+--- vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go.orig	2020-04-21 02:30:15 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
diff --git a/net-p2p/bitmark/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go b/net-p2p/bitmark/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go
index 75420490ed52..67de7014aca8 100644
--- a/net-p2p/bitmark/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go
+++ b/net-p2p/bitmark/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go
@@ -1,5 +1,5 @@
---- vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go.orig	2020-03-30 16:34:37.257053000 +0200
-+++ vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go	2020-03-30 16:34:20.602073000 +0200
+--- vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go.orig	2020-04-21 02:30:15 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
diff --git a/net-p2p/bitmark/files/recorderd.in b/net-p2p/bitmark/files/recorderd.in
index 7a17cfc6f7ff..f2728c9114a1 100644
--- a/net-p2p/bitmark/files/recorderd.in
+++ b/net-p2p/bitmark/files/recorderd.in
@@ -63,6 +63,9 @@ checkyesno recorderd_syslog_enable && command_args="-S -T recorderd"
 command_args="${command_args} -P ${pidfile} -R 60 -- ${_recorderd_program} ${_recorderd_arguments}"
 #procname=${_recorderd_program} # do not override procname as program runs under daemon
 
+# setup environment to reduce memory loading
+export GODEBUG='madvdontneed=1'
+export MALLOC_CONF='abort:true,narenas:1'
 
 recorderd_checkdirs()
 {