diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2020-10-25 15:35:46 -0700 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2020-10-25 15:36:48 -0700 |
| commit | f8b9efef25c71e38d9cee9b6545c9acd53d28e7d (patch) | |
| tree | 2e047efb5eca06bbde86abdadc3290861c79c988 /app-admin/gopass | |
| parent | dev-lang/mujs: Stabilize 1.0.9 arm64, #750944 (diff) | |
| download | gentoo-f8b9efef25c71e38d9cee9b6545c9acd53d28e7d.tar.gz gentoo-f8b9efef25c71e38d9cee9b6545c9acd53d28e7d.tar.bz2 gentoo-f8b9efef25c71e38d9cee9b6545c9acd53d28e7d.zip | |
app-admin/gopass: revbump, fix jsonapi version string
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'app-admin/gopass')
| -rw-r--r-- | app-admin/gopass/files/1.10.1-jsonapi-version.patch | 35 | ||||
| -rw-r--r-- | app-admin/gopass/gopass-1.10.1-r2.ebuild (renamed from app-admin/gopass/gopass-1.10.1-r1.ebuild) | 2 |
2 files changed, 37 insertions, 0 deletions
diff --git a/app-admin/gopass/files/1.10.1-jsonapi-version.patch b/app-admin/gopass/files/1.10.1-jsonapi-version.patch new file mode 100644 index 000000000000..c62964d51c6d --- /dev/null +++ b/app-admin/gopass/files/1.10.1-jsonapi-version.patch @@ -0,0 +1,35 @@ +From aedb170ff514dd2222a3437e1fc5e3fdc6353a2d Mon Sep 17 00:00:00 2001 +From: Dominik Schulz <mail@dschulz.eu> +Date: Wed, 2 Sep 2020 19:34:22 +0200 +Subject: [PATCH] Trim version prefix in jsonapi + +Fixes #1563 + +RELEASE_NOTES=[BUGFIX] Trim version prefix in jsonapi + +Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org> +--- + VERSION | 2 +- + cmd/gopass-jsonapi/jsonapi.go | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/VERSION b/VERSION +index 29833cbc..4dae2985 100644 +--- a/VERSION ++++ b/VERSION +@@ -1 +1 @@ +-v1.10.0 ++1.10.1 +diff --git a/cmd/gopass-jsonapi/jsonapi.go b/cmd/gopass-jsonapi/jsonapi.go +index b702a851..c4d9d21c 100644 +--- a/cmd/gopass-jsonapi/jsonapi.go ++++ b/cmd/gopass-jsonapi/jsonapi.go +@@ -32,7 +32,7 @@ type jsonapiCLI struct { + func (s *jsonapiCLI) listen(c *cli.Context) error { + ctx := ctxutil.WithGlobalFlags(c) + +- version, err := semver.Parse(c.App.Version) ++ version, err := semver.Parse(strings.TrimPrefix(c.App.Version, "v")) + if err != nil { + version = semver.Version{} + } diff --git a/app-admin/gopass/gopass-1.10.1-r1.ebuild b/app-admin/gopass/gopass-1.10.1-r2.ebuild index eeefb13349ba..b38c388776d3 100644 --- a/app-admin/gopass/gopass-1.10.1-r1.ebuild +++ b/app-admin/gopass/gopass-1.10.1-r2.ebuild @@ -292,6 +292,8 @@ RDEPEND=" >=app-crypt/gnupg-2 " +PATCHES=( "${FILESDIR}/${PV}-jsonapi-version.patch" ) + src_install() { emake install DESTDIR="${ED}/usr" einstalldocs |