3 files changed, 32 insertions, 74 deletions

diff --git a/dns/subfinder/Makefile b/dns/subfinder/Makefile
index 896cd2956dd7..baf9447d8b04 100644
--- a/dns/subfinder/Makefile
+++ b/dns/subfinder/Makefile
@@ -2,44 +2,38 @@
 
 PORTNAME=	subfinder
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.4
+DISTVERSION=	2.4.5-20
+DISTVERSIONSUFFIX=	-g2c6fe5f
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Subdomain discovery tool that discovers valid subdomains for websites
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE.md
+LICENSE_FILE=	${WRKSRC}/../LICENSE.md
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	projectdiscovery
 GH_TUPLE=	\
-		alexbrainman:sspi:e580b900e9f5:alexbrainman_sspi/vendor/github.com/alexbrainman/sspi \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		go-yaml:yaml:a5ece683394c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
+		go-yaml:yaml:eeeca48fe776:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:f7b00557c8c4:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \
-		golang:sys:2837fb4f24fe:golang_sys/vendor/golang.org/x/sys \
+		golang:crypto:87dc89f01550:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:aa69164e4478:golang_net/vendor/golang.org/x/net \
+		golang:sys:ef89a241ccb3:golang_sys/vendor/golang.org/x/sys \
 		hako:durafmt:c0fb7b4da026:hako_durafmt/vendor/github.com/hako/durafmt \
-		hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \
-		jcmturner:aescts:v2.0.0:jcmturner_aescts_v2/vendor/github.com/jcmturner/aescts \
-		jcmturner:dnsutils:v2.0.0:jcmturner_dnsutils_v2/vendor/github.com/jcmturner/dnsutils \
-		jcmturner:gofork:v1.0.0:jcmturner_gofork/vendor/github.com/jcmturner/gofork \
-		jcmturner:goidentity:v6.0.1:jcmturner_goidentity_v6/vendor/github.com/jcmturner/goidentity \
-		jcmturner:gokrb5:v8.2.0:jcmturner_gokrb5_v8/vendor/github.com/jcmturner/gokrb5 \
-		jcmturner:rpc:v2.0.2:jcmturner_rpc_v2/vendor/github.com/jcmturner/rpc \
 		json-iterator:go:v1.1.10:json_iterator_go/vendor/github.com/json-iterator/go \
-		lib:pq:v1.6.0:lib_pq/vendor/github.com/lib/pq \
+		lib:pq:v1.9.0:lib_pq/vendor/github.com/lib/pq \
 		logrusorgru:aurora:e9ef32dff381:logrusorgru_aurora/vendor/github.com/logrusorgru/aurora \
-		miekg:dns:v1.1.29:miekg_dns/vendor/github.com/miekg/dns \
+		miekg:dns:v1.1.35:miekg_dns/vendor/github.com/miekg/dns \
 		modern-go:concurrent:e0a39a4cb421:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:4b7aa43c6742:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		projectdiscovery:chaos-client:v0.1.6:projectdiscovery_chaos_client/vendor/github.com/projectdiscovery/chaos-client \
-		projectdiscovery:gologger:v1.0.0:projectdiscovery_gologger/vendor/github.com/projectdiscovery/gologger \
+		projectdiscovery:fdmax:v0.0.3:projectdiscovery_fdmax/vendor/github.com/projectdiscovery/fdmax \
+		projectdiscovery:gologger:v1.0.1:projectdiscovery_gologger/vendor/github.com/projectdiscovery/gologger \
 		rs:xid:v1.2.1:rs_xid/vendor/github.com/rs/xid \
 		stretchr:testify:v1.5.1:stretchr_testify/vendor/github.com/stretchr/testify \
 		tomnomnom:linkheader:02ca5825eb80:tomnomnom_linkheader/vendor/github.com/tomnomnom/linkheader
@@ -47,6 +41,8 @@ GH_TUPLE=	\
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_TARGET=	./cmd/${PORTNAME}
 
+WRKSRC_SUBDIR=	v2
+
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/dns/subfinder/distinfo b/dns/subfinder/distinfo
index 81ab28a19faa..c48b43eb9e9d 100644
--- a/dns/subfinder/distinfo
+++ b/dns/subfinder/distinfo
@@ -1,44 +1,28 @@
-TIMESTAMP = 1599757917
-SHA256 (projectdiscovery-subfinder-v2.4.4_GH0.tar.gz) = 26f11c278e72c63932b3f3cfedb7f9240032ef39185e8bc6fe262946fd986040
-SIZE (projectdiscovery-subfinder-v2.4.4_GH0.tar.gz) = 1068251
-SHA256 (alexbrainman-sspi-e580b900e9f5_GH0.tar.gz) = 9cbbbb19669ec85f0a569d5272fce01dad7fc579b367dc5f7430f64b7310ac4b
-SIZE (alexbrainman-sspi-e580b900e9f5_GH0.tar.gz) = 19600
+TIMESTAMP = 1606973090
+SHA256 (projectdiscovery-subfinder-v2.4.5-20-g2c6fe5f_GH0.tar.gz) = 4eb360ad2bfa2ed185a7a184525de20a6ca64030ccdae581ac24cb535a3c3698
+SIZE (projectdiscovery-subfinder-v2.4.5-20-g2c6fe5f_GH0.tar.gz) = 1068228
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (go-yaml-yaml-a5ece683394c_GH0.tar.gz) = e4b738b2e3cd15fd5f76704d35d3b62d77d808894ff83bfe68f5f28b03ded019
-SIZE (go-yaml-yaml-a5ece683394c_GH0.tar.gz) = 88436
+SHA256 (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5
+SIZE (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787
 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-f7b00557c8c4_GH0.tar.gz) = 029c7e2c21a3b1a5df481e441b58f89d7c6ade793d6155ca01e23094047e3598
-SIZE (golang-crypto-f7b00557c8c4_GH0.tar.gz) = 1727281
-SHA256 (golang-net-6afb5195e5aa_GH0.tar.gz) = e326d6b33545abf9db8bb622852d66e34f0957833e4c8839f8a01309b5aa263d
-SIZE (golang-net-6afb5195e5aa_GH0.tar.gz) = 1172285
-SHA256 (golang-sys-2837fb4f24fe_GH0.tar.gz) = 566bde23ef4d83960aee8de6245b729e1ced35365e867fd259e2a1f571944379
-SIZE (golang-sys-2837fb4f24fe_GH0.tar.gz) = 1481590
+SHA256 (golang-crypto-87dc89f01550_GH0.tar.gz) = d81e26d345c6cd9f132fd69547b14200603d6f3b50622ebceace32dfe456339b
+SIZE (golang-crypto-87dc89f01550_GH0.tar.gz) = 1709204
+SHA256 (golang-net-aa69164e4478_GH0.tar.gz) = b538bbdda3b9f7c93b6bbac94874d8fa85d25e43577f3b356fd825f39410be0f
+SIZE (golang-net-aa69164e4478_GH0.tar.gz) = 1100688
+SHA256 (golang-sys-ef89a241ccb3_GH0.tar.gz) = efd84e82d75b3c09b7509841e1616a57adaa6b4612f2bbde775833c907d971c6
+SIZE (golang-sys-ef89a241ccb3_GH0.tar.gz) = 1088277
 SHA256 (hako-durafmt-c0fb7b4da026_GH0.tar.gz) = c283b88fb504d71625156511bb8371e303b66e323960e6ec9fc271dba3e7ffda
 SIZE (hako-durafmt-c0fb7b4da026_GH0.tar.gz) = 7206
-SHA256 (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 2dee0f810c3e3a2cd3d49a075d0a64a88806c90712a4b66013b20a1ff0562eae
-SIZE (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 7058
-SHA256 (jcmturner-aescts-v2.0.0_GH0.tar.gz) = fe4be1d56d46dd42e382fb9c80a4749f80e1ae8910f9a03ef214abaaa10d8623
-SIZE (jcmturner-aescts-v2.0.0_GH0.tar.gz) = 8988
-SHA256 (jcmturner-dnsutils-v2.0.0_GH0.tar.gz) = cf159f3bad90db84dc8c8814d10f10560c7ec83c4ec160dfad9502d4a17c9958
-SIZE (jcmturner-dnsutils-v2.0.0_GH0.tar.gz) = 7961
-SHA256 (jcmturner-gofork-v1.0.0_GH0.tar.gz) = d85188110837abd563dca4d9013665f82348a541beb47ee08207e70a161c9755
-SIZE (jcmturner-gofork-v1.0.0_GH0.tar.gz) = 27036
-SHA256 (jcmturner-goidentity-v6.0.1_GH0.tar.gz) = 493e40431872340d8b7fdebb6ebb76442d0d52f362f4414bf28b69305c36fd81
-SIZE (jcmturner-goidentity-v6.0.1_GH0.tar.gz) = 7068
-SHA256 (jcmturner-gokrb5-v8.2.0_GH0.tar.gz) = f400133b0fc61d471d9ac6ed3a8fb341b3ee51750adb511dc9ca516814277500
-SIZE (jcmturner-gokrb5-v8.2.0_GH0.tar.gz) = 115306437
-SHA256 (jcmturner-rpc-v2.0.2_GH0.tar.gz) = f6417b10e3fc0c01500d5c9416a2906865b5ea3f9f9167b70b6bbfcfe14ce822
-SIZE (jcmturner-rpc-v2.0.2_GH0.tar.gz) = 55030
 SHA256 (json-iterator-go-v1.1.10_GH0.tar.gz) = 15e761079f413a9edcf86ea628998e328c12aaed92af462363191fa76e9809a6
 SIZE (json-iterator-go-v1.1.10_GH0.tar.gz) = 83384
-SHA256 (lib-pq-v1.6.0_GH0.tar.gz) = d422e1602e40713e060e43fd60b2f77e2a57be47c3329769175cd1a1b5521662
-SIZE (lib-pq-v1.6.0_GH0.tar.gz) = 99131
+SHA256 (lib-pq-v1.9.0_GH0.tar.gz) = 9c60e717d83c717de9eae5b71497e546a4c3a384179b2f776fd86e01b8545637
+SIZE (lib-pq-v1.9.0_GH0.tar.gz) = 103393
 SHA256 (logrusorgru-aurora-e9ef32dff381_GH0.tar.gz) = d44d7e14a643fa4711658a520c6946ae33761e3c580f9d3c842b0b487d0472a6
 SIZE (logrusorgru-aurora-e9ef32dff381_GH0.tar.gz) = 133625
-SHA256 (miekg-dns-v1.1.29_GH0.tar.gz) = b2a683acf16f7c4559b04db03e186799362255ae0db8c4eceb6b72b0af04274f
-SIZE (miekg-dns-v1.1.29_GH0.tar.gz) = 184242
+SHA256 (miekg-dns-v1.1.35_GH0.tar.gz) = f3094e13e492d5fc92e55da170389683ef658afc92d37c1761eeabd2f25fa1b7
+SIZE (miekg-dns-v1.1.35_GH0.tar.gz) = 197766
 SHA256 (modern-go-concurrent-e0a39a4cb421_GH0.tar.gz) = 19137c93c8d4bf8c3920716cca3b0f0112707604706cfa86fc61794594151b44
 SIZE (modern-go-concurrent-e0a39a4cb421_GH0.tar.gz) = 5482
 SHA256 (modern-go-reflect2-4b7aa43c6742_GH0.tar.gz) = 7b73f745b51d16ce83a598d03cbd9e8c03e52d66f46927cdc6a500453d171c1e
@@ -49,8 +33,10 @@ SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f77474
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (projectdiscovery-chaos-client-v0.1.6_GH0.tar.gz) = 6d8a848c015a39dd7258eab429d263d3c3ab0dff7a705418f3c18e9a90ea689b
 SIZE (projectdiscovery-chaos-client-v0.1.6_GH0.tar.gz) = 9333
-SHA256 (projectdiscovery-gologger-v1.0.0_GH0.tar.gz) = 044b0f58882e72c04cc40d412064ea8599082c8759a373d28bbfeb1a266b5128
-SIZE (projectdiscovery-gologger-v1.0.0_GH0.tar.gz) = 2881
+SHA256 (projectdiscovery-fdmax-v0.0.3_GH0.tar.gz) = 78e7a7ce9748f8370dd73db277c77ba3627686e373a00bad9dd3f210acf7650e
+SIZE (projectdiscovery-fdmax-v0.0.3_GH0.tar.gz) = 1968
+SHA256 (projectdiscovery-gologger-v1.0.1_GH0.tar.gz) = 4a5b2cf9df762cf652325c7f7c48b27a7515581bd3d65bf8b8664a00f482a7d4
+SIZE (projectdiscovery-gologger-v1.0.1_GH0.tar.gz) = 3546
 SHA256 (rs-xid-v1.2.1_GH0.tar.gz) = bb207227d5ae99bda71d38ae11e29b822c9b572223781bc282ad2f8e69002f2c
 SIZE (rs-xid-v1.2.1_GH0.tar.gz) = 9553
 SHA256 (stretchr-testify-v1.5.1_GH0.tar.gz) = 6d65f92aeff186bb261dbdb885d9f3ba09db3d79eb5f212fcace1fd4a2858263
diff --git a/dns/subfinder/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go b/dns/subfinder/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
deleted file mode 100644
index 0e0603b77cee..000000000000
--- a/dns/subfinder/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
+++ /dev/null
@@ -1,24 +0,0 @@
-From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001
-From: Tobias Klauser <tklauser@distanz.ch>
-Date: Fri, 25 Oct 2019 21:13:51 +0200
-Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64
-
-CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a
-type uint128. This type doesn't exist in Go.
-
-Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b
-Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419
-Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
-TryBot-Result: Gobot Gobot <gobot@golang.org>
-Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig	2019-08-18 13:42:05 UTC
-+++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
-@@ -397,7 +397,7 @@ type Reg struct {
- }
- 
- type FpReg struct {
--	Fp_q  [32]uint128
-+	Fp_q  [512]uint8
- 	Fp_sr uint32
- 	Fp_cr uint32
- }