diff --git a/archivers/nfpm/Makefile b/archivers/nfpm/Makefile
index cf5eaa136754..3c4b6c8f40d1 100644
--- a/archivers/nfpm/Makefile
+++ b/archivers/nfpm/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	nfpm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.0
+DISTVERSION=	2.5.1
 CATEGORIES=	archivers
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple deb, rpm and apk packager written in Go
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		go:modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	goreleaser
 GH_TUPLE=	\
 		AlekSi:pointer:v1.1.0:aleksi_pointer/vendor/github.com/AlekSi/pointer \
 		Masterminds:goutils:v1.1.1:masterminds_goutils/vendor/github.com/Masterminds/goutils \
 		Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \
 		Masterminds:semver:v3.1.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
 		Masterminds:sprig:v2.22.0:masterminds_sprig/vendor/github.com/Masterminds/sprig \
 		Microsoft:go-winio:v0.4.16:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
 		ProtonMail:go-crypto:bf0c5240ed99:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \
 		ProtonMail:go-mime:9b5a4261663a:protonmail_go_mime/vendor/github.com/ProtonMail/go-mime \
-		ProtonMail:gopenpgp:v2.1.7:protonmail_gopenpgp_v2/vendor/github.com/ProtonMail/gopenpgp/v2 \
+		ProtonMail:gopenpgp:v2.1.8:protonmail_gopenpgp_v2/vendor/github.com/ProtonMail/gopenpgp/v2 \
 		blakesmith:ar:809d4375e1fb:blakesmith_ar/vendor/github.com/blakesmith/ar \
 		cavaliercoder:go-cpio:925f9528c45e:cavaliercoder_go_cpio/vendor/github.com/cavaliercoder/go-cpio \
 		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		emirpasic:gods:v1.12.0:emirpasic_gods/vendor/github.com/emirpasic/gods \
 		go-git:gcfg:v1.5.0:go_git_gcfg/vendor/github.com/go-git/gcfg \
 		go-git:go-billy:v5.1.0:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \
 		go-git:go-git:v5.3.0:go_git_go_git_v5/vendor/github.com/go-git/go-git/v5 \
 		go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \
 		go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
 		golang:crypto:0c34fe9e7dc2:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:afb366fc7cd1:golang_net/vendor/golang.org/x/net \
 		golang:sys:f1c623a9e750:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
 		google:go-cmp:v0.5.4:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:rpmpack:e20c988a6f5a:google_rpmpack/vendor/github.com/google/rpmpack \
 		google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
 		goreleaser:chglog:v0.1.2:goreleaser_chglog/vendor/github.com/goreleaser/chglog \
 		goreleaser:fileglob:v1.2.0:goreleaser_fileglob/vendor/github.com/goreleaser/fileglob \
 		huandu:xstrings:v1.3.2:huandu_xstrings/vendor/github.com/huandu/xstrings \
 		imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
 		jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \
 		kevinburke:ssh_config:v1.1.0:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \
 		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
 		mitchellh:copystructure:v1.1.2:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		mitchellh:reflectwalk:v1.0.1:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
 		op:go-logging:970db520ece7:op_go_logging/vendor/github.com/op/go-logging \
 		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 \
 		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
 		sassoftware:go-rpmutils:a8f1baeba37b:sassoftware_go_rpmutils/vendor/github.com/sassoftware/go-rpmutils \
 		sergi:go-diff:v1.2.0:sergi_go_diff/vendor/github.com/sergi/go-diff \
 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
 		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		spf13:cobra:v1.1.1:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		ulikunitz:xz:v0.5.9:ulikunitz_xz/vendor/github.com/ulikunitz/xz \
 		xanzy:ssh-agent:v0.3.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
 		xi2:xz:48954b6210f8:xi2_xz/vendor/github.com/xi2/xz
 
 GO_TARGET=	./cmd/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/archivers/nfpm/distinfo b/archivers/nfpm/distinfo
index 986f260fbfda..f9292b5f1b9d 100644
--- a/archivers/nfpm/distinfo
+++ b/archivers/nfpm/distinfo
@@ -1,109 +1,109 @@
-TIMESTAMP = 1619229294
-SHA256 (goreleaser-nfpm-v2.5.0_GH0.tar.gz) = aa8424d8328ab20ed2a442b06d87fb4e9676f7ffebbcd27cd69d1bf8bf756a13
-SIZE (goreleaser-nfpm-v2.5.0_GH0.tar.gz) = 426419
+TIMESTAMP = 1620144200
+SHA256 (goreleaser-nfpm-v2.5.1_GH0.tar.gz) = 234421fa5797ee17c1072591c3194434a118dfdb5036bc06d99912832cb36367
+SIZE (goreleaser-nfpm-v2.5.1_GH0.tar.gz) = 426569
 SHA256 (AlekSi-pointer-v1.1.0_GH0.tar.gz) = 47f59b547999f8dc6f2fdd347cdd0351e31e1a9260190b0cfb61d5dd7db87a8d
 SIZE (AlekSi-pointer-v1.1.0_GH0.tar.gz) = 4664
 SHA256 (Masterminds-goutils-v1.1.1_GH0.tar.gz) = 6eed023c54f386a71f360e19d34f7a43e640ac44dfc39c22ad4afd7ae04aaa3d
 SIZE (Masterminds-goutils-v1.1.1_GH0.tar.gz) = 14847
 SHA256 (Masterminds-semver-v1.5.0_GH0.tar.gz) = c9140eddfb03dc862f826e7761561260b9a840afa7519cc0919e89a43b5be5ba
 SIZE (Masterminds-semver-v1.5.0_GH0.tar.gz) = 21188
 SHA256 (Masterminds-semver-v3.1.1_GH0.tar.gz) = d029a39800f201d5b95ec5dbf653e5b20aab757783a6876be1b3017d1c4a444f
 SIZE (Masterminds-semver-v3.1.1_GH0.tar.gz) = 24506
 SHA256 (Masterminds-sprig-v2.22.0_GH0.tar.gz) = c6d0f6e2a3b2aecc888b62c15defcccf16a44e7435c47c7f158b98946c5ee970
 SIZE (Masterminds-sprig-v2.22.0_GH0.tar.gz) = 42051
 SHA256 (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 0cb82f4cdba942af6b545695d694e91b9d9d56bd38555c81744235d7c6f6485d
 SIZE (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 85568
 SHA256 (ProtonMail-go-crypto-bf0c5240ed99_GH0.tar.gz) = c8872051c191d6c11a0306d6aafb8b68eb6b211431a279c6c6cf2b8607360471
 SIZE (ProtonMail-go-crypto-bf0c5240ed99_GH0.tar.gz) = 1991877
 SHA256 (ProtonMail-go-mime-9b5a4261663a_GH0.tar.gz) = f7fb44da2af17aa8b58f14a126b7326cc49d0c03f358cebac52ba4fc753dd1f7
 SIZE (ProtonMail-go-mime-9b5a4261663a_GH0.tar.gz) = 23814
-SHA256 (ProtonMail-gopenpgp-v2.1.7_GH0.tar.gz) = c6c12355dc6a07932bf77cde4599b5d72ef4c704bc229cc1c02e243d90f67505
-SIZE (ProtonMail-gopenpgp-v2.1.7_GH0.tar.gz) = 111374
+SHA256 (ProtonMail-gopenpgp-v2.1.8_GH0.tar.gz) = 9f1b0093d25b1807d7e8650b57d419dddc7f8fd3088fa8aaeadc8015a15a6095
+SIZE (ProtonMail-gopenpgp-v2.1.8_GH0.tar.gz) = 114080
 SHA256 (blakesmith-ar-809d4375e1fb_GH0.tar.gz) = f9bff34f7f0b3c8d650868b1e69ca6798244c3e43d2eaecf3196426f904b8c72
 SIZE (blakesmith-ar-809d4375e1fb_GH0.tar.gz) = 4069
 SHA256 (cavaliercoder-go-cpio-925f9528c45e_GH0.tar.gz) = 4bc9671c60f37d7e863f3dd4c20a8c93601a49b8c6cb26217cb356086f02cd0a
 SIZE (cavaliercoder-go-cpio-925f9528c45e_GH0.tar.gz) = 9103
 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.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (emirpasic-gods-v1.12.0_GH0.tar.gz) = 889d06b5f88db9e2dae19a799a35324c4f59305aa5e966dcdb4b637e70607ff9
 SIZE (emirpasic-gods-v1.12.0_GH0.tar.gz) = 76825
 SHA256 (go-git-gcfg-v1.5.0_GH0.tar.gz) = 662e46a93aba5ffe383e55597ce5749447e5c8e9409b1452f5790bfd6e1f8a11
 SIZE (go-git-gcfg-v1.5.0_GH0.tar.gz) = 28522
 SHA256 (go-git-go-billy-v5.1.0_GH0.tar.gz) = cb6a3e04b76af02af0aefad91b1e07007c27fba48b3a08ca8e87768e8ea272f5
 SIZE (go-git-go-billy-v5.1.0_GH0.tar.gz) = 28217
 SHA256 (go-git-go-git-v5.3.0_GH0.tar.gz) = 8f97b5e63d2d331f7502ab2d5d8874d41ab06c80c6052a61445df26764e51e42
 SIZE (go-git-go-git-v5.3.0_GH0.tar.gz) = 465156
 SHA256 (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 4712c4ceae321433d8c1d9ebc6afd154d7932c849129ded48b1c4a51c21275e8
 SIZE (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 3769
 SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a
 SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
 SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
 SHA256 (gobwas-glob-v0.2.3_GH0.tar.gz) = 325026fc78bcebcf31151b6e060f4e1c3321b04ded3dab63b63610b323c10850
 SIZE (gobwas-glob-v0.2.3_GH0.tar.gz) = 25962
 SHA256 (golang-crypto-0c34fe9e7dc2_GH0.tar.gz) = deab6194c4b5d5ceefa40e8c7fc82a4288ff6e8577cdbde406e781c62624f491
 SIZE (golang-crypto-0c34fe9e7dc2_GH0.tar.gz) = 1726075
 SHA256 (golang-net-afb366fc7cd1_GH0.tar.gz) = 897c59e6bb8851550cdaa131e1d0c51502f537194de846918f532c463a4518ca
 SIZE (golang-net-afb366fc7cd1_GH0.tar.gz) = 1249394
 SHA256 (golang-sys-f1c623a9e750_GH0.tar.gz) = 15a6f78a91827579b9e204b14e4efa338840b5cd797d03400cea62a0b9d8bed5
 SIZE (golang-sys-f1c623a9e750_GH0.tar.gz) = 1219335
 SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
 SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
 SHA256 (google-go-cmp-v0.5.4_GH0.tar.gz) = 1e4a881d0bc4974107218d08834e2815f634a8bd9b76633fd30ace36d8a6c72b
 SIZE (google-go-cmp-v0.5.4_GH0.tar.gz) = 101019
 SHA256 (google-rpmpack-e20c988a6f5a_GH0.tar.gz) = e7808dd0ac8d20198a1d1b882b2e7568fed592e31097a010b836d9d187df5237
 SIZE (google-rpmpack-e20c988a6f5a_GH0.tar.gz) = 24201
 SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
 SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
 SHA256 (goreleaser-chglog-v0.1.2_GH0.tar.gz) = 55bb398d554daa00a875c2cbeceb35459387e62dfd023ae220af60ddfdb42fb9
 SIZE (goreleaser-chglog-v0.1.2_GH0.tar.gz) = 52610
 SHA256 (goreleaser-fileglob-v1.2.0_GH0.tar.gz) = 713a10345093f6ae3cbc0d703c73abc4bafb75724579e7ae9747a245e9bc0bbd
 SIZE (goreleaser-fileglob-v1.2.0_GH0.tar.gz) = 9569
 SHA256 (huandu-xstrings-v1.3.2_GH0.tar.gz) = 89eed037724f4a2e85da5217faa6d73ae317d066e0e5fd79670a142b83f5eb1b
 SIZE (huandu-xstrings-v1.3.2_GH0.tar.gz) = 17911
 SHA256 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302
 SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319
 SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
 SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
 SHA256 (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = b5a5c4fe8d73dea7dc838f1c428c5fff0db9b50a2c014208a2761de4e94fa5ba
 SIZE (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = 5945
 SHA256 (kevinburke-ssh_config-v1.1.0_GH0.tar.gz) = a88b03ef5077abe2ad25e7c2cd34800099575712444d71612e0553dd317ac118
 SIZE (kevinburke-ssh_config-v1.1.0_GH0.tar.gz) = 19004
 SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87
 SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909
 SHA256 (mitchellh-copystructure-v1.1.2_GH0.tar.gz) = 0d262d2f212b4b04717700607d50daaa62f37127bcfc238a81bb5548ae9a98f0
 SIZE (mitchellh-copystructure-v1.1.2_GH0.tar.gz) = 9699
 SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
 SHA256 (mitchellh-reflectwalk-v1.0.1_GH0.tar.gz) = c81ed165d0250541655304973d5379a61e00ef074c471b6a6be2c38b204a2afd
 SIZE (mitchellh-reflectwalk-v1.0.1_GH0.tar.gz) = 6449
 SHA256 (op-go-logging-970db520ece7_GH0.tar.gz) = 452d16dda814a779824097f74dc712c533f84591d9b397175b216f131ad22f17
 SIZE (op-go-logging-970db520ece7_GH0.tar.gz) = 37181
 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 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff
 SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613
 SHA256 (sassoftware-go-rpmutils-a8f1baeba37b_GH0.tar.gz) = 98c301bbb47f29e4685bfaafd31509ac9230fda0828938119715fcf0b5ebbbda
 SIZE (sassoftware-go-rpmutils-a8f1baeba37b_GH0.tar.gz) = 27447
 SHA256 (sergi-go-diff-v1.2.0_GH0.tar.gz) = 39590cae996778b7ffdd8eb9e8fc791117f16562dbef37f9c41b2f3ebb8f518b
 SIZE (sergi-go-diff-v1.2.0_GH0.tar.gz) = 1333585
 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 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
 SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
-SHA256 (spf13-cobra-v1.1.1_GH0.tar.gz) = 9bf1769caad54bc5a8bd738ddbcceeb57a19fc3158af30e44b3bbb6b8e63ab6d
-SIZE (spf13-cobra-v1.1.1_GH0.tar.gz) = 143402
+SHA256 (spf13-cobra-v1.1.3_GH0.tar.gz) = e5f93c61e1236e61c7fc45882d2a03b81f46ebebdf70628ebb64b0b5fe34f6fa
+SIZE (spf13-cobra-v1.1.3_GH0.tar.gz) = 146580
 SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
 SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
 SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
 SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
 SHA256 (ulikunitz-xz-v0.5.9_GH0.tar.gz) = c508703c9c021658170146f5904b1e67dff5ce8c86be4e8e3e041213cf0b68ef
 SIZE (ulikunitz-xz-v0.5.9_GH0.tar.gz) = 477991
 SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215b809e50f0a80c78b8730c61582858
 SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
 SHA256 (xi2-xz-48954b6210f8_GH0.tar.gz) = 1ef05b11f53098ab157f5848bdf2f585a38af0db15822ea0691e7f51587a4ce3
 SIZE (xi2-xz-48954b6210f8_GH0.tar.gz) = 1135342