Attachment 221929 Details for Bug 252988 – Sugested git diff (final)

[patch] Sugested git diff (final)

gopass-1.11.0.diff (text/plain), 25.43 KB, created by Nuno Teixeira on 2021-01-26 12:55:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2021-01-26 12:55:14 UTC

Size: 25.43 KB

patch

obsolete

>diff --git a/security/gopass/Makefile b/security/gopass/Makefile
>index d475b01268b5..b60b98f70fc1 100644
>--- a/security/gopass/Makefile
>+++ b/security/gopass/Makefile
>@@ -3,11 +3,10 @@
> 
> PORTNAME=	gopass
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.8.6
>-PORTREVISION=	2
>+DISTVERSION=	1.11.0
> CATEGORIES=	security
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	ed.arrakis@gmail.com
> COMMENT=	Rewrite of the pass password manager in Go
> 
> LICENSE=	MIT
>@@ -19,30 +18,90 @@ ONLY_FOR_ARCHS_REASON=	Upstream only supports amd64
> RUN_DEPENDS=	git:devel/git \
> 		gpg2:security/gnupg
> 
>-USES=		go
>+USES=		go:modules
> USE_GITHUB=	yes
> GH_ACCOUNT=	gopasspw
>+GH_TUPLE=	\
>+		FiloSottile:age:v1.0.0-beta4:filosottile_age/vendor/filippo.io/age \
>+		atotto:clipboard:v0.1.2:atotto_clipboard/vendor/github.com/atotto/clipboard \
>+		blang:semver:1a9109f8c4a1:blang_semver/vendor/github.com/blang/semver \
>+		caspr-io:yamlpath:502e8d113a9b:caspr_io_yamlpath/vendor/github.com/caspr-io/yamlpath \
>+		cenkalti:backoff:v2.2.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
>+		chzyer:readline:2972be24d48e:chzyer_readline/vendor/github.com/chzyer/readline \
>+		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 \
>+		dominikschulz:github-releases:v0.0.3:dominikschulz_github_releases/vendor/github.com/dominikschulz/github-releases \
>+		fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
>+		go-ini:ini:v1.60.1:go_ini_ini/vendor/gopkg.in/ini.v1 \
>+		go-yaml:yaml:eeeca48fe776:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
>+		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
>+		godbus:dbus:8a1682060722:godbus_dbus/vendor/github.com/godbus/dbus \
>+		gokyle:twofactor:v1.0.1:gokyle_twofactor/vendor/github.com/gokyle/twofactor \
>+		golang:crypto:afb6bcd081ae:golang_crypto/vendor/golang.org/x/crypto \
>+		golang:net:f5854403a974:golang_net/vendor/golang.org/x/net \
>+		golang:sys:9f70ab9862d5:golang_sys/vendor/golang.org/x/sys \
>+		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
>+		google:go-cmp:v0.5.2:google_go_cmp/vendor/github.com/google/go-cmp \
>+		google:go-github:v17.0.0:google_go_github/vendor/github.com/google/go-github \
>+		google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \
>+		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
>+		gotestyourself:gotest.tools:v2.2.0:gotestyourself_gotest_tools/vendor/gotest.tools \
>+		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
>+		hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
>+		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
>+		jsimonetti:pwscheme:76804708ecad:jsimonetti_pwscheme/vendor/github.com/jsimonetti/pwscheme \
>+		json-iterator:go:v1.1.10:json_iterator_go/vendor/github.com/json-iterator/go \
>+		kballard:go-shellquote:95032a82bc51:kballard_go_shellquote/vendor/github.com/kballard/go-shellquote \
>+		klauspost:cpuid:v1.3.1:klauspost_cpuid/vendor/github.com/klauspost/cpuid \
>+		martinhoefling:goxkcdpwgen:7dc3d102eca3:martinhoefling_goxkcdpwgen/vendor/github.com/martinhoefling/goxkcdpwgen \
>+		mattn:go-colorable:v0.1.7:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
>+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
>+		minio:md5-simd:v1.1.0:minio_md5_simd/vendor/github.com/minio/md5-simd \
>+		minio:minio-go:v7.0.7:minio_minio_go_v7/vendor/github.com/minio/minio-go/v7 \
>+		minio:sha256-simd:v0.1.1:minio_sha256_simd/vendor/github.com/minio/sha256-simd \
>+		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
>+		mitchellh:go-ps:v1.0.0:mitchellh_go_ps/vendor/github.com/mitchellh/go-ps \
>+		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
>+		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
>+		muesli:crunchy:v0.4.0:muesli_crunchy/vendor/github.com/muesli/crunchy \
>+		nbutton23:zxcvbn-go:ae427f1e4c1d:nbutton23_zxcvbn_go/vendor/github.com/nbutton23/zxcvbn-go \
>+		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 \
>+		rs:xid:v1.2.1:rs_xid/vendor/github.com/rs/xid \
>+		rsc:qr:v0.2.0:rsc_qr/vendor/rsc.io/qr \
>+		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
>+		schollz:closestmatch:1fbe626be92e:schollz_closestmatch/vendor/github.com/schollz/closestmatch \
>+		sergi:go-diff:v1.1.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 \
>+		skip2:go-qrcode:da1b6568686e:skip2_go_qrcode/vendor/github.com/skip2/go-qrcode \
>+		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \
>+		urfave:cli:v2.2.0:urfave_cli_v2/vendor/github.com/urfave/cli/v2 \
>+		xrash:smetrics:89a2a8a1fb0b:xrash_smetrics/vendor/github.com/xrash/smetrics
> 
>-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
>+PORTDOCS=	README.md docs/*
>+PORTEXAMPLES=	password-store-example/*
> 
>-PLIST_FILES=	bin/gopass \
>-		etc/bash_completion.d/gopass.sh \
>-		share/zsh/site-functions/_gopass
>+OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-pre-build:
>-	${GREP} -FRl github.com/nsf/termbox-go \
>-		${WRKSRC}/vendor/github.com/jroimartin/gocui/ | \
>-		${XARGS} ${REINPLACE_CMD} -e \
>-		s,github.com/nsf/termbox-go,github.com/gdamore/tcell/termbox,
>+post-build:
>+.for SHELL in bash fish zsh
>+	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_WRKDIR_BIN}/${PORTNAME} completion ${SHELL} > ${GO_WRKSRC}/${SHELL}
>+.endfor
>+
>+do-install-DOCS-on:
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
> 
> post-install:
>-	@${STAGEDIR}${PREFIX}/bin/gopass completion bash > ${WRKDIR}/gopass.comp.sh
>-	@${STAGEDIR}${PREFIX}/bin/gopass completion zsh > ${WRKDIR}/gopass.comp.zsh
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
>-	${INSTALL_DATA} ${WRKDIR}/gopass.comp.sh \
>-		${STAGEDIR}${PREFIX}/etc/bash_completion.d/gopass.sh
>+	${INSTALL_DATA} ${WRKSRC}/bash \
>+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}.sh
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
>+	${INSTALL_DATA} ${WRKSRC}/fish \
>+		${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
>-	${INSTALL_DATA} ${WRKDIR}/gopass.comp.zsh \
>-		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_gopass
>+	${INSTALL_DATA} ${WRKSRC}/zsh \
>+		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
> 
> .include <bsd.port.mk>
>diff --git a/security/gopass/distinfo b/security/gopass/distinfo
>index 55de17eb8ce5..c87e935d81b5 100644
>--- a/security/gopass/distinfo
>+++ b/security/gopass/distinfo
>@@ -1,3 +1,113 @@
>-TIMESTAMP = 1564562559
>-SHA256 (gopasspw-gopass-v1.8.6_GH0.tar.gz) = 77bbf6ed9ecdcf153f40bdaa014835fe99ed505762b20f8d33be1c2f72199fdf
>-SIZE (gopasspw-gopass-v1.8.6_GH0.tar.gz) = 7072723
>+TIMESTAMP = 1611665160
>+SHA256 (gopasspw-gopass-v1.11.0_GH0.tar.gz) = 26ac90ef60d7f08e7d9361280d6457edb90642e821edba2c5e5cb0a09ca20b08
>+SIZE (gopasspw-gopass-v1.11.0_GH0.tar.gz) = 486905
>+SHA256 (FiloSottile-age-v1.0.0-beta4_GH0.tar.gz) = a0e644557ad37ed08dbae0fdbd6ddbcca6bebcd62a1f8a62544c4bd815ac3669
>+SIZE (FiloSottile-age-v1.0.0-beta4_GH0.tar.gz) = 36002
>+SHA256 (atotto-clipboard-v0.1.2_GH0.tar.gz) = 84704a60eb4de90eaebe6e8cbfab30bb53d103c26c25560d67d13469fd17934e
>+SIZE (atotto-clipboard-v0.1.2_GH0.tar.gz) = 4478
>+SHA256 (blang-semver-1a9109f8c4a1_GH0.tar.gz) = f05dfca21425b4fe064ac1329b44cd0532ab2896554202536ae0a044c4971fae
>+SIZE (blang-semver-1a9109f8c4a1_GH0.tar.gz) = 15409
>+SHA256 (caspr-io-yamlpath-502e8d113a9b_GH0.tar.gz) = 21c2f0bcc27ae04af0a4ead4a50fe679c0319338e8ea18cd70377d663c65fcc0
>+SIZE (caspr-io-yamlpath-502e8d113a9b_GH0.tar.gz) = 6330
>+SHA256 (cenkalti-backoff-v2.2.1_GH0.tar.gz) = a2c29d0184e7afc415975cf2689723028d2686ffbb67fe0999ab1d691e6d16db
>+SIZE (cenkalti-backoff-v2.2.1_GH0.tar.gz) = 8623
>+SHA256 (chzyer-readline-2972be24d48e_GH0.tar.gz) = 8f425cfb33fce61a137866c0a88117c68f49de79a61a341353fc97339c6b74da
>+SIZE (chzyer-readline-2972be24d48e_GH0.tar.gz) = 36825
>+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 (dominikschulz-github-releases-v0.0.3_GH0.tar.gz) = c50522823d2abd63c25a9251c6806870e2a08d5de7f56a8dcc3c651882b87c86
>+SIZE (dominikschulz-github-releases-v0.0.3_GH0.tar.gz) = 2150
>+SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9be047195c0ab421d5340f6f3f
>+SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941
>+SHA256 (go-ini-ini-v1.60.1_GH0.tar.gz) = 4cc8857ad31c132b0e6e873a34899f8fe71b11e30c767ec7818658800b1d98e2
>+SIZE (go-ini-ini-v1.60.1_GH0.tar.gz) = 49254
>+SHA256 (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5
>+SIZE (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787
>+SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
>+SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
>+SHA256 (godbus-dbus-8a1682060722_GH0.tar.gz) = 94790f2f00c567b36d41851d643733a942f300ebfd5947ec8bef39633d1bf7f9
>+SIZE (godbus-dbus-8a1682060722_GH0.tar.gz) = 62412
>+SHA256 (gokyle-twofactor-v1.0.1_GH0.tar.gz) = 438d73c5864ab5a22d3921080febffb8fe7ebd14a193519d958ff83b0dd0d812
>+SIZE (gokyle-twofactor-v1.0.1_GH0.tar.gz) = 22519
>+SHA256 (golang-crypto-afb6bcd081ae_GH0.tar.gz) = 5fc2dcc66e5ef145777dd348288ca8c341c6f60b0c5f5a55503e6462932b736a
>+SIZE (golang-crypto-afb6bcd081ae_GH0.tar.gz) = 1732331
>+SHA256 (golang-net-f5854403a974_GH0.tar.gz) = 75e94d61e00b4aec6b7baea0927e51a92239caf876214f45394258855c73f92f
>+SIZE (golang-net-f5854403a974_GH0.tar.gz) = 1178323
>+SHA256 (golang-sys-9f70ab9862d5_GH0.tar.gz) = d97abbad76f3cbacc96d49d0a5da45f3193dad52aad86bb5c6f2024fbce457fc
>+SIZE (golang-sys-9f70ab9862d5_GH0.tar.gz) = 1072169
>+SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
>+SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
>+SHA256 (google-go-cmp-v0.5.2_GH0.tar.gz) = 76e0c4238e7fec1490ef2c8b4719a024ade7f4b8778965acb888566535ee9dd5
>+SIZE (google-go-cmp-v0.5.2_GH0.tar.gz) = 99769
>+SHA256 (google-go-github-v17.0.0_GH0.tar.gz) = 75e6007d9a17b91864d1ef83de75c07abafbe05d82caaf140522b94299abfb16
>+SIZE (google-go-github-v17.0.0_GH0.tar.gz) = 212084
>+SHA256 (google-go-querystring-v1.0.0_GH0.tar.gz) = 59fdfd4d740c85c60c35d3e09b587cfa2b435e78178ac4a23950afbece7118ed
>+SIZE (google-go-querystring-v1.0.0_GH0.tar.gz) = 7529
>+SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
>+SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
>+SHA256 (gotestyourself-gotest.tools-v2.2.0_GH0.tar.gz) = 5d4c441f8cb2949ddab1d196fac936df79b629b580c88597b100a74a97ca58ea
>+SIZE (gotestyourself-gotest.tools-v2.2.0_GH0.tar.gz) = 56880
>+SHA256 (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 26afc0e5895c6ce87c881c5c02c682ccc9a08174a9c27ca26d4a1e72dbf78128
>+SIZE (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 8346
>+SHA256 (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 466a1f3596417a35b407d06d2dc2cb87dba46b025af4f77d30f82aa6e0e6d4d4
>+SIZE (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 12084
>+SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a
>+SIZE (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = 13428
>+SHA256 (jsimonetti-pwscheme-76804708ecad_GH0.tar.gz) = 13f01f49a06df602ffe34f45adc2614d06babd506c11a5218593a76aac8284e8
>+SIZE (jsimonetti-pwscheme-76804708ecad_GH0.tar.gz) = 3857
>+SHA256 (json-iterator-go-v1.1.10_GH0.tar.gz) = 15e761079f413a9edcf86ea628998e328c12aaed92af462363191fa76e9809a6
>+SIZE (json-iterator-go-v1.1.10_GH0.tar.gz) = 83384
>+SHA256 (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = dde336eb697f7f9c26cf6d1467f75b6cf559262c1b0b110d28fff29790f76bc5
>+SIZE (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = 4328
>+SHA256 (klauspost-cpuid-v1.3.1_GH0.tar.gz) = 3bf2da7358c8ed33c05bac2ca733749ade03eadf184d81cc7b16fcbe2e230f1d
>+SIZE (klauspost-cpuid-v1.3.1_GH0.tar.gz) = 367144
>+SHA256 (martinhoefling-goxkcdpwgen-7dc3d102eca3_GH0.tar.gz) = b30b48e7adfb39531b66c8ac1e5d6a858a0a75a73911ae8568512525d9ea11d1
>+SIZE (martinhoefling-goxkcdpwgen-7dc3d102eca3_GH0.tar.gz) = 287937
>+SHA256 (mattn-go-colorable-v0.1.7_GH0.tar.gz) = e394441b47cb26bb0c60ffdf2c60d57facbbc39f7a60763fdb1ec752cb460abf
>+SIZE (mattn-go-colorable-v0.1.7_GH0.tar.gz) = 9560
>+SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
>+SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
>+SHA256 (minio-md5-simd-v1.1.0_GH0.tar.gz) = f4565eeff59db2fa45fb5f49936381d9a5fad8bd621be33cf96ffd30077111c0
>+SIZE (minio-md5-simd-v1.1.0_GH0.tar.gz) = 99235
>+SHA256 (minio-minio-go-v7.0.7_GH0.tar.gz) = 3c9897e87671bba1b64b1a6820fa31d61b8e9d10c94c91e5101397317b342a93
>+SIZE (minio-minio-go-v7.0.7_GH0.tar.gz) = 236123
>+SHA256 (minio-sha256-simd-v0.1.1_GH0.tar.gz) = bc1f1e80dc1291f6d26933658155488cc895f6b8a4944479d462cf5a79112109
>+SIZE (minio-sha256-simd-v0.1.1_GH0.tar.gz) = 65024
>+SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
>+SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
>+SHA256 (mitchellh-go-ps-v1.0.0_GH0.tar.gz) = c3ad0af6733915a83b54300427e6bca2a124bf16a5732c3f630b3ef53e4eef43
>+SIZE (mitchellh-go-ps-v1.0.0_GH0.tar.gz) = 7610
>+SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
>+SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
>+SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd
>+SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394
>+SHA256 (muesli-crunchy-v0.4.0_GH0.tar.gz) = 12f5c95ee37c5c075219274ee3be6bdd41409171f09ab83f95348336159ae4b9
>+SIZE (muesli-crunchy-v0.4.0_GH0.tar.gz) = 7785
>+SHA256 (nbutton23-zxcvbn-go-ae427f1e4c1d_GH0.tar.gz) = 13d860fd8024c61459d362b4fbd7c8b3363d056e54464a5fb778e5fb284e41c8
>+SIZE (nbutton23-zxcvbn-go-ae427f1e4c1d_GH0.tar.gz) = 980123
>+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 (rs-xid-v1.2.1_GH0.tar.gz) = bb207227d5ae99bda71d38ae11e29b822c9b572223781bc282ad2f8e69002f2c
>+SIZE (rs-xid-v1.2.1_GH0.tar.gz) = 9553
>+SHA256 (rsc-qr-v0.2.0_GH0.tar.gz) = a39800570e994df470ff3917b2131d80829ae447d3aac794034ef87cb93d1a66
>+SIZE (rsc-qr-v0.2.0_GH0.tar.gz) = 18808
>+SHA256 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff
>+SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613
>+SHA256 (schollz-closestmatch-1fbe626be92e_GH0.tar.gz) = a28392861297a7512102810e12ce0f7bcaa1cbe360d1bf02c7c76af2557e1979
>+SIZE (schollz-closestmatch-1fbe626be92e_GH0.tar.gz) = 624004
>+SHA256 (sergi-go-diff-v1.1.0_GH0.tar.gz) = 3d4362670655e970366d555418f3c8d179c217c0499ef5573ab7176352229451
>+SIZE (sergi-go-diff-v1.1.0_GH0.tar.gz) = 43552
>+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 (skip2-go-qrcode-da1b6568686e_GH0.tar.gz) = af179c37da861a43242fb4383186724b34866d7b5bd3e54ca44031a2b9f92046
>+SIZE (skip2-go-qrcode-da1b6568686e_GH0.tar.gz) = 36693
>+SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
>+SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
>+SHA256 (urfave-cli-v2.2.0_GH0.tar.gz) = 5c3717e403ec924011513cfb7542360c156ef1e4222ca21697198ca47f5ca731
>+SIZE (urfave-cli-v2.2.0_GH0.tar.gz) = 3404022
>+SHA256 (xrash-smetrics-89a2a8a1fb0b_GH0.tar.gz) = eb61a33f8ec4d965c75574ff3c22a9a5fd26fe69ead8bf7b7381a786df4b4859
>+SIZE (xrash-smetrics-89a2a8a1fb0b_GH0.tar.gz) = 1823869
>diff --git a/security/gopass/files/patch-vendor_github.com_gdamore_tcell_termbox_compat.go b/security/gopass/files/patch-vendor_github.com_gdamore_tcell_termbox_compat.go
>deleted file mode 100644
>index b179fb9ff023..000000000000
>--- a/security/gopass/files/patch-vendor_github.com_gdamore_tcell_termbox_compat.go
>+++ /dev/null
>@@ -1,158 +0,0 @@
>---- vendor/github.com/gdamore/tcell/termbox/compat.go.orig	2019-07-26 09:44:40 UTC
>-+++ vendor/github.com/gdamore/tcell/termbox/compat.go
>-@@ -1,4 +1,4 @@
>--// Copyright 2016 The TCell Authors
>-+// Copyright 2020 The TCell Authors
>- //
>- // Licensed under the Apache License, Version 2.0 (the "License");
>- // you may not use file except in compliance with the License.
>-@@ -12,7 +12,7 @@
>- // See the License for the specific language governing permissions and
>- // limitations under the License.
>- 
>--// Package termbox is a compatibility layer to allow tcells to emulate
>-+// Package termbox is a compatibility layer to allow tcell to emulate
>- // the github.com/nsf/termbox package.
>- package termbox
>- 
>-@@ -236,63 +236,83 @@ const (
>- 
>- // Keys codes.
>- const (
>--	KeyF1         = Key(tcell.KeyF1)
>--	KeyF2         = Key(tcell.KeyF2)
>--	KeyF3         = Key(tcell.KeyF3)
>--	KeyF4         = Key(tcell.KeyF4)
>--	KeyF5         = Key(tcell.KeyF5)
>--	KeyF6         = Key(tcell.KeyF6)
>--	KeyF7         = Key(tcell.KeyF7)
>--	KeyF8         = Key(tcell.KeyF8)
>--	KeyF9         = Key(tcell.KeyF9)
>--	KeyF10        = Key(tcell.KeyF10)
>--	KeyF11        = Key(tcell.KeyF11)
>--	KeyF12        = Key(tcell.KeyF12)
>--	KeyInsert     = Key(tcell.KeyInsert)
>--	KeyDelete     = Key(tcell.KeyDelete)
>--	KeyHome       = Key(tcell.KeyHome)
>--	KeyEnd        = Key(tcell.KeyEnd)
>--	KeyArrowUp    = Key(tcell.KeyUp)
>--	KeyArrowDown  = Key(tcell.KeyDown)
>--	KeyArrowRight = Key(tcell.KeyRight)
>--	KeyArrowLeft  = Key(tcell.KeyLeft)
>--	KeyCtrlA      = Key(tcell.KeyCtrlA)
>--	KeyCtrlB      = Key(tcell.KeyCtrlB)
>--	KeyCtrlC      = Key(tcell.KeyCtrlC)
>--	KeyCtrlD      = Key(tcell.KeyCtrlD)
>--	KeyCtrlE      = Key(tcell.KeyCtrlE)
>--	KeyCtrlF      = Key(tcell.KeyCtrlF)
>--	KeyCtrlG      = Key(tcell.KeyCtrlG)
>--	KeyCtrlH      = Key(tcell.KeyCtrlH)
>--	KeyCtrlI      = Key(tcell.KeyCtrlI)
>--	KeyCtrlJ      = Key(tcell.KeyCtrlJ)
>--	KeyCtrlK      = Key(tcell.KeyCtrlK)
>--	KeyCtrlL      = Key(tcell.KeyCtrlL)
>--	KeyCtrlM      = Key(tcell.KeyCtrlM)
>--	KeyCtrlN      = Key(tcell.KeyCtrlN)
>--	KeyCtrlO      = Key(tcell.KeyCtrlO)
>--	KeyCtrlP      = Key(tcell.KeyCtrlP)
>--	KeyCtrlQ      = Key(tcell.KeyCtrlQ)
>--	KeyCtrlR      = Key(tcell.KeyCtrlR)
>--	KeyCtrlS      = Key(tcell.KeyCtrlS)
>--	KeyCtrlT      = Key(tcell.KeyCtrlT)
>--	KeyCtrlU      = Key(tcell.KeyCtrlU)
>--	KeyCtrlV      = Key(tcell.KeyCtrlV)
>--	KeyCtrlW      = Key(tcell.KeyCtrlW)
>--	KeyCtrlX      = Key(tcell.KeyCtrlX)
>--	KeyCtrlY      = Key(tcell.KeyCtrlY)
>--	KeyCtrlZ      = Key(tcell.KeyCtrlZ)
>--	KeyBackspace  = Key(tcell.KeyBackspace)
>--	KeyBackspace2 = Key(tcell.KeyBackspace2)
>--	KeyTab        = Key(tcell.KeyTab)
>--	KeyEnter      = Key(tcell.KeyEnter)
>--	KeyEsc        = Key(tcell.KeyEscape)
>--	KeyPgdn       = Key(tcell.KeyPgDn)
>--	KeyPgup       = Key(tcell.KeyPgUp)
>--	MouseLeft     = Key(tcell.KeyF63) // arbitrary assignments
>--	MouseRight    = Key(tcell.KeyF62)
>--	MouseMiddle   = Key(tcell.KeyF61)
>--	KeySpace      = Key(tcell.Key(' '))
>-+	KeyF1             = Key(tcell.KeyF1)
>-+	KeyF2             = Key(tcell.KeyF2)
>-+	KeyF3             = Key(tcell.KeyF3)
>-+	KeyF4             = Key(tcell.KeyF4)
>-+	KeyF5             = Key(tcell.KeyF5)
>-+	KeyF6             = Key(tcell.KeyF6)
>-+	KeyF7             = Key(tcell.KeyF7)
>-+	KeyF8             = Key(tcell.KeyF8)
>-+	KeyF9             = Key(tcell.KeyF9)
>-+	KeyF10            = Key(tcell.KeyF10)
>-+	KeyF11            = Key(tcell.KeyF11)
>-+	KeyF12            = Key(tcell.KeyF12)
>-+	KeyInsert         = Key(tcell.KeyInsert)
>-+	KeyDelete         = Key(tcell.KeyDelete)
>-+	KeyHome           = Key(tcell.KeyHome)
>-+	KeyEnd            = Key(tcell.KeyEnd)
>-+	KeyArrowUp        = Key(tcell.KeyUp)
>-+	KeyArrowDown      = Key(tcell.KeyDown)
>-+	KeyArrowRight     = Key(tcell.KeyRight)
>-+	KeyArrowLeft      = Key(tcell.KeyLeft)
>-+	KeyCtrlA          = Key(tcell.KeyCtrlA)
>-+	KeyCtrlB          = Key(tcell.KeyCtrlB)
>-+	KeyCtrlC          = Key(tcell.KeyCtrlC)
>-+	KeyCtrlD          = Key(tcell.KeyCtrlD)
>-+	KeyCtrlE          = Key(tcell.KeyCtrlE)
>-+	KeyCtrlF          = Key(tcell.KeyCtrlF)
>-+	KeyCtrlG          = Key(tcell.KeyCtrlG)
>-+	KeyCtrlH          = Key(tcell.KeyCtrlH)
>-+	KeyCtrlI          = Key(tcell.KeyCtrlI)
>-+	KeyCtrlJ          = Key(tcell.KeyCtrlJ)
>-+	KeyCtrlK          = Key(tcell.KeyCtrlK)
>-+	KeyCtrlL          = Key(tcell.KeyCtrlL)
>-+	KeyCtrlM          = Key(tcell.KeyCtrlM)
>-+	KeyCtrlN          = Key(tcell.KeyCtrlN)
>-+	KeyCtrlO          = Key(tcell.KeyCtrlO)
>-+	KeyCtrlP          = Key(tcell.KeyCtrlP)
>-+	KeyCtrlQ          = Key(tcell.KeyCtrlQ)
>-+	KeyCtrlR          = Key(tcell.KeyCtrlR)
>-+	KeyCtrlS          = Key(tcell.KeyCtrlS)
>-+	KeyCtrlT          = Key(tcell.KeyCtrlT)
>-+	KeyCtrlU          = Key(tcell.KeyCtrlU)
>-+	KeyCtrlV          = Key(tcell.KeyCtrlV)
>-+	KeyCtrlW          = Key(tcell.KeyCtrlW)
>-+	KeyCtrlX          = Key(tcell.KeyCtrlX)
>-+	KeyCtrlY          = Key(tcell.KeyCtrlY)
>-+	KeyCtrlZ          = Key(tcell.KeyCtrlZ)
>-+	KeyCtrlUnderscore = Key(tcell.KeyCtrlUnderscore)
>-+	KeyBackspace      = Key(tcell.KeyBackspace)
>-+	KeyBackspace2     = Key(tcell.KeyBackspace2)
>-+	KeyTab            = Key(tcell.KeyTab)
>-+	KeyEnter          = Key(tcell.KeyEnter)
>-+	KeyEsc            = Key(tcell.KeyEscape)
>-+	KeyPgdn           = Key(tcell.KeyPgDn)
>-+	KeyPgup           = Key(tcell.KeyPgUp)
>-+	KeySpace          = Key(tcell.Key(' '))
>-+	KeyTilde          = Key(tcell.Key('~'))
>-+
>-+	// The following assignments are provided for termbox
>-+	// compatibility.  Their use in applications is discouraged.
>-+	// The mouse keys are completely not supported as tcell uses
>-+	// a separate mouse event instead of key strokes.
>-+	MouseLeft         = Key(tcell.KeyF63) // arbitrary assignments
>-+	MouseRight        = Key(tcell.KeyF62)
>-+	MouseMiddle       = Key(tcell.KeyF61)
>-+	MouseRelease      = Key(tcell.KeyF60)
>-+	MouseWheelUp      = Key(tcell.KeyF59)
>-+	MouseWheelDown    = Key(tcell.KeyF58)
>-+	KeyCtrl2          = Key(tcell.KeyNUL) // termbox defines theses
>-+	KeyCtrl3          = Key(tcell.KeyEscape)
>-+	KeyCtrl4          = Key(tcell.KeyCtrlBackslash)
>-+	KeyCtrl5          = Key(tcell.KeyCtrlRightSq)
>-+	KeyCtrl6          = Key(tcell.KeyCtrlCarat)
>-+	KeyCtrl7          = Key(tcell.KeyCtrlUnderscore)
>-+	KeyCtrlSlash      = Key(tcell.KeyCtrlUnderscore)
>-+	KeyCtrlRsqBracket = Key(tcell.KeyCtrlRightSq)
>-+	KeyCtrlBackslash  = Key(tcell.KeyCtrlBackslash)
>-+	KeyCtrlLsqBracket = Key(tcell.KeyCtrlLeftSq)
>- )
>- 
>- // Modifiers.
>diff --git a/security/gopass/files/patch-vendor_github.com_jroimartin_gocui_gui.go b/security/gopass/files/patch-vendor_github.com_jroimartin_gocui_gui.go
>deleted file mode 100644
>index 4807e03c8890..000000000000
>--- a/security/gopass/files/patch-vendor_github.com_jroimartin_gocui_gui.go
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- vendor/github.com/jroimartin/gocui/gui.go.orig	2019-07-26 09:44:40 UTC
>-+++ vendor/github.com/jroimartin/gocui/gui.go
>-@@ -115,11 +115,7 @@ func (g *Gui) SetRune(x, y int, ch rune, fgColor, bgCo
>- // Rune returns the rune contained in the cell at the given position.
>- // It checks if the position is valid.
>- func (g *Gui) Rune(x, y int) (rune, error) {
>--	if x < 0 || y < 0 || x >= g.maxX || y >= g.maxY {
>--		return ' ', errors.New("invalid point")
>--	}
>--	c := termbox.CellBuffer()[y*g.maxX+x]
>--	return c.Ch, nil
>-+	return ' ', errors.New("unimplemented")
>- }
>- 
>- // SetView creates a new view with its top-left corner at (x0, y0)
>diff --git a/security/gopass/files/patch-vendor_github.com_jroimartin_gocui_keybinding.go b/security/gopass/files/patch-vendor_github.com_jroimartin_gocui_keybinding.go
>deleted file mode 100644
>index 7cae2fbff9c2..000000000000
>--- a/security/gopass/files/patch-vendor_github.com_jroimartin_gocui_keybinding.go
>+++ /dev/null
>@@ -1,23 +0,0 @@
>---- vendor/github.com/jroimartin/gocui/keybinding.go.orig	2019-07-26 09:44:40 UTC
>-+++ vendor/github.com/jroimartin/gocui/keybinding.go
>-@@ -78,9 +78,9 @@ const (
>- 
>- // Keys combinations.
>- const (
>--	KeyCtrlTilde      Key = Key(termbox.KeyCtrlTilde)
>-+//	KeyCtrlTilde      Key = Key(termbox.KeyCtrlTilde)
>- 	KeyCtrl2              = Key(termbox.KeyCtrl2)
>--	KeyCtrlSpace          = Key(termbox.KeyCtrlSpace)
>-+//	KeyCtrlSpace          = Key(termbox.KeyCtrlSpace)
>- 	KeyCtrlA              = Key(termbox.KeyCtrlA)
>- 	KeyCtrlB              = Key(termbox.KeyCtrlB)
>- 	KeyCtrlC              = Key(termbox.KeyCtrlC)
>-@@ -123,7 +123,7 @@ const (
>- 	KeyCtrlUnderscore     = Key(termbox.KeyCtrlUnderscore)
>- 	KeySpace              = Key(termbox.KeySpace)
>- 	KeyBackspace2         = Key(termbox.KeyBackspace2)
>--	KeyCtrl8              = Key(termbox.KeyCtrl8)
>-+//	KeyCtrl8              = Key(termbox.KeyCtrl8)
>- )
>- 
>- // Modifier allows to define special keys combinations. They can be used
>diff --git a/security/gopass/pkg-descr b/security/gopass/pkg-descr
>index 0c2db8c44f34..99bc0a841a4e 100644
>--- a/security/gopass/pkg-descr
>+++ b/security/gopass/pkg-descr
>@@ -3,4 +3,4 @@ The slightly more awesome Standard Unix Password Manager for teams.
> gopass is a rewrite of the pass password manager in Go with the aim
> of making it cross-platform and adding additional features.
> 
>-WWW: https://www.justwatch.com/gopass
>+WWW: https://www.gopass.pw/

Flags:

eduardo: maintainer-approval-

Actions: View | Diff

Attachments on bug 252988: 221894 | 221926 | 221929 | 221935