security/cfssl: Update 1.6.0 -> 1.6.1

Reported by:	portscout

2 files changed, 7 insertions, 152 deletions

diff --git a/security/cfssl/Makefile b/security/cfssl/Makefile
index c2a6df06f1bc..b01b21076a1c 100644
--- a/security/cfssl/Makefile
+++ b/security/cfssl/Makefile
@@ -1,9 +1,7 @@
 PORTNAME=	cfssl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.0
+DISTVERSION=	1.6.1
 CATEGORIES=	security
-MASTER_SITES=	https://bitbucket.org/${GOOSE_ACCOUNT}/${GOOSE_PROJECT}/get/${GOOSE_COMMIT}.tar.gz?dummy=goose-${GOOSE_COMMIT}.tar.gz/:goose
-DISTFILES=	goose-${GOOSE_COMMIT}.tar.gz:goose
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Cloudflare's PKI and TLS toolkit
@@ -14,59 +12,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		go:modules gmake
-USE_GITHUB=	yes
-GH_ACCOUNT=	cloudflare
-GH_TUPLE=	\
-		GeertJohan:go.incremental:v1.0.0:geertjohan_go_incremental/vendor/github.com/GeertJohan/go.incremental \
-		GeertJohan:go.rice:v1.0.0:geertjohan_go_rice/vendor/github.com/GeertJohan/go.rice \
-		akavel:rsrc:v0.8.0:akavel_rsrc/vendor/github.com/akavel/rsrc \
-		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		certifi:gocertifi:deb3ae2ef261:certifi_gocertifi/vendor/github.com/certifi/gocertifi \
-		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
-		cloudflare:backoff:647f3cdfc87a:cloudflare_backoff/vendor/github.com/cloudflare/backoff \
-		cloudflare:redoctober:746a508df14c:cloudflare_redoctober/vendor/github.com/cloudflare/redoctober \
-		daaku:go.zipexe:v1.0.0:daaku_go_zipexe/vendor/github.com/daaku/go.zipexe \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		getsentry:raven-go:563b81fc02b7:getsentry_raven_go/vendor/github.com/getsentry/raven-go \
-		go-sql-driver:mysql:v1.4.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
-		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:appengine:v1.6.6:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:c8d3bf9c5392:golang_crypto/vendor/golang.org/x/crypto \
-		golang:lint:16217165b5de:golang_lint/vendor/golang.org/x/lint \
-		golang:net:69a78807bb2b:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:f9fddec55a1e:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.4:golang_text/vendor/golang.org/x/text \
-		golang:tools:774c71fcf114:golang_tools/vendor/golang.org/x/tools \
-		google:certificate-transparency-go:v1.0.21:google_certificate_transparency_go/vendor/github.com/google/certificate-transparency-go \
-		jessevdk:go-flags:v1.4.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
-		jmhodges:clock:880ee4c33548:jmhodges_clock/vendor/github.com/jmhodges/clock \
-		jmoiron:sqlx:v1.2.0:jmoiron_sqlx/vendor/github.com/jmoiron/sqlx \
-		kisielk:sqlstruct:648daed35d49:kisielk_sqlstruct/vendor/github.com/kisielk/sqlstruct \
-		kisom:goutils:v1.1.0:kisom_goutils/vendor/github.com/kisom/goutils \
-		kylelemons:go-gypsy:08cad365cd28:kylelemons_go_gypsy/vendor/github.com/kylelemons/go-gypsy \
-		lib:pq:v1.3.0:lib_pq/vendor/github.com/lib/pq \
-		mattn:go-sqlite3:v1.10.0:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		nkovacs:streamquote:49af9bddb229:nkovacs_streamquote/vendor/github.com/nkovacs/streamquote \
-		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 \
-		prometheus:client_golang:v1.9.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.15.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.2.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		protocolbuffers:protobuf-go:v1.23.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
-		valyala:bytebufferpool:v1.0.0:valyala_bytebufferpool/vendor/github.com/valyala/bytebufferpool \
-		valyala:fasttemplate:v1.0.1:valyala_fasttemplate/vendor/github.com/valyala/fasttemplate \
-		weppos:publicsuffix-go:v0.13.0:weppos_publicsuffix_go/vendor/github.com/weppos/publicsuffix-go \
-		ziutek:mymysql:v1.5.4:ziutek_mymysql/vendor/github.com/ziutek/mymysql \
-		zmap:zcrypto:3719af1573cf:zmap_zcrypto/vendor/github.com/zmap/zcrypto \
-		zmap:zlint:v3.0.0:zmap_zlint_v3/vendor/github.com/zmap/zlint
 
-GOOSE_ACCOUNT=	liamstask
-GOOSE_PROJECT=	goose
-GOOSE_COMMIT=	8488cc47d90c
+GO_MODULE=	github.com/cloudflare/cfssl
 
 EXES=		cfssl cfssl-bundle cfssl-certinfo cfssl-newkey cfssl-scan cfssljson mkbundle multirootca
 
diff --git a/security/cfssl/distinfo b/security/cfssl/distinfo
index 1630a16729dc..8b6b5f940a71 100644
--- a/security/cfssl/distinfo
+++ b/security/cfssl/distinfo
@@ -1,97 +1,5 @@
-TIMESTAMP = 1622918448
-SHA256 (goose-8488cc47d90c.tar.gz) = de23d03b1f2c04c18bfd75462af496547d335e5ef7813bc72dbc8285ccfd1b70
-SIZE (goose-8488cc47d90c.tar.gz) = 15324
-SHA256 (cloudflare-cfssl-v1.6.0_GH0.tar.gz) = 9694e84b42bf3fc547fa5ac5b15099da28129b9b274b3aad3534d7145ca1cc04
-SIZE (cloudflare-cfssl-v1.6.0_GH0.tar.gz) = 7428162
-SHA256 (GeertJohan-go.incremental-v1.0.0_GH0.tar.gz) = 523992ab4bf786eb2e23f7d4e2cb02c9db666feb68400ce3629b17036617927e
-SIZE (GeertJohan-go.incremental-v1.0.0_GH0.tar.gz) = 4121
-SHA256 (GeertJohan-go.rice-v1.0.0_GH0.tar.gz) = 540cb64258fc2422664c73454b5dbaac5487a45906c935d25285a2a60085d877
-SIZE (GeertJohan-go.rice-v1.0.0_GH0.tar.gz) = 69271
-SHA256 (akavel-rsrc-v0.8.0_GH0.tar.gz) = b12d41b1eaf7e9342ac722d9f96f4a5b82d31fb5819d39f1f8dbe81439e987c1
-SIZE (akavel-rsrc-v0.8.0_GH0.tar.gz) = 11150
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (certifi-gocertifi-deb3ae2ef261_GH0.tar.gz) = 47b8644bb26050b568493becd55d850683bf031d9e43cef37fb9893709e63723
-SIZE (certifi-gocertifi-deb3ae2ef261_GH0.tar.gz) = 147882
-SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
-SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
-SHA256 (cloudflare-backoff-647f3cdfc87a_GH0.tar.gz) = d2162141b0a093de7b43434b3ce1013d0e88f1149c52b1a26b94a5e95f313c04
-SIZE (cloudflare-backoff-647f3cdfc87a_GH0.tar.gz) = 4752
-SHA256 (cloudflare-redoctober-746a508df14c_GH0.tar.gz) = 91690ae9627704f97535d603d91f095f6ddea40724fb0f5882ab699662a46d21
-SIZE (cloudflare-redoctober-746a508df14c_GH0.tar.gz) = 536348
-SHA256 (daaku-go.zipexe-v1.0.0_GH0.tar.gz) = 83a5391e0b1671cb3f47783e8a7fca8ceb95260d0d693954a6075fbe39f380c7
-SIZE (daaku-go.zipexe-v1.0.0_GH0.tar.gz) = 2109
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (getsentry-raven-go-563b81fc02b7_GH0.tar.gz) = ef95c09ad41cc9cfbdcd5826dc3da22521d4c63cda5d4cf5104dab2ba13860a4
-SIZE (getsentry-raven-go-563b81fc02b7_GH0.tar.gz) = 24429
-SHA256 (go-sql-driver-mysql-v1.4.0_GH0.tar.gz) = 7f3084cfd99d8e269dfe6b61845f097d2d83582ce3044d0c7125a271a2ab5725
-SIZE (go-sql-driver-mysql-v1.4.0_GH0.tar.gz) = 82897
-SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
-SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
-SHA256 (golang-appengine-v1.6.6_GH0.tar.gz) = 0c3d1e1c7ba0b97ea3457ddd169aac0667dbbb8c8d81e011632751f75bfbb624
-SIZE (golang-appengine-v1.6.6_GH0.tar.gz) = 332981
-SHA256 (golang-crypto-c8d3bf9c5392_GH0.tar.gz) = 15fc3b4dec3dfdc32756371072c5095fb1505e301c12820c9c1c16ea4ff2039e
-SIZE (golang-crypto-c8d3bf9c5392_GH0.tar.gz) = 1721622
-SHA256 (golang-lint-16217165b5de_GH0.tar.gz) = e1b870caa2e428d183d6a467be064578582bacc19615e50867c24d53080ba496
-SIZE (golang-lint-16217165b5de_GH0.tar.gz) = 31428
-SHA256 (golang-net-69a78807bb2b_GH0.tar.gz) = 1114d9d74fc1297add7be9ae8e61fae9f8522884ef46b518e1f3546f843a0223
-SIZE (golang-net-69a78807bb2b_GH0.tar.gz) = 1248808
-SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610
-SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969
-SHA256 (golang-sys-f9fddec55a1e_GH0.tar.gz) = 1ab3f80841babed9c5cd8e93f69bfcb7847c406e767b5d86d5da7dc3c0f24931
-SIZE (golang-sys-f9fddec55a1e_GH0.tar.gz) = 1090464
-SHA256 (golang-text-v0.3.4_GH0.tar.gz) = 39eabfef83413361eafd4353ee9d9821707853235f2e55f3d5b1d38ce698fe89
-SIZE (golang-text-v0.3.4_GH0.tar.gz) = 8354508
-SHA256 (golang-tools-774c71fcf114_GH0.tar.gz) = 695377468274486188ff18e022523c6f70d0ec7e572e44a6cec9bb69ca189b1f
-SIZE (golang-tools-774c71fcf114_GH0.tar.gz) = 2316372
-SHA256 (google-certificate-transparency-go-v1.0.21_GH0.tar.gz) = 6f9f8b67f19ee6be7b0261342cbd69db13559f40945441a9dfe2db5bf0eae25b
-SIZE (google-certificate-transparency-go-v1.0.21_GH0.tar.gz) = 4401179
-SHA256 (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 3be7e8fb4b63887e8aeb55878244c04b7dcbe5ac77211c73ee35e38ca681e611
-SIZE (jessevdk-go-flags-v1.4.0_GH0.tar.gz) = 55452
-SHA256 (jmhodges-clock-880ee4c33548_GH0.tar.gz) = e3596522987867b0ae2c2b757c73d46dfb85998af35d0660cf4e168f8d2c092f
-SIZE (jmhodges-clock-880ee4c33548_GH0.tar.gz) = 5763
-SHA256 (jmoiron-sqlx-v1.2.0_GH0.tar.gz) = 90a0cecf61892ad7d2303720d5fced62df07746b30990b249799593b498f0df9
-SIZE (jmoiron-sqlx-v1.2.0_GH0.tar.gz) = 49540
-SHA256 (kisielk-sqlstruct-648daed35d49_GH0.tar.gz) = 8d261c45c5ecd1daf75ab6074c07552d5a369318e92b296868e9e1983ff5edac
-SIZE (kisielk-sqlstruct-648daed35d49_GH0.tar.gz) = 5080
-SHA256 (kisom-goutils-v1.1.0_GH0.tar.gz) = 70673712aee6359cefef3237796ec85e50a8383da3e5e923583dc8aa9593488f
-SIZE (kisom-goutils-v1.1.0_GH0.tar.gz) = 71772
-SHA256 (kylelemons-go-gypsy-08cad365cd28_GH0.tar.gz) = 0a376e909ac264c2c8060f5a2275cc68f4471be84e18ade4271204b03a70b373
-SIZE (kylelemons-go-gypsy-08cad365cd28_GH0.tar.gz) = 13619
-SHA256 (lib-pq-v1.3.0_GH0.tar.gz) = 900b640ed6e740496769291763b2368b578d25d54fe027551392ceaa29bae8ca
-SIZE (lib-pq-v1.3.0_GH0.tar.gz) = 96255
-SHA256 (mattn-go-sqlite3-v1.10.0_GH0.tar.gz) = 26373461df8c717540b48b6014d823216a69545337cde6683308c6a67f63de01
-SIZE (mattn-go-sqlite3-v1.10.0_GH0.tar.gz) = 2231288
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
-SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (nkovacs-streamquote-49af9bddb229_GH0.tar.gz) = 51d7bb95b439c277817013405c4de8de77c3f6ab8cdae3d0c505478972656418
-SIZE (nkovacs-streamquote-49af9bddb229_GH0.tar.gz) = 3938
-SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
-SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 92ccfb35268ce2de6beeb45d4b5639e4bce78111b8629bcde5727165f7e1afb1
-SIZE (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 177330
-SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
-SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.15.0_GH0.tar.gz) = f0957de56c09431076239d27bb85e07841bb832d0c99210087bc6da63a0b2cb6
-SIZE (prometheus-common-v0.15.0_GH0.tar.gz) = 124369
-SHA256 (prometheus-procfs-v0.2.0_GH0.tar.gz) = b6c013031ac8b9f8f9e1595103c48feb80dfe59c37aac73efe724fddbc0b3f50
-SIZE (prometheus-procfs-v0.2.0_GH0.tar.gz) = 157368
-SHA256 (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = e7266bedaa4f110216fce52ae533dc5eba475d3829bb0592e8876684e202ae1f
-SIZE (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = 1214648
-SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
-SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
-SHA256 (valyala-bytebufferpool-v1.0.0_GH0.tar.gz) = 089013e3429ebe7fd2bc3527f003bf3f3f639891e5d8ba6a56010e3671465e1f
-SIZE (valyala-bytebufferpool-v1.0.0_GH0.tar.gz) = 5025
-SHA256 (valyala-fasttemplate-v1.0.1_GH0.tar.gz) = dd596785cb9b68280cc4fa0ff0e7d2ffc164cd13553afa656a8977b8ef342196
-SIZE (valyala-fasttemplate-v1.0.1_GH0.tar.gz) = 11813
-SHA256 (weppos-publicsuffix-go-v0.13.0_GH0.tar.gz) = cceb5b1aab6e172e9605a609e047e9efd2d9e6d18ef370f288476b001228aa56
-SIZE (weppos-publicsuffix-go-v0.13.0_GH0.tar.gz) = 59235
-SHA256 (ziutek-mymysql-v1.5.4_GH0.tar.gz) = 111b478d6190786ee098af3f365be0e33ed59e30ec4a2a9066b714515089f062
-SIZE (ziutek-mymysql-v1.5.4_GH0.tar.gz) = 61564
-SHA256 (zmap-zcrypto-3719af1573cf_GH0.tar.gz) = f4f8c6b481ba1b49f984a8d7edff88ccc25c78bb1835105da72900739b75335c
-SIZE (zmap-zcrypto-3719af1573cf_GH0.tar.gz) = 2110439
-SHA256 (zmap-zlint-v3.0.0_GH0.tar.gz) = 9ea0f0ab413615784f23e26bbf28277194a2688a8d09ffd3018354122e75bd32
-SIZE (zmap-zlint-v3.0.0_GH0.tar.gz) = 1179306
+TIMESTAMP = 1630812092
+SHA256 (go/security_cfssl/cfssl-v1.6.1/v1.6.1.mod) = a1ff14874ff60275deb254d52af60d83df15790c0fe9d04e8e08dd3f1d526cf2
+SIZE (go/security_cfssl/cfssl-v1.6.1/v1.6.1.mod) = 2828
+SHA256 (go/security_cfssl/cfssl-v1.6.1/v1.6.1.zip) = a7c3a29cd6af216f33ba76a48ffbbd54d288a1453ec94bd958265ede227aaa7b
+SIZE (go/security_cfssl/cfssl-v1.6.1/v1.6.1.zip) = 2112856