View | Details | Raw Unified | Return to bug 244955
Collapse All | Expand All

(-)gopass/Makefile (-4 / +10 lines)
Lines 4-10 Link Here
4
PORTNAME=	gopass
4
PORTNAME=	gopass
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
DISTVERSION=	1.8.6
6
DISTVERSION=	1.8.6
7
PORTREVISION=	1
7
PORTREVISION=	2
8
CATEGORIES=	security
8
CATEGORIES=	security
9
9
10
MAINTAINER=	sascha@root-login.org
10
MAINTAINER=	sascha@root-login.org
Lines 13-18 Link Here
13
LICENSE=	MIT
13
LICENSE=	MIT
14
LICENSE_FILE=	${WRKSRC}/LICENSE
14
LICENSE_FILE=	${WRKSRC}/LICENSE
15
15
16
ONLY_FOR_ARCHS=	amd64
17
ONLY_FOR_ARCHS_REASON=	Upstream only supports amd64
18
16
RUN_DEPENDS=	git:devel/git \
19
RUN_DEPENDS=	git:devel/git \
17
		gpg2:security/gnupg
20
		gpg2:security/gnupg
18
21
Lines 20-33 Link Here
20
USE_GITHUB=	yes
23
USE_GITHUB=	yes
21
GH_ACCOUNT=	gopasspw
24
GH_ACCOUNT=	gopasspw
22
25
23
ONLY_FOR_ARCHS=	amd64
24
ONLY_FOR_ARCHS_REASON=	Upstream only supports amd64
25
26
GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
26
GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
27
27
28
PLIST_FILES=	bin/gopass \
28
PLIST_FILES=	bin/gopass \
29
		etc/bash_completion.d/gopass.sh \
29
		etc/bash_completion.d/gopass.sh \
30
		share/zsh/site-functions/_gopass
30
		share/zsh/site-functions/_gopass
31
32
pre-build:
33
	${GREP} -FRl github.com/nsf/termbox-go \
34
		${WRKSRC}/vendor/github.com/jroimartin/gocui/ | \
35
		${XARGS} ${REINPLACE_CMD} -e \
36
		s,github.com/nsf/termbox-go,github.com/gdamore/tcell/termbox,
31
37
32
post-install:
38
post-install:
33
	@${STAGEDIR}${PREFIX}/bin/gopass completion bash > ${WRKDIR}/gopass.comp.sh
39
	@${STAGEDIR}${PREFIX}/bin/gopass completion bash > ${WRKDIR}/gopass.comp.sh
(-)gopass/files/patch-vendor_github.com_gdamore_tcell_termbox_compat.go (+158 lines)
Line 0 Link Here
1
--- vendor/github.com/gdamore/tcell/termbox/compat.go.orig	2019-07-26 09:44:40 UTC
2
+++ vendor/github.com/gdamore/tcell/termbox/compat.go
3
@@ -1,4 +1,4 @@
4
-// Copyright 2016 The TCell Authors
5
+// Copyright 2020 The TCell Authors
6
 //
7
 // Licensed under the Apache License, Version 2.0 (the "License");
8
 // you may not use file except in compliance with the License.
9
@@ -12,7 +12,7 @@
10
 // See the License for the specific language governing permissions and
11
 // limitations under the License.
12
 
13
-// Package termbox is a compatibility layer to allow tcells to emulate
14
+// Package termbox is a compatibility layer to allow tcell to emulate
15
 // the github.com/nsf/termbox package.
16
 package termbox
17
 
18
@@ -236,63 +236,83 @@ const (
19
 
20
 // Keys codes.
21
 const (
22
-	KeyF1         = Key(tcell.KeyF1)
23
-	KeyF2         = Key(tcell.KeyF2)
24
-	KeyF3         = Key(tcell.KeyF3)
25
-	KeyF4         = Key(tcell.KeyF4)
26
-	KeyF5         = Key(tcell.KeyF5)
27
-	KeyF6         = Key(tcell.KeyF6)
28
-	KeyF7         = Key(tcell.KeyF7)
29
-	KeyF8         = Key(tcell.KeyF8)
30
-	KeyF9         = Key(tcell.KeyF9)
31
-	KeyF10        = Key(tcell.KeyF10)
32
-	KeyF11        = Key(tcell.KeyF11)
33
-	KeyF12        = Key(tcell.KeyF12)
34
-	KeyInsert     = Key(tcell.KeyInsert)
35
-	KeyDelete     = Key(tcell.KeyDelete)
36
-	KeyHome       = Key(tcell.KeyHome)
37
-	KeyEnd        = Key(tcell.KeyEnd)
38
-	KeyArrowUp    = Key(tcell.KeyUp)
39
-	KeyArrowDown  = Key(tcell.KeyDown)
40
-	KeyArrowRight = Key(tcell.KeyRight)
41
-	KeyArrowLeft  = Key(tcell.KeyLeft)
42
-	KeyCtrlA      = Key(tcell.KeyCtrlA)
43
-	KeyCtrlB      = Key(tcell.KeyCtrlB)
44
-	KeyCtrlC      = Key(tcell.KeyCtrlC)
45
-	KeyCtrlD      = Key(tcell.KeyCtrlD)
46
-	KeyCtrlE      = Key(tcell.KeyCtrlE)
47
-	KeyCtrlF      = Key(tcell.KeyCtrlF)
48
-	KeyCtrlG      = Key(tcell.KeyCtrlG)
49
-	KeyCtrlH      = Key(tcell.KeyCtrlH)
50
-	KeyCtrlI      = Key(tcell.KeyCtrlI)
51
-	KeyCtrlJ      = Key(tcell.KeyCtrlJ)
52
-	KeyCtrlK      = Key(tcell.KeyCtrlK)
53
-	KeyCtrlL      = Key(tcell.KeyCtrlL)
54
-	KeyCtrlM      = Key(tcell.KeyCtrlM)
55
-	KeyCtrlN      = Key(tcell.KeyCtrlN)
56
-	KeyCtrlO      = Key(tcell.KeyCtrlO)
57
-	KeyCtrlP      = Key(tcell.KeyCtrlP)
58
-	KeyCtrlQ      = Key(tcell.KeyCtrlQ)
59
-	KeyCtrlR      = Key(tcell.KeyCtrlR)
60
-	KeyCtrlS      = Key(tcell.KeyCtrlS)
61
-	KeyCtrlT      = Key(tcell.KeyCtrlT)
62
-	KeyCtrlU      = Key(tcell.KeyCtrlU)
63
-	KeyCtrlV      = Key(tcell.KeyCtrlV)
64
-	KeyCtrlW      = Key(tcell.KeyCtrlW)
65
-	KeyCtrlX      = Key(tcell.KeyCtrlX)
66
-	KeyCtrlY      = Key(tcell.KeyCtrlY)
67
-	KeyCtrlZ      = Key(tcell.KeyCtrlZ)
68
-	KeyBackspace  = Key(tcell.KeyBackspace)
69
-	KeyBackspace2 = Key(tcell.KeyBackspace2)
70
-	KeyTab        = Key(tcell.KeyTab)
71
-	KeyEnter      = Key(tcell.KeyEnter)
72
-	KeyEsc        = Key(tcell.KeyEscape)
73
-	KeyPgdn       = Key(tcell.KeyPgDn)
74
-	KeyPgup       = Key(tcell.KeyPgUp)
75
-	MouseLeft     = Key(tcell.KeyF63) // arbitrary assignments
76
-	MouseRight    = Key(tcell.KeyF62)
77
-	MouseMiddle   = Key(tcell.KeyF61)
78
-	KeySpace      = Key(tcell.Key(' '))
79
+	KeyF1             = Key(tcell.KeyF1)
80
+	KeyF2             = Key(tcell.KeyF2)
81
+	KeyF3             = Key(tcell.KeyF3)
82
+	KeyF4             = Key(tcell.KeyF4)
83
+	KeyF5             = Key(tcell.KeyF5)
84
+	KeyF6             = Key(tcell.KeyF6)
85
+	KeyF7             = Key(tcell.KeyF7)
86
+	KeyF8             = Key(tcell.KeyF8)
87
+	KeyF9             = Key(tcell.KeyF9)
88
+	KeyF10            = Key(tcell.KeyF10)
89
+	KeyF11            = Key(tcell.KeyF11)
90
+	KeyF12            = Key(tcell.KeyF12)
91
+	KeyInsert         = Key(tcell.KeyInsert)
92
+	KeyDelete         = Key(tcell.KeyDelete)
93
+	KeyHome           = Key(tcell.KeyHome)
94
+	KeyEnd            = Key(tcell.KeyEnd)
95
+	KeyArrowUp        = Key(tcell.KeyUp)
96
+	KeyArrowDown      = Key(tcell.KeyDown)
97
+	KeyArrowRight     = Key(tcell.KeyRight)
98
+	KeyArrowLeft      = Key(tcell.KeyLeft)
99
+	KeyCtrlA          = Key(tcell.KeyCtrlA)
100
+	KeyCtrlB          = Key(tcell.KeyCtrlB)
101
+	KeyCtrlC          = Key(tcell.KeyCtrlC)
102
+	KeyCtrlD          = Key(tcell.KeyCtrlD)
103
+	KeyCtrlE          = Key(tcell.KeyCtrlE)
104
+	KeyCtrlF          = Key(tcell.KeyCtrlF)
105
+	KeyCtrlG          = Key(tcell.KeyCtrlG)
106
+	KeyCtrlH          = Key(tcell.KeyCtrlH)
107
+	KeyCtrlI          = Key(tcell.KeyCtrlI)
108
+	KeyCtrlJ          = Key(tcell.KeyCtrlJ)
109
+	KeyCtrlK          = Key(tcell.KeyCtrlK)
110
+	KeyCtrlL          = Key(tcell.KeyCtrlL)
111
+	KeyCtrlM          = Key(tcell.KeyCtrlM)
112
+	KeyCtrlN          = Key(tcell.KeyCtrlN)
113
+	KeyCtrlO          = Key(tcell.KeyCtrlO)
114
+	KeyCtrlP          = Key(tcell.KeyCtrlP)
115
+	KeyCtrlQ          = Key(tcell.KeyCtrlQ)
116
+	KeyCtrlR          = Key(tcell.KeyCtrlR)
117
+	KeyCtrlS          = Key(tcell.KeyCtrlS)
118
+	KeyCtrlT          = Key(tcell.KeyCtrlT)
119
+	KeyCtrlU          = Key(tcell.KeyCtrlU)
120
+	KeyCtrlV          = Key(tcell.KeyCtrlV)
121
+	KeyCtrlW          = Key(tcell.KeyCtrlW)
122
+	KeyCtrlX          = Key(tcell.KeyCtrlX)
123
+	KeyCtrlY          = Key(tcell.KeyCtrlY)
124
+	KeyCtrlZ          = Key(tcell.KeyCtrlZ)
125
+	KeyCtrlUnderscore = Key(tcell.KeyCtrlUnderscore)
126
+	KeyBackspace      = Key(tcell.KeyBackspace)
127
+	KeyBackspace2     = Key(tcell.KeyBackspace2)
128
+	KeyTab            = Key(tcell.KeyTab)
129
+	KeyEnter          = Key(tcell.KeyEnter)
130
+	KeyEsc            = Key(tcell.KeyEscape)
131
+	KeyPgdn           = Key(tcell.KeyPgDn)
132
+	KeyPgup           = Key(tcell.KeyPgUp)
133
+	KeySpace          = Key(tcell.Key(' '))
134
+	KeyTilde          = Key(tcell.Key('~'))
135
+
136
+	// The following assignments are provided for termbox
137
+	// compatibility.  Their use in applications is discouraged.
138
+	// The mouse keys are completely not supported as tcell uses
139
+	// a separate mouse event instead of key strokes.
140
+	MouseLeft         = Key(tcell.KeyF63) // arbitrary assignments
141
+	MouseRight        = Key(tcell.KeyF62)
142
+	MouseMiddle       = Key(tcell.KeyF61)
143
+	MouseRelease      = Key(tcell.KeyF60)
144
+	MouseWheelUp      = Key(tcell.KeyF59)
145
+	MouseWheelDown    = Key(tcell.KeyF58)
146
+	KeyCtrl2          = Key(tcell.KeyNUL) // termbox defines theses
147
+	KeyCtrl3          = Key(tcell.KeyEscape)
148
+	KeyCtrl4          = Key(tcell.KeyCtrlBackslash)
149
+	KeyCtrl5          = Key(tcell.KeyCtrlRightSq)
150
+	KeyCtrl6          = Key(tcell.KeyCtrlCarat)
151
+	KeyCtrl7          = Key(tcell.KeyCtrlUnderscore)
152
+	KeyCtrlSlash      = Key(tcell.KeyCtrlUnderscore)
153
+	KeyCtrlRsqBracket = Key(tcell.KeyCtrlRightSq)
154
+	KeyCtrlBackslash  = Key(tcell.KeyCtrlBackslash)
155
+	KeyCtrlLsqBracket = Key(tcell.KeyCtrlLeftSq)
156
 )
157
 
158
 // Modifiers.
(-)gopass/files/patch-vendor_github.com_jroimartin_gocui_gui.go (+15 lines)
Line 0 Link Here
1
--- vendor/github.com/jroimartin/gocui/gui.go.orig	2019-07-26 09:44:40 UTC
2
+++ vendor/github.com/jroimartin/gocui/gui.go
3
@@ -115,11 +115,7 @@ func (g *Gui) SetRune(x, y int, ch rune, fgColor, bgCo
4
 // Rune returns the rune contained in the cell at the given position.
5
 // It checks if the position is valid.
6
 func (g *Gui) Rune(x, y int) (rune, error) {
7
-	if x < 0 || y < 0 || x >= g.maxX || y >= g.maxY {
8
-		return ' ', errors.New("invalid point")
9
-	}
10
-	c := termbox.CellBuffer()[y*g.maxX+x]
11
-	return c.Ch, nil
12
+	return ' ', errors.New("unimplemented")
13
 }
14
 
15
 // SetView creates a new view with its top-left corner at (x0, y0)
(-)gopass/files/patch-vendor_github.com_jroimartin_gocui_keybinding.go (+23 lines)
Line 0 Link Here
1
--- vendor/github.com/jroimartin/gocui/keybinding.go.orig	2019-07-26 09:44:40 UTC
2
+++ vendor/github.com/jroimartin/gocui/keybinding.go
3
@@ -78,9 +78,9 @@ const (
4
 
5
 // Keys combinations.
6
 const (
7
-	KeyCtrlTilde      Key = Key(termbox.KeyCtrlTilde)
8
+//	KeyCtrlTilde      Key = Key(termbox.KeyCtrlTilde)
9
 	KeyCtrl2              = Key(termbox.KeyCtrl2)
10
-	KeyCtrlSpace          = Key(termbox.KeyCtrlSpace)
11
+//	KeyCtrlSpace          = Key(termbox.KeyCtrlSpace)
12
 	KeyCtrlA              = Key(termbox.KeyCtrlA)
13
 	KeyCtrlB              = Key(termbox.KeyCtrlB)
14
 	KeyCtrlC              = Key(termbox.KeyCtrlC)
15
@@ -123,7 +123,7 @@ const (
16
 	KeyCtrlUnderscore     = Key(termbox.KeyCtrlUnderscore)
17
 	KeySpace              = Key(termbox.KeySpace)
18
 	KeyBackspace2         = Key(termbox.KeyBackspace2)
19
-	KeyCtrl8              = Key(termbox.KeyCtrl8)
20
+//	KeyCtrl8              = Key(termbox.KeyCtrl8)
21
 )
22
 
23
 // Modifier allows to define special keys combinations. They can be used

Return to bug 244955