mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-25 20:25:28 +03:00
80 lines
3.6 KiB
Diff
80 lines
3.6 KiB
Diff
Description: Syscall.Termios lacks 2 fields on mips64, but the documentation
|
|
says the package is deprecated and golang.org/x/sys should be used instead.
|
|
Upstream: No
|
|
diff --git a/go.mod b/go.mod
|
|
index 4e2fb93..0dde6dd 100644
|
|
--- a/go.mod
|
|
+++ b/go.mod
|
|
@@ -21,7 +21,7 @@ require (
|
|
github.com/mattn/go-isatty v0.0.9
|
|
github.com/mreiferson/go-snappystream v0.2.3
|
|
github.com/pkg/errors v0.8.1
|
|
- github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942
|
|
+ github.com/pkg/term v1.1.0
|
|
github.com/rakyll/statik v0.1.6
|
|
github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0
|
|
github.com/sirupsen/logrus v1.4.2
|
|
@@ -29,11 +29,10 @@ require (
|
|
github.com/stretchr/testify v1.4.0
|
|
github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5
|
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 // indirect
|
|
+ golang.org/x/sys v0.0.0-20210317091845-390168757d9c // indirect
|
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
|
|
gopkg.in/fsnotify/fsnotify.v1 v1.4.7
|
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
|
|
)
|
|
|
|
replace github.com/gdamore/tcell => github.com/gcla/tcell v1.1.2-0.20200927150251-decc2045f510
|
|
-
|
|
-replace github.com/pkg/term => github.com/gcla/term v0.0.0-20191015020247-31cba2f9f402
|
|
diff --git a/go.sum b/go.sum
|
|
index bac3d68..31f3bd2 100644
|
|
--- a/go.sum
|
|
+++ b/go.sum
|
|
@@ -74,6 +74,8 @@ github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181
|
|
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
|
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
|
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
+github.com/pkg/term v1.1.0 h1:xIAAdCMh3QIAy+5FrE8Ad8XoDhEU4ufwbaSozViP9kk=
|
|
+github.com/pkg/term v1.1.0/go.mod h1:E25nymQcrSllhX42Ok8MRm1+hyBdHY0dCeiKZ9jpNGw=
|
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
|
github.com/rakyll/statik v0.1.6 h1:uICcfUXpgqtw2VopbIncslhAmE5hwc4g20TEyEENBNs=
|
|
@@ -116,6 +118,9 @@ golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7w
|
|
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
|
|
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
+golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
+golang.org/x/sys v0.0.0-20210317091845-390168757d9c h1:WGyvPg8lhdtSkb8BiYWdtPlLSommHOmJHFvzWODI7BQ=
|
|
+golang.org/x/sys v0.0.0-20210317091845-390168757d9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
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.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
|
|
diff --git a/tty/tty.go b/tty/tty.go
|
|
index 7263216..700ab91 100644
|
|
--- a/tty/tty.go
|
|
+++ b/tty/tty.go
|
|
@@ -11,12 +11,13 @@ import (
|
|
"syscall"
|
|
|
|
"github.com/pkg/term/termios"
|
|
+ "golang.org/x/sys/unix"
|
|
)
|
|
|
|
//======================================================================
|
|
|
|
type TerminalSignals struct {
|
|
- tiosp syscall.Termios
|
|
+ tiosp unix.Termios
|
|
out *os.File
|
|
set bool
|
|
}
|
|
@@ -38,7 +39,7 @@ func (t *TerminalSignals) Restore() {
|
|
|
|
func (t *TerminalSignals) Set() error {
|
|
var e error
|
|
- var newtios syscall.Termios
|
|
+ var newtios unix.Termios
|
|
var fd uintptr
|
|
|
|
outtty := "/dev/tty"
|