Control: tags -1 + patch Hi,
On Tue, Nov 22, 2022 at 02:39:34PM +1100, Dmitry Smirnov wrote: > On Sunday, 20 November 2022 6:22:10 PM AEDT Adrian Bunk wrote: > > > > golang.org/x/text/unicode/norm > > > > # golang.org/x/sys/unix > > > > vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires > > > > go1.17 or later (-lang was set to go1.16; check go.mod) > > > > vendor/golang.org/x/sys/unix/syscall_linux.go:2255:9: unsafe.Slice > > > > requires go1.17 or later (-lang was set to go1.16; check go.mod) > > > > vendor/golang.org/x/sys/unix/syscall_unix.go:118:7: unsafe.Slice > > > > requires go1.17 or later (-lang was set to go1.16; check go.mod) > > > > vendor/golang.org/x/sys/unix/sysvshm_unix.go:33:7: unsafe.Slice > > > > requires go1.17 or later (-lang was set to go1.16; check go.mod) > > > > zabbix.com/pkg/procfs > > > > # golang.org/x/sys/unix > > > > vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires > > > > go1.17 or later (-lang was set to go1.16; check go.mod) > > > > vendor/golang.org/x/sys/unix/syscall_linux.go:2255:9: unsafe.Slice > > > > requires go1.17 or later (-lang was set to go1.16; check go.mod) > > > > vendor/golang.org/x/sys/unix/syscall_unix.go:118:7: unsafe.Slice > > > > requires go1.17 or later (-lang was set to go1.16; check go.mod) > > > > vendor/golang.org/x/sys/unix/sysvshm_unix.go:33:7: unsafe.Slice > > > > requires go1.17 or later (-lang was set to go1.16; check go.mod) > > This comes from the new version of golang-golang-x-sys, see also [1]. > > > > [1] > > https://tracker.debian.org/news/1384566/accepted-golang-golang-x-sys-010-1 > > bpo111-source-into-bullseye-backports/ > > Unfortunately "golang-golang-x-sys/0.1.0-1" did not fix this FTBFS. > Maybe it is because it ships "go.mod" ? I though golang-x-* upstream has a good track of api stablity when I update that package. But it turns out hmm ... Please see the attached patch.
>From ff8af531f1493f8e5717f76ccdd26d68e58c527a Mon Sep 17 00:00:00 2001 From: Shengjing Zhu <zhushengj...@cambricon.com> Date: Tue, 22 Nov 2022 12:42:11 +0800 Subject: [PATCH] bump go version to 1.17 By running `go mod tidy -go=1.17` And `go mod vendor`, then sync vendor/modules.txt to topdir. golang.org/x/sys 0.1.0 uses unsafe.Slice, and this requires go1.17. See https://github.com/golang/go/issues/46525 --- src/go/go.mod | 27 ++++++++++++++++++++++--- src/go/go.sum | 12 ----------- vendor/modules.txt | 50 +++++++++++++++++++++++++++++++--------------- 3 files changed, 58 insertions(+), 31 deletions(-) diff --git a/src/go/go.mod b/src/go/go.mod index a49e83b..4b1899a 100644 --- a/src/go/go.mod +++ b/src/go/go.mod @@ -1,6 +1,6 @@ module zabbix.com -go 1.16 +go 1.17 require ( git.zabbix.com/ap/plugin-support v0.0.0-20220608100211-35b8bffd7ad0 @@ -15,7 +15,6 @@ require ( github.com/go-ole/go-ole v1.2.4 github.com/go-sql-driver/mysql v1.5.0 github.com/goburrow/modbus v0.1.0 - github.com/goburrow/serial v0.1.0 // indirect github.com/godbus/dbus v4.1.0+incompatible github.com/godror/godror v0.20.1 github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 @@ -25,8 +24,30 @@ require ( github.com/miekg/dns v1.1.43 github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce github.com/omeid/go-yarn v0.0.1 - github.com/pkg/errors v0.9.1 // indirect golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 +) + +require ( + github.com/chromedp/sysutil v1.0.0 // indirect + github.com/go-logfmt/logfmt v0.5.0 // indirect + github.com/goburrow/serial v0.1.0 // indirect + github.com/gobwas/httphead v0.1.0 // indirect + github.com/gobwas/pool v0.2.1 // indirect + github.com/gobwas/ws v1.0.4 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.0.4 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 // indirect + github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/pkg/errors v0.9.1 // indirect + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect + golang.org/x/text v0.3.3 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/yaml.v2 v2.2.8 // indirect diff --git a/src/go/go.sum b/src/go/go.sum index 52f1940..717a47f 100644 --- a/src/go/go.sum +++ b/src/go/go.sum @@ -1,17 +1,5 @@ -git.zabbix.com/ap/plugin-support v0.0.0-20220524072909-7233a93fe116 h1:IGbQPDh/U7UHSM0M4h2k/wdRjyO3zG8uq4Dx+gej4y8= -git.zabbix.com/ap/plugin-support v0.0.0-20220524072909-7233a93fe116/go.mod h1:R3QzQWgpxlA+ddJNkOhsPTcGOVtrR69WS0hXIsnBurY= -git.zabbix.com/ap/plugin-support v0.0.0-20220524082638-7fd18350f78d h1:fv+sfiIPe6U8X0T+vrpI4bBpo5kzYnp9qxNwA30Ay/U= -git.zabbix.com/ap/plugin-support v0.0.0-20220524082638-7fd18350f78d/go.mod h1:R3QzQWgpxlA+ddJNkOhsPTcGOVtrR69WS0hXIsnBurY= -git.zabbix.com/ap/plugin-support v0.0.0-20220525103006-9363aae69d10 h1:zRmgkxzcYbFXMmHgLQ0i3FIOUhqLKK6uCTF/Fdlbl00= -git.zabbix.com/ap/plugin-support v0.0.0-20220525103006-9363aae69d10/go.mod h1:R3QzQWgpxlA+ddJNkOhsPTcGOVtrR69WS0hXIsnBurY= -git.zabbix.com/ap/plugin-support v0.0.0-20220530082632-bd6f3ae15c88 h1:a/w3gm8CKYRkw7gRu6+ufdCAadmWjnh4LNHqQRG3Nu4= -git.zabbix.com/ap/plugin-support v0.0.0-20220530082632-bd6f3ae15c88/go.mod h1:R3QzQWgpxlA+ddJNkOhsPTcGOVtrR69WS0hXIsnBurY= -git.zabbix.com/ap/plugin-support v0.0.0-20220601115430-7e21b812be52 h1:dgk5oJtySHzjkkzfELzM4tkAQbjJO9krfj0GJQMXdS4= -git.zabbix.com/ap/plugin-support v0.0.0-20220601115430-7e21b812be52/go.mod h1:R3QzQWgpxlA+ddJNkOhsPTcGOVtrR69WS0hXIsnBurY= git.zabbix.com/ap/plugin-support v0.0.0-20220608100211-35b8bffd7ad0 h1:VZuQnO95vu+83jsQaY+HGDzx+SoTf8inEZFkZhPvZtM= git.zabbix.com/ap/plugin-support v0.0.0-20220608100211-35b8bffd7ad0/go.mod h1:R3QzQWgpxlA+ddJNkOhsPTcGOVtrR69WS0hXIsnBurY= -git.zabbix.com/ap/plugin-support v0.0.2 h1:ce5LDuqEK4yYrD0g2BNWrSlnr33AVB3QT4G3wmjhDts= -git.zabbix.com/ap/plugin-support v0.0.2/go.mod h1:R3QzQWgpxlA+ddJNkOhsPTcGOVtrR69WS0hXIsnBurY= github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU= github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= diff --git a/vendor/modules.txt b/vendor/modules.txt index 07d2125..8b7c024 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,5 +1,5 @@ # git.zabbix.com/ap/plugin-support v0.0.0-20220608100211-35b8bffd7ad0 -## explicit +## explicit; go 1.17 git.zabbix.com/ap/plugin-support/conf git.zabbix.com/ap/plugin-support/log git.zabbix.com/ap/plugin-support/metric @@ -13,10 +13,10 @@ git.zabbix.com/ap/plugin-support/zbxerr ## explicit github.com/BurntSushi/locker # github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 -## explicit +## explicit; go 1.13 github.com/cakturk/go-netstat/netstat # github.com/chromedp/cdproto v0.0.0-20210104223854-2cc87dae3ee3 -## explicit +## explicit; go 1.14 github.com/chromedp/cdproto github.com/chromedp/cdproto/accessibility github.com/chromedp/cdproto/animation @@ -63,11 +63,12 @@ github.com/chromedp/cdproto/tracing github.com/chromedp/cdproto/webaudio github.com/chromedp/cdproto/webauthn # github.com/chromedp/chromedp v0.6.0 -## explicit +## explicit; go 1.13 github.com/chromedp/chromedp github.com/chromedp/chromedp/device github.com/chromedp/chromedp/kb # github.com/chromedp/sysutil v1.0.0 +## explicit; go 1.15 github.com/chromedp/sysutil # github.com/dustin/gomemcached v0.0.0-20160817010731-a2284a01c143 ## explicit @@ -78,19 +79,20 @@ github.com/dustin/gomemcached/server github.com/eclipse/paho.mqtt.golang github.com/eclipse/paho.mqtt.golang/packets # github.com/fsnotify/fsnotify v1.4.9 -## explicit +## explicit; go 1.13 github.com/fsnotify/fsnotify # github.com/go-ldap/ldap v3.0.3+incompatible ## explicit github.com/go-ldap/ldap # github.com/go-logfmt/logfmt v0.5.0 +## explicit; go 1.13 github.com/go-logfmt/logfmt # github.com/go-ole/go-ole v1.2.4 -## explicit +## explicit; go 1.12 github.com/go-ole/go-ole github.com/go-ole/go-ole/oleutil # github.com/go-sql-driver/mysql v1.5.0 -## explicit +## explicit; go 1.10 github.com/go-sql-driver/mysql # github.com/goburrow/modbus v0.1.0 ## explicit @@ -99,83 +101,98 @@ github.com/goburrow/modbus ## explicit github.com/goburrow/serial # github.com/gobwas/httphead v0.1.0 +## explicit; go 1.15 github.com/gobwas/httphead # github.com/gobwas/pool v0.2.1 +## explicit github.com/gobwas/pool github.com/gobwas/pool/internal/pmath github.com/gobwas/pool/pbufio github.com/gobwas/pool/pbytes # github.com/gobwas/ws v1.0.4 +## explicit github.com/gobwas/ws github.com/gobwas/ws/wsutil # github.com/godbus/dbus v4.1.0+incompatible ## explicit github.com/godbus/dbus # github.com/godror/godror v0.20.1 -## explicit +## explicit; go 1.13 github.com/godror/godror github.com/godror/godror/dsn github.com/godror/godror/odpi/embed github.com/godror/godror/odpi/include github.com/godror/godror/odpi/src # github.com/jackc/chunkreader/v2 v2.0.1 +## explicit; go 1.12 github.com/jackc/chunkreader/v2 # github.com/jackc/pgconn v1.6.5-0.20200905181414-0d4f029683fc +## explicit; go 1.12 github.com/jackc/pgconn github.com/jackc/pgconn/internal/ctxwatch github.com/jackc/pgconn/stmtcache # github.com/jackc/pgio v1.0.0 +## explicit; go 1.12 github.com/jackc/pgio # github.com/jackc/pgpassfile v1.0.0 +## explicit; go 1.12 github.com/jackc/pgpassfile # github.com/jackc/pgproto3/v2 v2.0.4 +## explicit; go 1.12 github.com/jackc/pgproto3/v2 # github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b +## explicit; go 1.14 github.com/jackc/pgservicefile # github.com/jackc/pgtype v1.4.3-0.20200905161353-e7d2b057a716 +## explicit; go 1.12 github.com/jackc/pgtype # github.com/jackc/pgx/v4 v4.8.2-0.20200910143026-040df1ccef85 -## explicit +## explicit; go 1.12 github.com/jackc/pgx/v4 github.com/jackc/pgx/v4/internal/sanitize github.com/jackc/pgx/v4/pgxpool github.com/jackc/pgx/v4/stdlib # github.com/jackc/puddle v1.1.2-0.20200821025810-91d0159cc97a +## explicit; go 1.12 github.com/jackc/puddle # github.com/josharian/intern v1.0.0 +## explicit; go 1.5 github.com/josharian/intern # github.com/mailru/easyjson v0.7.6 +## explicit; go 1.12 github.com/mailru/easyjson github.com/mailru/easyjson/buffer github.com/mailru/easyjson/jlexer github.com/mailru/easyjson/jwriter # github.com/mattn/go-sqlite3 v1.14.8 -## explicit +## explicit; go 1.12 github.com/mattn/go-sqlite3 # github.com/mediocregopher/radix/v3 v3.5.0 -## explicit +## explicit; go 1.13 github.com/mediocregopher/radix/v3 github.com/mediocregopher/radix/v3/internal/bytesutil github.com/mediocregopher/radix/v3/resp github.com/mediocregopher/radix/v3/resp/resp2 github.com/mediocregopher/radix/v3/trace # github.com/memcachier/mc/v3 v3.0.1 -## explicit +## explicit; go 1.12 github.com/memcachier/mc/v3 # github.com/miekg/dns v1.1.43 -## explicit +## explicit; go 1.14 github.com/miekg/dns # github.com/natefinch/npipe v0.0.0-20160621034901-c1b8fa8bdcce ## explicit github.com/natefinch/npipe # github.com/omeid/go-yarn v0.0.1 -## explicit +## explicit; go 1.13 github.com/omeid/go-yarn # github.com/pkg/errors v0.9.1 ## explicit # golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 +## explicit; go 1.11 golang.org/x/crypto/pbkdf2 # golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 +## explicit; go 1.11 golang.org/x/net/bpf golang.org/x/net/internal/iana golang.org/x/net/internal/socket @@ -185,7 +202,7 @@ golang.org/x/net/ipv6 golang.org/x/net/proxy golang.org/x/net/websocket # golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 -## explicit +## explicit; go 1.17 golang.org/x/sys/internal/unsafeheader golang.org/x/sys/unix golang.org/x/sys/windows @@ -194,6 +211,7 @@ golang.org/x/sys/windows/svc golang.org/x/sys/windows/svc/eventlog golang.org/x/sys/windows/svc/mgr # golang.org/x/text v0.3.3 +## explicit; go 1.11 golang.org/x/text/cases golang.org/x/text/internal golang.org/x/text/internal/language @@ -208,7 +226,7 @@ golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm golang.org/x/text/width # golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 -## explicit +## explicit; go 1.11 golang.org/x/xerrors golang.org/x/xerrors/internal # gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d -- 2.35.1
