fix build on Plan 9
Fixes #7575 Fixes #7671
Fazlul Shahriar committed
Sep 21, 2020 at 18:08 UTC
cac753bb1834b69709679463047e939040e07607
19 files changed
+44
-16
cmd/ipfs/util/ulimit_test.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !windows
1
+// +build !windows,!plan9
2
3
package util
4
cmd/ipfswatch/ipfswatch_test.go
+2
@@ -1,3 +1,5 @@
1
+// +build !plan9
2
+
3
package main
4
5
import (
cmd/ipfswatch/main.go
+2
@@ -1,3 +1,5 @@
1
+// +build !plan9
2
+
3
package main
4
5
import (
cmd/seccat/seccat.go
+1
-2
@@ -243,8 +243,7 @@ func netcat(c io.ReadWriteCloser) {
243
244
// wait until we exit.
245
sigc := make(chan os.Signal, 1)
246
- signal.Notify(sigc, syscall.SIGHUP, syscall.SIGINT,
247
- syscall.SIGTERM, syscall.SIGQUIT)
246
+ signal.Notify(sigc, notifySignals...)
247
248
select {
249
case <-done:
cmd/seccat/seccat_plan9.go
new
+8
@@ -0,0 +1,8 @@
1
+package main
2
+
3
+import (
4
+ "os"
5
+ "syscall"
6
+)
7
+
8
+var notifySignals = []os.Signal{syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM}
cmd/seccat/seccat_posix.go
new
+10
@@ -0,0 +1,10 @@
1
+// +build !plan9
2
+
3
+package main
4
+
5
+import (
6
+ "os"
7
+ "syscall"
8
+)
9
+
10
+var notifySignals = []os.Signal{syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT}
core/commands/add.go
+1
-1
@@ -10,12 +10,12 @@ import (
10
11
"github.com/ipfs/go-ipfs/core/commands/cmdenv"
12
13
+ "github.com/cheggaaa/pb"
14
cmds "github.com/ipfs/go-ipfs-cmds"
15
files "github.com/ipfs/go-ipfs-files"
16
coreiface "github.com/ipfs/interface-go-ipfs-core"
17
"github.com/ipfs/interface-go-ipfs-core/options"
18
mh "github.com/multiformats/go-multihash"
18
- pb "gopkg.in/cheggaaa/pb.v1"
19
)
20
21
// ErrDepthLimitExceeded indicates that the max depth has been exceeded.
core/commands/dag/dag.go
+1
-1
@@ -31,7 +31,7 @@ import (
31
//gipselector "github.com/ipld/go-ipld-prime/traversal/selector"
32
//gipselectorbuilder "github.com/ipld/go-ipld-prime/traversal/selector/builder"
33
34
- "gopkg.in/cheggaaa/pb.v1"
34
+ "github.com/cheggaaa/pb"
35
)
36
37
const (
core/commands/get.go
+1
-1
@@ -14,11 +14,11 @@ import (
14
"github.com/ipfs/go-ipfs/core/commands/cmdenv"
15
"github.com/ipfs/go-ipfs/core/commands/e"
16
17
+ "github.com/cheggaaa/pb"
18
cmds "github.com/ipfs/go-ipfs-cmds"
19
files "github.com/ipfs/go-ipfs-files"
20
"github.com/ipfs/interface-go-ipfs-core/path"
21
"github.com/whyrusleeping/tar-utils"
21
- "gopkg.in/cheggaaa/pb.v1"
22
)
23
24
var ErrInvalidCompressionLevel = errors.New("compression level must be between 1 and 9")
fuse/ipns/ipns_test.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !nofuse,!openbsd,!netbsd
1
+// +build !nofuse,!openbsd,!netbsd,!plan9
2
3
package ipns
4
fuse/ipns/ipns_unix.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !nofuse,!openbsd,!netbsd
1
+// +build !nofuse,!openbsd,!netbsd,!plan9
2
3
// package fuse/ipns implements a fuse filesystem that interfaces
4
// with ipns, the naming system for ipfs.
fuse/ipns/link_unix.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !nofuse,!openbsd,!netbsd
1
+// +build !nofuse,!openbsd,!netbsd,!plan9
2
3
package ipns
4
fuse/mount/fuse.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !nofuse,!windows,!openbsd,!netbsd
1
+// +build !nofuse,!windows,!openbsd,!netbsd,!plan9
2
3
package mount
4
fuse/node/mount_notsupp.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !nofuse,openbsd !nofuse,netbsd
1
+// +build !nofuse,openbsd !nofuse,netbsd !nofuse,plan9
2
3
package node
4
fuse/node/mount_test.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !openbsd,!nofuse,!netbsd
1
+// +build !openbsd,!nofuse,!netbsd,!plan9
2
3
package node
4
fuse/node/mount_unix.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !windows,!openbsd,!netbsd,!nofuse
1
+// +build !windows,!openbsd,!netbsd,!plan9,!nofuse
2
3
package node
4
fuse/readonly/ipfs_test.go
+1
-1
@@ -1,4 +1,4 @@
1
-// +build !nofuse,!openbsd,!netbsd
1
+// +build !nofuse,!openbsd,!netbsd,!plan9
2
3
package readonly
4
go.mod
+2
-2
@@ -5,6 +5,7 @@ require (
5
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
6
github.com/blang/semver v3.5.1+incompatible
7
github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d
8
+ github.com/cheggaaa/pb v1.0.29
9
github.com/coreos/go-systemd/v22 v22.1.0
10
github.com/dustin/go-humanize v1.0.0
11
github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302
@@ -22,7 +23,7 @@ require (
23
github.com/ipfs/go-cidutil v0.0.2
24
github.com/ipfs/go-datastore v0.4.5
25
github.com/ipfs/go-detect-race v0.0.1
25
- github.com/ipfs/go-ds-badger v0.2.4
26
+ github.com/ipfs/go-ds-badger v0.2.5
27
github.com/ipfs/go-ds-flatfs v0.4.5
28
github.com/ipfs/go-ds-leveldb v0.4.2
29
github.com/ipfs/go-ds-measure v0.1.0
@@ -107,7 +108,6 @@ require (
108
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
109
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1
110
golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 // indirect
110
- gopkg.in/cheggaaa/pb.v1 v1.0.28
111
)
112
113
go 1.13
go.sum
+7
@@ -85,6 +85,8 @@ github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+
85
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
86
github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
87
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
88
+github.com/cheggaaa/pb v1.0.29 h1:FckUN5ngEk2LpvuG0fw1GEFx6LtyY2pWI/Z2QgCnEYo=
89
+github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuPxX30=
90
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
91
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
92
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -119,6 +121,8 @@ github.com/dgraph-io/badger v1.6.0 h1:DshxFxZWXUcO0xX476VJC07Xsr6ZCBVRHKZ93Oh7Ev
121
github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
122
github.com/dgraph-io/badger v1.6.1 h1:w9pSFNSdq/JPM1N12Fz/F/bzo993Is1W+Q7HjPzi7yg=
123
github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
124
+github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8=
125
+github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE=
126
github.com/dgraph-io/ristretto v0.0.2 h1:a5WaUrDa0qm0YrAAS1tUykT5El3kt62KNZZeMxQn3po=
127
github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
128
github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
@@ -324,6 +328,8 @@ github.com/ipfs/go-ds-badger v0.2.3 h1:J27YvAcpuA5IvZUbeBxOcQgqnYHUPxoygc6Qxxkod
328
github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
329
github.com/ipfs/go-ds-badger v0.2.4 h1:UPGB0y7luFHk+mY/tUZrif/272M8o+hFsW+avLUeWrM=
330
github.com/ipfs/go-ds-badger v0.2.4/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
331
+github.com/ipfs/go-ds-badger v0.2.5 h1:oKRP6xVdgunjioOvaW4Ue2N7rBI7h/sWNERHTguUmpE=
332
+github.com/ipfs/go-ds-badger v0.2.5/go.mod h1:02rnztVKA4aZwDuaRPTf8mpqcKmXP7mLl6JPxd14JHA=
333
github.com/ipfs/go-ds-flatfs v0.4.5 h1:4QceuKEbH+HVZ2ZommstJMi3o3II+dWS3IhLaD7IGHs=
334
github.com/ipfs/go-ds-flatfs v0.4.5/go.mod h1:e4TesLyZoA8k1gV/yCuBTnt2PJtypn4XUlB5n8KQMZY=
335
github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc=
@@ -910,6 +916,7 @@ github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE
916
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
917
github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
918
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
919
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
920
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
921
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
922
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=