Skip to content

Commit 31396fa

Browse files
authored
Update toolkit's gonum to resolve CVE-2024-24792 in image package (#13616)
1 parent 81f6c4a commit 31396fa

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

.github/workflows/go-test-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*]
1111

1212
env:
13-
EXPECTED_GO_VERSION: "1.21"
13+
EXPECTED_GO_VERSION: "1.23"
1414

1515
jobs:
1616
build:

toolkit/docs/building/prerequisites-ubuntu.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ sudo ./toolkit/docs/building/prerequisites-ubuntu.sh
1212
# Also supported is:
1313
# make -C toolkit install-prereqs
1414

15-
# Fix go 1.21 link
16-
sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
17-
sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
15+
# Fix go 1.23 link
16+
sudo ln -vsf /usr/lib/go-1.23/bin/go /usr/bin/go
17+
sudo ln -vsf /usr/lib/go-1.23/bin/gofmt /usr/bin/gofmt
1818

1919
# Install and configure Docker.
2020
curl -fsSL https://get.docker.com -o get-docker.sh

toolkit/docs/building/prerequisites-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ apt install -y \
1212
gawk \
1313
genisoimage \
1414
git \
15-
golang-1.21-go \
15+
golang-1.23-go \
1616
jq \
1717
make \
1818
openssl \

toolkit/tools/go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/microsoft/azurelinux/toolkit/tools
22

3-
go 1.21
3+
go 1.23.0
44

5-
toolchain go1.21.6
5+
toolchain go1.24.2
66

77
require (
88
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0
@@ -23,7 +23,7 @@ require (
2323
github.com/stretchr/testify v1.9.0
2424
github.com/ulikunitz/xz v0.5.10
2525
golang.org/x/sys v0.28.0
26-
gonum.org/v1/gonum v0.15.0
26+
gonum.org/v1/gonum v0.16.0
2727
gopkg.in/alecthomas/kingpin.v2 v2.2.6
2828
gopkg.in/ini.v1 v1.67.0
2929
gopkg.in/yaml.v3 v3.0.1
@@ -49,7 +49,6 @@ require (
4949
github.com/rivo/uniseg v0.1.0 // indirect
5050
github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9 // indirect
5151
golang.org/x/crypto v0.31.0 // indirect
52-
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
5352
golang.org/x/net v0.33.0 // indirect
54-
golang.org/x/text v0.21.0 // indirect
53+
golang.org/x/text v0.23.0 // indirect
5554
)

toolkit/tools/go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9 h1:w8V9v0qVympSF6Gj
9292
github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
9393
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
9494
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
95-
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
96-
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
9795
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
9896
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
9997
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -107,11 +105,11 @@ golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
107105
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
108106
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
109107
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
110-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
111-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
108+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
109+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
112110
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
113-
gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ=
114-
gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo=
111+
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
112+
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
115113
gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
116114
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
117115
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)