dev-lang/go, dev-go/net: Add fixes for CVE-2022-41723 and CVE-2022-41725.
This CL is doing the following:
- Updating Go toolchain to v1.20.1
- Updating dev-go/net to v0.7.0
These changes are needed to fix CVE-2022-41723 and CVE-2022-41725.
BUG=b/270401364, b/270400767
TEST=presubmit
RELEASE_NOTE=Updated dev-lang/go to v1.20.1. Updated dev-go/net to
v0.7.0. This resolves CVE-2022-41723 and CVE-2022-41725.
Change-Id: Iacef66be801e1bfb49539869a18fcc814203af99
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/43387
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
diff --git a/dev-go/net/Manifest b/dev-go/net/Manifest
index c244c93..899f540 100644
--- a/dev-go/net/Manifest
+++ b/dev-go/net/Manifest
@@ -1 +1 @@
-DIST go.googlesource.com-net-4f30a5c0130f199e0dfd54e9de49f9367cabf1ad.tar.gz 1251344 BLAKE2B f2841414f8758ccb2fe58d4ac23cc7e421e2642c7207dc3314d309bfdd0b924f34d6c82eb16b8a1f8b923823cd804309b219a3d44aea42a0509603de26c431dc SHA512 4afde81c3a88ebdae7e07425f9b6f309de40e25232aab2ff969bc541ab1f75024e6fd29358547f2f18d9dffe478c382685f895c2fd78cf638360faa0fa01ef5b
+DIST go.googlesource.com-net-v0.7.0.tar.gz 1258454 BLAKE2B ce7f92441b57932d97d10174282f34bb64861a384e2da58f4e71539fa009972f27e935bfb4716416d015ea6a071f0b779e0a514ea1300fc2621d4bdcc18a4db0 SHA512 a82ae0846d5dbc4be290e9e7fc2c59b333fba74c45a18e3da1455a52ad207d43eef695bb172f9078cafaf2fcb3bb50f9914c2d9cf1cda42601d8c13d5104a4d5
diff --git a/dev-go/net/net-0.0.1-r13.ebuild b/dev-go/net/net-0.0.1-r13.ebuild
deleted file mode 120000
index 483278f..0000000
--- a/dev-go/net/net-0.0.1-r13.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-net-0.0.1.ebuild
\ No newline at end of file
diff --git a/dev-go/net/net-0.7.0-r1.ebuild b/dev-go/net/net-0.7.0-r1.ebuild
new file mode 120000
index 0000000..9e90723
--- /dev/null
+++ b/dev-go/net/net-0.7.0-r1.ebuild
@@ -0,0 +1 @@
+net-0.7.0.ebuild
\ No newline at end of file
diff --git a/dev-go/net/net-0.0.1.ebuild b/dev-go/net/net-0.7.0.ebuild
similarity index 68%
rename from dev-go/net/net-0.0.1.ebuild
rename to dev-go/net/net-0.7.0.ebuild
index 48f9479..5785207 100644
--- a/dev-go/net/net-0.0.1.ebuild
+++ b/dev-go/net/net-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022 The Chromium OS Authors. All rights reserved.
+# Copyright 2023 The Chromium OS Authors. All rights reserved.
# Distributed under the terms of the GNU General Public License v2.
EAPI=7
-CROS_GO_SOURCE="go.googlesource.com/net:golang.org/x/net 4f30a5c0130f199e0dfd54e9de49f9367cabf1ad"
+CROS_GO_SOURCE="go.googlesource.com/net:golang.org/x/net v${PV}"
CROS_GO_PACKAGES=(
"golang.org/x/net/bpf"
@@ -53,3 +53,15 @@
dev-go/go-sys
"
RDEPEND="dev-go/text"
+
+src_install() {
+ cros-go_src_install
+ # Go code inside publicsuffix directory
+ # depends on data that is present inside
+ # the `data` dir. Below lines are installing
+ # the required data into go_path for use.
+ local go_path="/usr/lib/gopath"
+ local publicsuffix_path="golang.org/x/net/publicsuffix"
+ insinto "${go_path}/src/${publicsuffix_path}"
+ doins -r "${S}/src/${publicsuffix_path}/data"
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 80e40e9..968aec4 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,2 +1,2 @@
DIST go1.17.13-bootstrap-20230206.tar.gz 22206518 BLAKE2B b227e5197c6466e7dc4594646a6b5f7e2f5e8bc0d44b8ab45b488f5249eb64ff736fccf0e0070d6685a08361e1b3dd1a2ee7050df6395bec519a7ae7dca78630 SHA512 2820bdd679fdb5e37d4c601b26c246bab23d4e8e1b226ac37c38e90a68b693e877bff944275eb25e3296ee772e7b40ef7d71dd49cca524df4cb8e721bfb50c33
-DIST go1.20.src.tar.gz 26163076 BLAKE2B 54a573e53a2bdc0f62e29b4604e8fffbf6228839fffd58968cc0f9fbc343d2a0825361ae4a0c11f146b2e8fbe81439bf194cececa3d2fbf495d97997eab2e8ce SHA512 6b59af1094fafbf2dba6b26a5da0c6363d87b0997dd399cde40d9150e00bedd15100c0c8c12e31cfe7e153d2ea45b403764b2d83479d1cda74077179c8cca4d3
+DIST go1.20.1.src.tar.gz 26172675 BLAKE2B d6daccbebfe3dc014675499ad319eb9a6ae1382feaa42e7fe80d2e4a49bd7b3eccc3144f7cbd18c7c478e557d0e512eb1030d654a894929803838f192d551214 SHA512 57453419fafac8af10f4037b0162326555aab0e87cd1d246d5e977246c075a0504c23022d5c14bfcae9ca1c3250652ddd7c6fcf2209a926525e5f7d0d40ab52d
diff --git a/dev-lang/go/go-1.20-r1.ebuild b/dev-lang/go/go-1.20-r1.ebuild
deleted file mode 120000
index e1007ac..0000000
--- a/dev-lang/go/go-1.20-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-go-1.20.ebuild
\ No newline at end of file
diff --git a/dev-lang/go/go-1.20.1-r1.ebuild b/dev-lang/go/go-1.20.1-r1.ebuild
new file mode 120000
index 0000000..f1fd7eb
--- /dev/null
+++ b/dev-lang/go/go-1.20.1-r1.ebuild
@@ -0,0 +1 @@
+go-1.20.1.ebuild
\ No newline at end of file
diff --git a/dev-lang/go/go-1.20.ebuild b/dev-lang/go/go-1.20.1.ebuild
similarity index 100%
rename from dev-lang/go/go-1.20.ebuild
rename to dev-lang/go/go-1.20.1.ebuild
