Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 9F72284E64
	for <pkgsrc-changes@NetBSD.org>; Fri,  8 Sep 2023 13:06:30 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id VsP6LAzxdyEo for <pkgsrc-changes@netbsd.org>;
	Fri,  8 Sep 2023 13:06:29 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id A2E8084CE8
	for <pkgsrc-changes@NetBSD.org>; Fri,  8 Sep 2023 13:06:29 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 9C32BFBDB; Fri,  8 Sep 2023 13:06:29 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1694178389241080"
MIME-Version: 1.0
Date: Fri, 8 Sep 2023 13:06:29 +0000
From: "Benny Siegert" <bsiegert@netbsd.org>
Subject: CVS commit: pkgsrc/lang
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: bsiegert@netbsd.org
X-Mailer: log_accum
Message-Id: <20230908130629.9C32BFBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1694178389241080
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	bsiegert
Date:		Fri Sep  8 13:06:29 UTC 2023

Modified Files:
	pkgsrc/lang/go: version.mk
	pkgsrc/lang/go121: PLIST distinfo

Log Message:
go121: update to 1.21.1 (security)

This minor releases includes 4 security fixes following the security policy:

- cmd/go: go.mod toolchain directive allows arbitrary execution

  The go.mod toolchain directive, introduced in Go 1.21, could be leveraged to
  execute scripts and binaries relative to the root of the module when the
  "go" command was executed within the module. This applies to modules
  downloaded using the "go" command from the module proxy, as well as modules
  downloaded directly using VCS software.

  Thanks to Juho Nurminen of Mattermost for reporting this issue.

  This is CVE-2023-39320 and Go issue https://go.dev/issue/62198.

- html/template: improper handling of HTML-like comments within script
  contexts

  The html/template package did not properly handle HMTL-like "<!--" and "-->"
  comment tokens, nor hashbang "#!" comment tokens, in <script> contexts. This
  may cause the template parser to improperly interpret the contents of
  <script> contexts, causing actions to be improperly escaped. This could be
  leveraged to perform an XSS attack.

  Thanks to Takeshi Kaneko (GMO Cybersecurity by Ierae, Inc.) for reporting
  this issue.

  This is CVE-2023-39318 and Go issue https://go.dev/issue/62196.

- html/template: improper handling of special tags within script contexts

  The html/template package did not apply the proper rules for handling
  occurrences of "<script", "<!--", and "</script" within JS literals in
  <script> contexts.  This may cause the template parser to improperly
  consider script contexts to be terminated early, causing actions to be
  improperly escaped. This could be leveraged to perform an XSS attack.

  Thanks to Takeshi Kaneko (GMO Cybersecurity by Ierae, Inc.) for reporting
  this issue.

  This is CVE-2023-39319 and Go issue https://go.dev/issue/62197.

- crypto/tls: panic when processing post-handshake message on QUIC connections

  Processing an incomplete post-handshake message for a QUIC connection caused
  a panic.

  Thanks to Marten Seemann for reporting this issue.

  This is CVE-2023-39321 and CVE-2023-39322 and Go issue
  https://go.dev/issue/62266.

View the release notes for more information:
https://go.dev/doc/devel/release#go1.21.1


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 pkgsrc/lang/go/version.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/go121/PLIST pkgsrc/lang/go121/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1694178389241080
Content-Disposition: inline
Content-Length: 6588
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/go/version.mk
diff -u pkgsrc/lang/go/version.mk:1.186 pkgsrc/lang/go/version.mk:1.187
--- pkgsrc/lang/go/version.mk:1.186	Sat Aug 26 16:35:29 2023
+++ pkgsrc/lang/go/version.mk	Fri Sep  8 13:06:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.186 2023/08/26 16:35:29 bsiegert Exp $
+# $NetBSD: version.mk,v 1.187 2023/09/08 13:06:29 bsiegert Exp $
 
 #
 # If bsd.prefs.mk is included before go-package.mk in a package, then this
@@ -6,7 +6,7 @@
 #
 .include "go-vars.mk"
 
-GO121_VERSION=	1.21.0
+GO121_VERSION=	1.21.1
 GO120_VERSION=	1.20.7
 GO119_VERSION=	1.19.12
 GO118_VERSION=	1.18.10

Index: pkgsrc/lang/go121/PLIST
diff -u pkgsrc/lang/go121/PLIST:1.1 pkgsrc/lang/go121/PLIST:1.2
--- pkgsrc/lang/go121/PLIST:1.1	Sat Aug 26 16:35:29 2023
+++ pkgsrc/lang/go121/PLIST	Fri Sep  8 13:06:29 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/08/26 16:35:29 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/09/08 13:06:29 bsiegert Exp $
 bin/go${GOVERSSUFFIX}
 bin/gofmt${GOVERSSUFFIX}
 go121/CONTRIBUTING.md
@@ -225,9 +225,9 @@ go121/src/clean.rc
 go121/src/cmd/README.vendor
 go121/src/cmd/addr2line/addr2line_test.go
 go121/src/cmd/addr2line/main.go
-go121/src/cmd/api/api.go
 go121/src/cmd/api/api_test.go
 go121/src/cmd/api/boring_test.go
+go121/src/cmd/api/main_test.go
 go121/src/cmd/api/testdata/src/issue21181/dep/p.go
 go121/src/cmd/api/testdata/src/issue21181/dep/p_amd64.go
 go121/src/cmd/api/testdata/src/issue21181/indirect/p.go
@@ -538,7 +538,6 @@ go121/src/cmd/cgo/internal/testplugin/pl
 go121/src/cmd/cgo/internal/testplugin/testdata/checkdwarf/main.go
 go121/src/cmd/cgo/internal/testplugin/testdata/common/common.go
 go121/src/cmd/cgo/internal/testplugin/testdata/forkexec/main.go
-go121/src/cmd/cgo/internal/testplugin/testdata/generic/plugin.go
 go121/src/cmd/cgo/internal/testplugin/testdata/host/host.go
 go121/src/cmd/cgo/internal/testplugin/testdata/iface/main.go
 go121/src/cmd/cgo/internal/testplugin/testdata/iface_a/a.go
@@ -573,6 +572,7 @@ go121/src/cmd/cgo/internal/testplugin/te
 go121/src/cmd/cgo/internal/testplugin/testdata/issue53989/main.go
 go121/src/cmd/cgo/internal/testplugin/testdata/issue53989/p/p.go
 go121/src/cmd/cgo/internal/testplugin/testdata/issue53989/plugin.go
+go121/src/cmd/cgo/internal/testplugin/testdata/mangle/plugin.go
 go121/src/cmd/cgo/internal/testplugin/testdata/method/main.go
 go121/src/cmd/cgo/internal/testplugin/testdata/method/plugin.go
 go121/src/cmd/cgo/internal/testplugin/testdata/method2/main.go
@@ -1683,6 +1683,8 @@ go121/src/cmd/go/internal/test/genflags.
 go121/src/cmd/go/internal/test/internal/genflags/testflag.go
 go121/src/cmd/go/internal/test/internal/genflags/vetflag.go
 go121/src/cmd/go/internal/test/test.go
+go121/src/cmd/go/internal/test/test_nonunix.go
+go121/src/cmd/go/internal/test/test_unix.go
 go121/src/cmd/go/internal/test/testflag.go
 go121/src/cmd/go/internal/tool/tool.go
 go121/src/cmd/go/internal/toolchain/exec.go
@@ -2188,6 +2190,7 @@ go121/src/cmd/go/testdata/script/gopath_
 go121/src/cmd/go/testdata/script/gopath_std_vendor.txt
 go121/src/cmd/go/testdata/script/gopath_vendor_dup_err.txt
 go121/src/cmd/go/testdata/script/goroot_executable.txt
+go121/src/cmd/go/testdata/script/goroot_executable_trimpath.txt
 go121/src/cmd/go/testdata/script/gotoolchain_local.txt
 go121/src/cmd/go/testdata/script/gotoolchain_loop.txt
 go121/src/cmd/go/testdata/script/gotoolchain_modcmds.txt
@@ -2361,6 +2364,7 @@ go121/src/cmd/go/testdata/script/mod_get
 go121/src/cmd/go/testdata/script/mod_get_hash.txt
 go121/src/cmd/go/testdata/script/mod_get_incompatible.txt
 go121/src/cmd/go/testdata/script/mod_get_indirect.txt
+go121/src/cmd/go/testdata/script/mod_get_insecure_redirect.txt
 go121/src/cmd/go/testdata/script/mod_get_issue37438.txt
 go121/src/cmd/go/testdata/script/mod_get_issue47979.txt
 go121/src/cmd/go/testdata/script/mod_get_issue48511.txt
@@ -2575,6 +2579,7 @@ go121/src/cmd/go/testdata/script/mod_tid
 go121/src/cmd/go/testdata/script/mod_tidy_version.txt
 go121/src/cmd/go/testdata/script/mod_tidy_version_tooold.txt
 go121/src/cmd/go/testdata/script/mod_toolchain.txt
+go121/src/cmd/go/testdata/script/mod_toolchain_slash.txt
 go121/src/cmd/go/testdata/script/mod_update_sum_readonly.txt
 go121/src/cmd/go/testdata/script/mod_upgrade_patch.txt
 go121/src/cmd/go/testdata/script/mod_vcs_missing.txt
@@ -6453,6 +6458,9 @@ go121/src/internal/types/testdata/fixedb
 go121/src/internal/types/testdata/fixedbugs/issue60933.go
 go121/src/internal/types/testdata/fixedbugs/issue60946.go
 go121/src/internal/types/testdata/fixedbugs/issue61486.go
+go121/src/internal/types/testdata/fixedbugs/issue61879.go
+go121/src/internal/types/testdata/fixedbugs/issue61903.go
+go121/src/internal/types/testdata/fixedbugs/issue62157.go
 go121/src/internal/types/testdata/fixedbugs/issue6977.go
 go121/src/internal/types/testdata/spec/assignability.go
 go121/src/internal/types/testdata/spec/comparable.go
@@ -11558,6 +11566,10 @@ go121/test/fixedbugs/issue61127.go
 go121/test/fixedbugs/issue61187.go
 go121/test/fixedbugs/issue6131.go
 go121/test/fixedbugs/issue6140.go
+go121/test/fixedbugs/issue61778.go
+go121/test/fixedbugs/issue61908.go
+go121/test/fixedbugs/issue61992.go
+go121/test/fixedbugs/issue62203.go
 go121/test/fixedbugs/issue6247.go
 go121/test/fixedbugs/issue6269.go
 go121/test/fixedbugs/issue6295.dir/p0.go
Index: pkgsrc/lang/go121/distinfo
diff -u pkgsrc/lang/go121/distinfo:1.1 pkgsrc/lang/go121/distinfo:1.2
--- pkgsrc/lang/go121/distinfo:1.1	Sat Aug 26 16:35:30 2023
+++ pkgsrc/lang/go121/distinfo	Fri Sep  8 13:06:29 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2023/08/26 16:35:30 bsiegert Exp $
+$NetBSD: distinfo,v 1.2 2023/09/08 13:06:29 bsiegert Exp $
 
-BLAKE2s (go1.21.0.src.tar.gz) = 0ab28d8fd9e3435701536d3a0a3244913424a96428ad82e6642d7e711e1d50d3
-SHA512 (go1.21.0.src.tar.gz) = da629fee156de6abbc5195f746e2fe4172a31b97eccd3871283c60452e81ac740533cc28ca68762ebc0ce48fb791dc527d3b7ebe7e1aee0f0b68868de736ed42
-Size (go1.21.0.src.tar.gz) = 26942359 bytes
+BLAKE2s (go1.21.1.src.tar.gz) = 4a3535786ee2e358e79a6e51710c47aee15067571852ef350488a299b029bbc2
+SHA512 (go1.21.1.src.tar.gz) = b6bee4a461ed91958c334b2f8b78e8f0c45f07409ba6968ae393b34d9cd21a9b1a29df357d191144e99f8ea73f491926ea0027ecbcfcaa198349e67fa33e0e3c
+Size (go1.21.1.src.tar.gz) = 26974429 bytes
 SHA1 (patch-misc_ios_clangwrap.sh) = 0a06403609cb7bce2e6f65444fd322f486761afe
 SHA1 (patch-src_crypto_x509_root__bsd.go) = 0b5dead901450967109303f873a2696c65ccac35
 SHA1 (patch-src_crypto_x509_root__solaris.go) = d636a1599ede225ac339388fba2b6e253112d461


--_----------=_1694178389241080--