From 3b431890f344949673d446883e6fd1c84f67d093 Mon Sep 17 00:00:00 2001 From: Avatar Arctic Date: Wed, 3 Mar 2021 17:42:45 +0800 Subject: [PATCH] tunnelssh update to 1.1.2. git-tunnel https -V flag --- .github/workflows/ci.yml | 2 +- bali.toml | 2 +- cmd/git-tunnel/balisrc.toml | 2 +- cmd/git-tunnel/main.go | 1 + cmd/netcat/balisrc.toml | 2 +- cmd/ssh-askpass/balisrc.toml | 2 +- cmd/ssh-askpass/windows.go | 2 +- cmd/tunnelssh/balisrc.toml | 2 +- go.mod | 6 +++--- go.sum | 16 ++++++---------- 10 files changed, 17 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f392742..bf2251f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: - name: Setup go uses: actions/setup-go@v2 with: - go-version: '1.15.x' + go-version: '1.16.x' - name: Build TunnelSSH run: ${{ matrix.build_script }} - name: Upload release diff --git a/bali.toml b/bali.toml index e94252b..34759da 100644 --- a/bali.toml +++ b/bali.toml @@ -1,7 +1,7 @@ # https://toml.io/en/ name = "TunnelSSH" -version = "1.1.1" +version = "1.1.2" dirs = [ "cmd/tunnelssh", # "cmd/netcat", diff --git a/cmd/git-tunnel/balisrc.toml b/cmd/git-tunnel/balisrc.toml index d8871f6..5048c1b 100644 --- a/cmd/git-tunnel/balisrc.toml +++ b/cmd/git-tunnel/balisrc.toml @@ -1,7 +1,7 @@ name = "git-tunnel" description = "TunnelSSH - A witty ssh client" destination = "bin" -version = "1.1.1" +version = "1.1.2" versioninfo = "res/versioninfo.json" manifest = "res/git-tunnel.manifest" goflags = [ diff --git a/cmd/git-tunnel/main.go b/cmd/git-tunnel/main.go index d2be293..d9bf7a5 100644 --- a/cmd/git-tunnel/main.go +++ b/cmd/git-tunnel/main.go @@ -72,6 +72,7 @@ func (o *option) Invoke(val int, oa, raw string) error { os.Exit(0) case 'V': os.Setenv("TUNNEL_DEBUG", "YES") + os.Setenv("GIT_CURL_VERBOSE", "2") IsDebugMode = true default: } diff --git a/cmd/netcat/balisrc.toml b/cmd/netcat/balisrc.toml index c9374a3..623d466 100644 --- a/cmd/netcat/balisrc.toml +++ b/cmd/netcat/balisrc.toml @@ -1,7 +1,7 @@ name = "netcat" description = "netcat - A witty netcat client" destination = "bin" -version = "1.1.1" +version = "1.1.2" versioninfo = "res/versioninfo.json" manifest = "res/netcat.manifest" goflags = [ diff --git a/cmd/ssh-askpass/balisrc.toml b/cmd/ssh-askpass/balisrc.toml index a96e73b..c3bfc96 100644 --- a/cmd/ssh-askpass/balisrc.toml +++ b/cmd/ssh-askpass/balisrc.toml @@ -1,7 +1,7 @@ name = "ssh-askpass" description = "Askpass Utility for TunnelSSH" destination = "bin" -version = "1.1.1" +version = "1.1.2" versioninfo = "res/versioninfo.json" icon = "res/ssh-askpass.ico" manifest = "res/ssh-askpass.manifest" diff --git a/cmd/ssh-askpass/windows.go b/cmd/ssh-askpass/windows.go index e9338ba..14071df 100644 --- a/cmd/ssh-askpass/windows.go +++ b/cmd/ssh-askpass/windows.go @@ -93,7 +93,7 @@ func GetActiveWindow() windows.Handle { // MessageBox todo func MessageBox(hwnd uintptr, caption, title string, flags uint) int { ret, _ := windows.MessageBox( - windows.Handle(hwnd), + windows.HWND(hwnd), StringToUTF16Ptr(caption), StringToUTF16Ptr(title), uint32(flags)) diff --git a/cmd/tunnelssh/balisrc.toml b/cmd/tunnelssh/balisrc.toml index 91db861..e33da1b 100644 --- a/cmd/tunnelssh/balisrc.toml +++ b/cmd/tunnelssh/balisrc.toml @@ -1,7 +1,7 @@ name = "tunnelssh" description = "TunnelSSH - A witty ssh client" destination = "bin" -version = "1.1.1" +version = "1.1.2" versioninfo = "res/versioninfo.json" icon = "res/tunnelssh.ico" manifest = "res/tunnelssh.manifest" diff --git a/go.mod b/go.mod index a8b685b..451132d 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.15 require ( github.com/balibuild/winio v0.5.1 github.com/mattn/go-isatty v0.0.12 - golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 - golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 - golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f + golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 + golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf ) diff --git a/go.sum b/go.sum index a385437..7e95fc8 100644 --- a/go.sum +++ b/go.sum @@ -12,27 +12,23 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 h1:sYNJzB4J8toYPQTM6pAkcmBRgw9SnQKP9oXCHfgy604= -golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 h1:lwlPPsmjDKK0J6eG6xDWd5XPehI0R024zxjDnw3esPA= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 h1:YTzHMGlqJu67/uEo1lBv0n3wBXhXNeUbB1XfN2vmTm0= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f h1:QdHQnPce6K4XQewki9WNbG5KOROuDzqO3NaYjI1cXJ0= -golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04 h1:cEhElsAv9LUt9ZUUocxzWe05oFLVd+AA2nstydTeI8g= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=