dev-go/net: update to v0.33.0
BUG=b/406588189
TEST=presubmit
RELEASE_NOTE=Update dev-go/net to v0.33.0. This fixed CVE-2023-45288.
cos-patch: security-high
Change-Id: I72b158a42d2fa326c2e6af336ab48234a4b5125b
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/97339
Reviewed-by: Anil Altinay <aaltinay@google.com>
Main-Branch-Verified: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/dev-go/net/Manifest b/dev-go/net/Manifest
index 899f540..d5318d6 100644
--- a/dev-go/net/Manifest
+++ b/dev-go/net/Manifest
@@ -1 +1 @@
-DIST go.googlesource.com-net-v0.7.0.tar.gz 1258454 BLAKE2B ce7f92441b57932d97d10174282f34bb64861a384e2da58f4e71539fa009972f27e935bfb4716416d015ea6a071f0b779e0a514ea1300fc2621d4bdcc18a4db0 SHA512 a82ae0846d5dbc4be290e9e7fc2c59b333fba74c45a18e3da1455a52ad207d43eef695bb172f9078cafaf2fcb3bb50f9914c2d9cf1cda42601d8c13d5104a4d5
+DIST go.googlesource.com-net-v0.33.0.tar.gz 1487458 BLAKE2B 22ebe751cca85e3a5da670df9104345823b416a784afab4bea99079735a81052667b15375000764942396aea29071fbe8a46321d98a281314764de6eea48cb58 SHA512 f487c6d617c84524e89e57ac1da6ffc4ea10ce9bf874e0768a7ddd49a2bd8446ea5f4dbd0cd4cc9680d3f247ea4dee526494de83b4457d933c1a58d97a05498a
diff --git a/dev-go/net/net-0.33.0-r1.ebuild b/dev-go/net/net-0.33.0-r1.ebuild
new file mode 120000
index 0000000..ef03a91
--- /dev/null
+++ b/dev-go/net/net-0.33.0-r1.ebuild
@@ -0,0 +1 @@
+net-0.33.0.ebuild
\ No newline at end of file
diff --git a/dev-go/net/net-0.7.0.ebuild b/dev-go/net/net-0.33.0.ebuild
similarity index 74%
rename from dev-go/net/net-0.7.0.ebuild
rename to dev-go/net/net-0.33.0.ebuild
index 5785207..2b3cc9f 100644
--- a/dev-go/net/net-0.7.0.ebuild
+++ b/dev-go/net/net-0.33.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 The Chromium OS Authors. All rights reserved.
+# Copyright 2023 The ChromiumOS Authors
# Distributed under the terms of the GNU General Public License v2.
EAPI=7
@@ -56,12 +56,11 @@
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"
+ local datadir="golang.org/x/net/publicsuffix/data"
+ insinto "/usr/lib/gopath/src/${datadir}"
+ local file
+ while read -d $'\0' -r file ; do
+ einfo "${file}"
+ doins "${file}"
+ done < <(find "${S}/src/${datadir}" -maxdepth 1 ! -type d -print0)
}
diff --git a/dev-go/net/net-0.7.0-r1.ebuild b/dev-go/net/net-0.7.0-r1.ebuild
deleted file mode 120000
index 9e90723..0000000
--- a/dev-go/net/net-0.7.0-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-net-0.7.0.ebuild
\ No newline at end of file
