vmctl: fix build for solaris os (#2555)

* vmctl: fix build for solaris os * vmctl: updated dependency (using Syscall instead of Syscall6) * vmctl: updated dependency * vmctl: updated dependency
VictoriaMetrics · May 9, 2022 · c8af625 · c8af625
1 parent a7f18f8
commit c8af625
Show file tree

Hide file tree

Showing 29 changed files with 59 additions and 68 deletions.
diff --git a/app/vmalert/replay.go b/app/vmalert/replay.go
@@ -7,13 +7,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cheggaaa/pb/v3"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/config"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/datasource"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/remotewrite"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/logger"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
+	"github.com/dmitryk-dk/pb/v3"
 )
 
 var (

diff --git a/app/vmctl/barpool/pool.go b/app/vmctl/barpool/pool.go
@@ -3,7 +3,7 @@
 // altogether.
 package barpool
 
-import "github.com/cheggaaa/pb/v3"
+import "github.com/dmitryk-dk/pb/v3"
 
 var pool = pb.NewPool()
 

diff --git a/app/vmctl/opentsdb.go b/app/vmctl/opentsdb.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/opentsdb"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/vm"
-	"github.com/cheggaaa/pb/v3"
+	"github.com/dmitryk-dk/pb/v3"
 )
 
 type otsdbProcessor struct {

diff --git a/app/vmctl/vm/vm.go b/app/vmctl/vm/vm.go
@@ -13,11 +13,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cheggaaa/pb/v3"
-
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/barpool"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmctl/limiter"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
+	"github.com/dmitryk-dk/pb/v3"
 )
 
 // Config contains list of params to configure

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/VictoriaMetrics/metricsql v0.43.0
 	github.com/aws/aws-sdk-go v1.44.9
 	github.com/cespare/xxhash/v2 v2.1.2
-	github.com/cheggaaa/pb/v3 v3.0.9-0.20211222075416-90c02fa07ea4
+	github.com/dmitryk-dk/pb/v3 v3.0.9
 	github.com/golang/snappy v0.0.4
 	github.com/influxdata/influxdb v1.9.6
 	github.com/klauspost/compress v1.15.3

diff --git a/go.sum b/go.sum
@@ -198,8 +198,6 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cheggaaa/pb/v3 v3.0.9-0.20211222075416-90c02fa07ea4 h1:sbHAiGddrdLsd3i9/RYsm0OKOEh+UDFOONxai8YMMcw=
-github.com/cheggaaa/pb/v3 v3.0.9-0.20211222075416-90c02fa07ea4/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -244,6 +242,8 @@ github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod h1:vAd38F8
 github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/digitalocean/godo v1.52.0/go.mod h1:p7dOjjtSBqCTUksqtA5Fd3uaKs9kyTq2xcz76ulEJRU=
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
+github.com/dmitryk-dk/pb/v3 v3.0.9 h1:wpWkldo8V6NeONVgmuCvsDIDjSRkJfbTbdoVigKYJ2I=
+github.com/dmitryk-dk/pb/v3 v3.0.9/go.mod h1:o9xpZcwYZHNdNaAlJVvWTA+YH+IlPciBs1myroBOxyM=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v17.12.0-ce-rc1.0.20200706150819-a40b877fbb9e+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=

diff --git a/vendor/github.com/cheggaaa/pb/v3/preset.go b/vendor/github.com/cheggaaa/pb/v3/preset.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/termutil/term_nix.go b/vendor/github.com/cheggaaa/pb/v3/termutil/term_nix.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/LICENSE → vendor/github.com/dmitryk-dk/pb/v3/LICENSE b/vendor/github.com/cheggaaa/pb/v3/LICENSE → vendor/github.com/dmitryk-dk/pb/v3/LICENSE
diff --git a/vendor/github.com/cheggaaa/pb/v3/element.go → ...or/github.com/dmitryk-dk/pb/v3/element.go b/vendor/github.com/cheggaaa/pb/v3/element.go → ...or/github.com/dmitryk-dk/pb/v3/element.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/io.go → vendor/github.com/dmitryk-dk/pb/v3/io.go b/vendor/github.com/cheggaaa/pb/v3/io.go → vendor/github.com/dmitryk-dk/pb/v3/io.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/pb.go → vendor/github.com/dmitryk-dk/pb/v3/pb.go b/vendor/github.com/cheggaaa/pb/v3/pb.go → vendor/github.com/dmitryk-dk/pb/v3/pb.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/pool.go → vendor/github.com/dmitryk-dk/pb/v3/pool.go b/vendor/github.com/cheggaaa/pb/v3/pool.go → vendor/github.com/dmitryk-dk/pb/v3/pool.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/pool_win.go → ...r/github.com/dmitryk-dk/pb/v3/pool_win.go b/vendor/github.com/cheggaaa/pb/v3/pool_win.go → ...r/github.com/dmitryk-dk/pb/v3/pool_win.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/pool_x.go → vendor/github.com/dmitryk-dk/pb/v3/pool_x.go b/vendor/github.com/cheggaaa/pb/v3/pool_x.go → vendor/github.com/dmitryk-dk/pb/v3/pool_x.go
diff --git a/vendor/github.com/dmitryk-dk/pb/v3/preset.go b/vendor/github.com/dmitryk-dk/pb/v3/preset.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/speed.go → vendor/github.com/dmitryk-dk/pb/v3/speed.go b/vendor/github.com/cheggaaa/pb/v3/speed.go → vendor/github.com/dmitryk-dk/pb/v3/speed.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/template.go → ...r/github.com/dmitryk-dk/pb/v3/template.go b/vendor/github.com/cheggaaa/pb/v3/template.go → ...r/github.com/dmitryk-dk/pb/v3/template.go
diff --git a/...ithub.com/cheggaaa/pb/v3/termutil/term.go → ...hub.com/dmitryk-dk/pb/v3/termutil/term.go b/...ithub.com/cheggaaa/pb/v3/termutil/term.go → ...hub.com/dmitryk-dk/pb/v3/termutil/term.go
diff --git a/...cheggaaa/pb/v3/termutil/term_appengine.go → ...itryk-dk/pb/v3/termutil/term_appengine.go b/...cheggaaa/pb/v3/termutil/term_appengine.go → ...itryk-dk/pb/v3/termutil/term_appengine.go
diff --git a/...b.com/cheggaaa/pb/v3/termutil/term_bsd.go → ...com/dmitryk-dk/pb/v3/termutil/term_bsd.go b/...b.com/cheggaaa/pb/v3/termutil/term_bsd.go → ...com/dmitryk-dk/pb/v3/termutil/term_bsd.go
diff --git a/...com/cheggaaa/pb/v3/termutil/term_linux.go → ...m/dmitryk-dk/pb/v3/termutil/term_linux.go b/...com/cheggaaa/pb/v3/termutil/term_linux.go → ...m/dmitryk-dk/pb/v3/termutil/term_linux.go
diff --git a/vendor/github.com/dmitryk-dk/pb/v3/termutil/term_nix.go b/vendor/github.com/dmitryk-dk/pb/v3/termutil/term_nix.go
diff --git a/...com/cheggaaa/pb/v3/termutil/term_plan9.go → ...m/dmitryk-dk/pb/v3/termutil/term_plan9.go b/...com/cheggaaa/pb/v3/termutil/term_plan9.go → ...m/dmitryk-dk/pb/v3/termutil/term_plan9.go
diff --git a/...m/cheggaaa/pb/v3/termutil/term_solaris.go → ...dmitryk-dk/pb/v3/termutil/term_solaris.go b/...m/cheggaaa/pb/v3/termutil/term_solaris.go → ...dmitryk-dk/pb/v3/termutil/term_solaris.go
diff --git a/...b.com/cheggaaa/pb/v3/termutil/term_win.go → ...com/dmitryk-dk/pb/v3/termutil/term_win.go b/...b.com/cheggaaa/pb/v3/termutil/term_win.go → ...com/dmitryk-dk/pb/v3/termutil/term_win.go
diff --git a/...hub.com/cheggaaa/pb/v3/termutil/term_x.go → ...b.com/dmitryk-dk/pb/v3/termutil/term_x.go b/...hub.com/cheggaaa/pb/v3/termutil/term_x.go → ...b.com/dmitryk-dk/pb/v3/termutil/term_x.go
diff --git a/vendor/github.com/cheggaaa/pb/v3/util.go → vendor/github.com/dmitryk-dk/pb/v3/util.go b/vendor/github.com/cheggaaa/pb/v3/util.go → vendor/github.com/dmitryk-dk/pb/v3/util.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -93,13 +93,13 @@ github.com/beorn7/perks/quantile
 # github.com/cespare/xxhash/v2 v2.1.2
 ## explicit; go 1.11
 github.com/cespare/xxhash/v2
-# github.com/cheggaaa/pb/v3 v3.0.9-0.20211222075416-90c02fa07ea4
-## explicit; go 1.12
-github.com/cheggaaa/pb/v3
-github.com/cheggaaa/pb/v3/termutil
 # github.com/cpuguy83/go-md2man/v2 v2.0.2
 ## explicit; go 1.11
 github.com/cpuguy83/go-md2man/v2/md2man
+# github.com/dmitryk-dk/pb/v3 v3.0.9
+## explicit; go 1.18
+github.com/dmitryk-dk/pb/v3
+github.com/dmitryk-dk/pb/v3/termutil
 # github.com/fatih/color v1.13.0
 ## explicit; go 1.13
 github.com/fatih/color