Update keybase to latest - diff from Ray Lai <ray@raylai.com> with the

addition of NO_TEST from myself.

OK gonzalo@
This commit is contained in:
abieber 2017-10-11 14:00:05 +00:00
parent 331475cbca
commit 68e9e6d48d
3 changed files with 26 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2017/05/29 22:41:32 abieber Exp $
# $OpenBSD: Makefile,v 1.6 2017/10/11 14:00:05 abieber Exp $
# go-ps only supports amd64 on OpenBSD
# ../vendor/github.com/keybase/go-ps/process.go:39: undefined: processes
@ -7,7 +7,7 @@ ONLY_FOR_ARCHS = amd64
COMMENT = client for keybase.io
V = 1.0.21
V = 1.0.33
GH_ACCOUNT = keybase
GH_PROJECT = client
GH_TAGNAME = v${V}
@ -32,6 +32,8 @@ MODULES = lang/go
MODGO_TYPE = bin
MODGO_ENV = PATH="${PORTPATH}" HOME="${PORTHOME}"
NO_TEST = Yes
do-build:
cd ${WRKSRC}/go/keybase && ${MODGO_CMD} build -tags \
production

View File

@ -1,2 +1,2 @@
SHA256 (keybase-1.0.21.tar.gz) = qbuvFst7fMNhTKXnbg+xs70WTzjhS51J1Mo1GUHIwKM=
SIZE (keybase-1.0.21.tar.gz) = 21127410
SHA256 (keybase-1.0.33.tar.gz) = yBNdVyiZsL8CBffdvjDUv6ifNY9kZ46yXa38Dg+g2+A=
SIZE (keybase-1.0.33.tar.gz) = 29170354

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-go_client_cmd_update_go,v 1.2 2017/05/29 22:41:32 abieber Exp $
$OpenBSD: patch-go_client_cmd_update_go,v 1.3 2017/10/11 14:00:05 abieber Exp $
Disabling this because we don't want the binary to update itself
out from under us.
@ -6,9 +6,18 @@ out from under us.
Upstream doesn't seem interested in our hacky Path finding process:
https://github.com/keybase/go-ps/pull/7#discussion_r73917329
--- go/client/cmd_update.go.orig Thu Apr 20 07:44:48 2017
+++ go/client/cmd_update.go Thu Apr 20 07:45:03 2017
@@ -34,17 +34,7 @@ func newCmdUpdateCheck(cl *libcmdline.CommandLine, g *
Index: go/client/cmd_update.go
--- go/client/cmd_update.go.orig
+++ go/client/cmd_update.go
@@ -7,7 +7,6 @@ import (
"encoding/json"
"fmt"
"os"
- "os/exec"
"github.com/keybase/cli"
"github.com/keybase/client/go/install"
@@ -35,23 +34,7 @@ func newCmdUpdateCheck(cl *libcmdline.CommandLine, g *
Name: "check",
Usage: "Check for update",
Action: func(c *cli.Context) {
@ -22,7 +31,13 @@ https://github.com/keybase/go-ps/pull/7#discussion_r73917329
- g.Log.Errorf("Error finding updater path: %s", err)
- return
- }
- g.Log.Errorf("\nTo update, you can run:\n\n\t%s check", updaterPath)
-
- cmd := exec.Command(updaterPath, "check")
- cmd.Stdout = os.Stdout
- cmd.Stderr = os.Stderr
- if err := cmd.Run(); err != nil {
- g.Log.Errorf("Error running %q: %s", updaterPath, err)
- }
+ g.Log.Errorf("Not supported on OpenBSD.")
},
}