From 9e152f6f8c4ce9125060d757e651cc4fea9ed8ab Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 2 Jan 2023 14:54:45 +0100 Subject: [PATCH 1/2] Update go-serial Fix Windows crash when the board is disconnected while enumerating USB. See also: https://github.com/bugst/go-serial/issues/138 https://github.com/bugst/go-serial/issues/153 --- .../go/golang.org/x/sys/internal/unsafeheader.dep.yml | 6 +++--- .../serial-discovery/go/golang.org/x/sys/unix.dep.yml | 6 +++--- go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.licenses/serial-discovery/go/golang.org/x/sys/internal/unsafeheader.dep.yml b/.licenses/serial-discovery/go/golang.org/x/sys/internal/unsafeheader.dep.yml index 0ee7231..6b0d38c 100644 --- a/.licenses/serial-discovery/go/golang.org/x/sys/internal/unsafeheader.dep.yml +++ b/.licenses/serial-discovery/go/golang.org/x/sys/internal/unsafeheader.dep.yml @@ -1,13 +1,13 @@ --- name: golang.org/x/sys/internal/unsafeheader -version: v0.0.0-20210823070655-63515b42dcdf +version: v0.0.0-20220829200755-d48e67d00261 type: go summary: Package unsafeheader contains header declarations for the Go runtime's slice and string implementations. homepage: https://pkg.go.dev/golang.org/x/sys/internal/unsafeheader license: bsd-3-clause licenses: -- sources: sys@v0.0.0-20210823070655-63515b42dcdf/LICENSE +- sources: sys@v0.0.0-20220829200755-d48e67d00261/LICENSE text: | Copyright (c) 2009 The Go Authors. All rights reserved. @@ -36,7 +36,7 @@ licenses: THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- sources: sys@v0.0.0-20210823070655-63515b42dcdf/PATENTS +- sources: sys@v0.0.0-20220829200755-d48e67d00261/PATENTS text: | Additional IP Rights Grant (Patents) diff --git a/.licenses/serial-discovery/go/golang.org/x/sys/unix.dep.yml b/.licenses/serial-discovery/go/golang.org/x/sys/unix.dep.yml index b33445f..9e55c61 100644 --- a/.licenses/serial-discovery/go/golang.org/x/sys/unix.dep.yml +++ b/.licenses/serial-discovery/go/golang.org/x/sys/unix.dep.yml @@ -1,12 +1,12 @@ --- name: golang.org/x/sys/unix -version: v0.0.0-20210823070655-63515b42dcdf +version: v0.0.0-20220829200755-d48e67d00261 type: go summary: Package unix contains an interface to the low-level operating system primitives. homepage: https://pkg.go.dev/golang.org/x/sys/unix license: bsd-3-clause licenses: -- sources: sys@v0.0.0-20210823070655-63515b42dcdf/LICENSE +- sources: sys@v0.0.0-20220829200755-d48e67d00261/LICENSE text: | Copyright (c) 2009 The Go Authors. All rights reserved. @@ -35,7 +35,7 @@ licenses: THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- sources: sys@v0.0.0-20210823070655-63515b42dcdf/PATENTS +- sources: sys@v0.0.0-20220829200755-d48e67d00261/PATENTS text: | Additional IP Rights Grant (Patents) diff --git a/go.mod b/go.mod index e68f0cc..60be681 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/arduino/serial-discovery -replace go.bug.st/serial => github.com/cmaglie/go-serial v0.0.0-20221214153202-f7509ff50314 +replace go.bug.st/serial => github.com/cmaglie/go-serial v0.0.0-20230102134456-e6cff1a986e7 require ( github.com/arduino/go-properties-orderedmap v1.6.0 github.com/arduino/pluggable-discovery-protocol-handler/v2 v2.0.2 github.com/s-urbaniak/uevent v1.0.1 go.bug.st/serial v1.3.5 - golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf + golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 ) go 1.16 diff --git a/go.sum b/go.sum index 8384515..f4bfeac 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR 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= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cmaglie/go-serial v0.0.0-20221214153202-f7509ff50314 h1:ntFIa+TpluwJoXBrre7umEs4PE3uBgBgCwZd24boGL4= -github.com/cmaglie/go-serial v0.0.0-20221214153202-f7509ff50314/go.mod h1:z8CesKorE90Qr/oRSJiEuvzYRKol9r/anJZEb5kt304= +github.com/cmaglie/go-serial v0.0.0-20230102134456-e6cff1a986e7 h1:+l8KL+qE4YwP6gfCxEbY1g/tBh4RtZXXPRiwM0rW3e0= +github.com/cmaglie/go-serial v0.0.0-20230102134456-e6cff1a986e7/go.mod h1:UABfsluHAiaNI+La2iESysd9Vetq7VRdpxvjx7CmmOE= github.com/cmaglie/pb v1.0.27/go.mod h1:GilkKZMXYjBA4NxItWFfO+lwkp59PLHQ+IOW/b/kmZI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -470,8 +470,8 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= +golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From a3112d36d31463661af2faafe1b1e226d81c3594 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 3 Jan 2023 23:43:04 +0100 Subject: [PATCH 2/2] Updated go-serial to 1.5.0 --- .licenses/serial-discovery/go/go.bug.st/serial.dep.yml | 2 +- .../serial-discovery/go/go.bug.st/serial/enumerator.dep.yml | 6 +++--- .../serial-discovery/go/go.bug.st/serial/unixutils.dep.yml | 6 +++--- go.mod | 4 +--- go.sum | 6 ++++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.licenses/serial-discovery/go/go.bug.st/serial.dep.yml b/.licenses/serial-discovery/go/go.bug.st/serial.dep.yml index 3d11c35..33ef8e6 100644 --- a/.licenses/serial-discovery/go/go.bug.st/serial.dep.yml +++ b/.licenses/serial-discovery/go/go.bug.st/serial.dep.yml @@ -1,6 +1,6 @@ --- name: go.bug.st/serial -version: v1.3.5 +version: v1.5.0 type: go summary: Package serial is a cross-platform serial library for the go language. homepage: https://pkg.go.dev/go.bug.st/serial diff --git a/.licenses/serial-discovery/go/go.bug.st/serial/enumerator.dep.yml b/.licenses/serial-discovery/go/go.bug.st/serial/enumerator.dep.yml index ac716fe..fbb6ff9 100644 --- a/.licenses/serial-discovery/go/go.bug.st/serial/enumerator.dep.yml +++ b/.licenses/serial-discovery/go/go.bug.st/serial/enumerator.dep.yml @@ -1,13 +1,13 @@ --- name: go.bug.st/serial/enumerator -version: v1.3.5 +version: v1.5.0 type: go summary: Package enumerator is a golang cross-platform library for USB serial port discovery. homepage: https://pkg.go.dev/go.bug.st/serial/enumerator license: bsd-3-clause licenses: -- sources: serial@v1.3.5/LICENSE +- sources: serial@v1.5.0/LICENSE text: |2+ Copyright (c) 2014-2021, Cristian Maglie. @@ -42,7 +42,7 @@ licenses: ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- sources: serial@v1.3.5/README.md +- sources: serial@v1.5.0/README.md text: |- The software is release under a [BSD 3-clause license] diff --git a/.licenses/serial-discovery/go/go.bug.st/serial/unixutils.dep.yml b/.licenses/serial-discovery/go/go.bug.st/serial/unixutils.dep.yml index ec4b51a..24cd49b 100644 --- a/.licenses/serial-discovery/go/go.bug.st/serial/unixutils.dep.yml +++ b/.licenses/serial-discovery/go/go.bug.st/serial/unixutils.dep.yml @@ -1,12 +1,12 @@ --- name: go.bug.st/serial/unixutils -version: v1.3.5 +version: v1.5.0 type: go summary: homepage: https://pkg.go.dev/go.bug.st/serial/unixutils license: bsd-3-clause licenses: -- sources: serial@v1.3.5/LICENSE +- sources: serial@v1.5.0/LICENSE text: |2+ Copyright (c) 2014-2021, Cristian Maglie. @@ -41,7 +41,7 @@ licenses: ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- sources: serial@v1.3.5/README.md +- sources: serial@v1.5.0/README.md text: |- The software is release under a [BSD 3-clause license] diff --git a/go.mod b/go.mod index 60be681..2ac4266 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,10 @@ module github.com/arduino/serial-discovery -replace go.bug.st/serial => github.com/cmaglie/go-serial v0.0.0-20230102134456-e6cff1a986e7 - require ( github.com/arduino/go-properties-orderedmap v1.6.0 github.com/arduino/pluggable-discovery-protocol-handler/v2 v2.0.2 github.com/s-urbaniak/uevent v1.0.1 - go.bug.st/serial v1.3.5 + go.bug.st/serial v1.5.0 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 ) diff --git a/go.sum b/go.sum index f4bfeac..7e8896f 100644 --- a/go.sum +++ b/go.sum @@ -66,8 +66,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR 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= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cmaglie/go-serial v0.0.0-20230102134456-e6cff1a986e7 h1:+l8KL+qE4YwP6gfCxEbY1g/tBh4RtZXXPRiwM0rW3e0= -github.com/cmaglie/go-serial v0.0.0-20230102134456-e6cff1a986e7/go.mod h1:UABfsluHAiaNI+La2iESysd9Vetq7VRdpxvjx7CmmOE= github.com/cmaglie/pb v1.0.27/go.mod h1:GilkKZMXYjBA4NxItWFfO+lwkp59PLHQ+IOW/b/kmZI= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -303,6 +301,9 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.bug.st/cleanup v1.0.0/go.mod h1:EqVmTg2IBk4znLbPD28xne3abjsJftMdqqJEjhn70bk= go.bug.st/downloader/v2 v2.1.1/go.mod h1:VZW2V1iGKV8rJL2ZEGIDzzBeKowYv34AedJz13RzVII= go.bug.st/relaxed-semver v0.0.0-20190922224835-391e10178d18/go.mod h1:Cx1VqMtEhE9pIkEyUj3LVVVPkv89dgW8aCKrRPDR/uE= +go.bug.st/serial v1.3.2/go.mod h1:jDkjqASf/qSjmaOxHSHljwUQ6eHo/ZX/bxJLQqSlvZg= +go.bug.st/serial v1.5.0 h1:ThuUkHpOEmCVXxGEfpoExjQCS2WBVV4ZcUKVYInM9T4= +go.bug.st/serial v1.5.0/go.mod h1:UABfsluHAiaNI+La2iESysd9Vetq7VRdpxvjx7CmmOE= go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45/go.mod h1:dRSl/CVCTf56CkXgJMDOdSwNfo2g1orOGE/gBGdvjZw= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= @@ -470,6 +471,7 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=