From nobody Sun Apr 24 20:36:15 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2C9E81996BEE; Sun, 24 Apr 2022 20:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kmg0J0kNLz4tJk; Sun, 24 Apr 2022 20:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650832576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RoFhAxDQ8rQHmA7Ipp3LlJcbY4gnNegUJQrnABkI/mQ=; b=u3gbz+1DtOV+yxe58I8XmskPKUyVJCuh4yOVfFd8YClcYfSnLfT9qWvhOhJiNGVuDnulwk GE7c5dBjTJwpn/ZkAqU9dp0pk3XECM7Pr3NdTzeHmCDVQsMYDBgfxNVioJ/K7zBV2Z0Sdz uRq35ZaRTVBtO4YQT0169/HUpkHaakeMewgiyKX/vJ4we8CB0FbezNmXDfzr2fOUmoj1Gh Ja8ukWGLsgRIpgIOC3kzpa+nQ6qPIUN4JP/mX2MgJRaxTAFMC3ZBderX6gGRkfftazWLu3 SRJSYuhSU68UcZbfriCSsfykfT2QW7Rk620hUp0sGFk3xnTKjS738oFSFYU60w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E96A952B1; Sun, 24 Apr 2022 20:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23OKaFDT090143; Sun, 24 Apr 2022 20:36:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23OKaFoO090142; Sun, 24 Apr 2022 20:36:15 GMT (envelope-from git) Date: Sun, 24 Apr 2022 20:36:15 GMT Message-Id: <202204242036.23OKaFoO090142@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Serhii (Sergey) Kozlov Subject: git: c701ddd23004 - 2022Q2 - www/pydio-cells: Fix build with Go 1.18 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: skozlov X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: c701ddd230049fedfdbf1a86666ec4a682965899 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650832576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RoFhAxDQ8rQHmA7Ipp3LlJcbY4gnNegUJQrnABkI/mQ=; b=ldrqi4neliH6ZtbHRjrc1VXiAFNhUybkEHou4AQW9v12GhkGGQQBAaxpeYjB24xZg5Vg38 vI4a9NzTMU6xobSN+tNCDIpvUD2CE1tga0+M6ILXp+vZOsgdXvLK0/Kvo8bkaWLzO+QWRL StrrGg/Hul8mSmbBrXgNC0ZrB15NJ3YmmFq7M1jBg1RPE1hhitfcdqwBcsMkFBgUU8guZk VqQcRmPnqKCHGEOemvkQbHjXQMaqAdnN1aSDXJ7SQr8JiTy2Xk8B3xuc3OKX7u88u2FunO PZj267kFu5Ac3M1aYddUkCaTU4UUXD5u0JpoNZaO7hhBt04owFSTKYKkOQVDuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650832576; a=rsa-sha256; cv=none; b=ROchzVI5E5IY21CjkHBGUq0b9Hl6REw3pDKAwzBEmbjlDJ1uO0HWTqsxhkUemCcEtrqvgA cdgSN9in7BMwhMnEyUfvYjmULI59awVC2afZJUs+TM5V5pPDdbCNkvfGeIubONEjLeUsYU n7vHBJgNt3+lXtYINpJe7Ninr6r1Awk3FK8fMuIHdaCMmSSN0yInKFKdP4aqrGynhNONjT uyulW4fefvQfzX4JB2F3HIzFtsCam6SsGQNkqErUTVC6zjveAOJDUBkOTsWhflwISFmBjs H1xMDmGVThv3Ab1kp+QhGAA6uW1nPCHWjQmK52FZj4EuIWMFYIpAZfC1OYH1Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by skozlov: URL: https://cgit.FreeBSD.org/ports/commit/?id=c701ddd230049fedfdbf1a86666ec4a682965899 commit c701ddd230049fedfdbf1a86666ec4a682965899 Author: Serhii (Sergey) Kozlov AuthorDate: 2022-04-16 22:07:35 +0000 Commit: Serhii (Sergey) Kozlov CommitDate: 2022-04-24 20:35:58 +0000 www/pydio-cells: Fix build with Go 1.18 Backport fixes from upstream: https://github.com/modern-go/reflect2/tree/fix-go1.18 (cherry picked from commit 705118f35fb6c56d580721d34105c95993eb974d) --- ...github.com_modern-go_reflect2_go__above__118.go | 26 ++++++++++++ ...github.com_modern-go_reflect2_go__below__118.go | 24 +++++++++++ ...r_github.com_modern-go_reflect2_unsafe__link.go | 48 ++++++++++++++++++++++ ...or_github.com_modern-go_reflect2_unsafe__map.go | 17 ++++++++ 4 files changed, 115 insertions(+) diff --git a/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_go__above__118.go b/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_go__above__118.go new file mode 100644 index 000000000000..a5f30e6a87c6 --- /dev/null +++ b/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_go__above__118.go @@ -0,0 +1,26 @@ +--- vendor/github.com/modern-go/reflect2/go_above_118.go.orig 2022-04-16 21:52:43 UTC ++++ vendor/github.com/modern-go/reflect2/go_above_118.go +@@ -0,0 +1,23 @@ ++//+build go1.18 ++ ++package reflect2 ++ ++import ( ++ "unsafe" ++) ++ ++// m escapes into the return value, but the caller of mapiterinit ++// doesn't let the return value escape. ++//go:noescape ++//go:linkname mapiterinit reflect.mapiterinit ++func mapiterinit(rtype unsafe.Pointer, m unsafe.Pointer, it *hiter) ++ ++func (type2 *UnsafeMapType) UnsafeIterate(obj unsafe.Pointer) MapIterator { ++ var it hiter ++ mapiterinit(type2.rtype, *(*unsafe.Pointer)(obj), &it) ++ return &UnsafeMapIterator{ ++ hiter: &it, ++ pKeyRType: type2.pKeyRType, ++ pElemRType: type2.pElemRType, ++ } ++} diff --git a/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_go__below__118.go b/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_go__below__118.go new file mode 100644 index 000000000000..f47f8687a646 --- /dev/null +++ b/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_go__below__118.go @@ -0,0 +1,24 @@ +--- vendor/github.com/modern-go/reflect2/go_below_118.go.orig 2022-04-16 21:56:08 UTC ++++ vendor/github.com/modern-go/reflect2/go_below_118.go +@@ -0,0 +1,21 @@ ++//+build !go1.18 ++ ++package reflect2 ++ ++import ( ++ "unsafe" ++) ++ ++// m escapes into the return value, but the caller of mapiterinit ++// doesn't let the return value escape. ++//go:noescape ++//go:linkname mapiterinit reflect.mapiterinit ++func mapiterinit(rtype unsafe.Pointer, m unsafe.Pointer) (val *hiter) ++ ++func (type2 *UnsafeMapType) UnsafeIterate(obj unsafe.Pointer) MapIterator { ++ return &UnsafeMapIterator{ ++ hiter: mapiterinit(type2.rtype, *(*unsafe.Pointer)(obj)), ++ pKeyRType: type2.pKeyRType, ++ pElemRType: type2.pElemRType, ++ } ++} diff --git a/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_unsafe__link.go b/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_unsafe__link.go new file mode 100644 index 000000000000..3775e509f697 --- /dev/null +++ b/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_unsafe__link.go @@ -0,0 +1,48 @@ +--- vendor/github.com/modern-go/reflect2/unsafe_link.go.orig 2022-04-16 22:01:31 UTC ++++ vendor/github.com/modern-go/reflect2/unsafe_link.go +@@ -19,19 +19,13 @@ func typedslicecopy(elemType unsafe.Pointer, dst, src + + //go:linkname mapassign reflect.mapassign + //go:noescape +-func mapassign(rtype unsafe.Pointer, m unsafe.Pointer, key, val unsafe.Pointer) ++func mapassign(rtype unsafe.Pointer, m unsafe.Pointer, key unsafe.Pointer, val unsafe.Pointer) + + //go:linkname mapaccess reflect.mapaccess + //go:noescape + func mapaccess(rtype unsafe.Pointer, m unsafe.Pointer, key unsafe.Pointer) (val unsafe.Pointer) + +-// m escapes into the return value, but the caller of mapiterinit +-// doesn't let the return value escape. + //go:noescape +-//go:linkname mapiterinit reflect.mapiterinit +-func mapiterinit(rtype unsafe.Pointer, m unsafe.Pointer) *hiter +- +-//go:noescape + //go:linkname mapiternext reflect.mapiternext + func mapiternext(it *hiter) + +@@ -42,9 +36,21 @@ func ifaceE2I(rtype unsafe.Pointer, src interface{}, d + // If you modify hiter, also change cmd/internal/gc/reflect.go to indicate + // the layout of this structure. + type hiter struct { +- key unsafe.Pointer // Must be in first position. Write nil to indicate iteration end (see cmd/internal/gc/range.go). +- value unsafe.Pointer // Must be in second position (see cmd/internal/gc/range.go). +- // rest fields are ignored ++ key unsafe.Pointer ++ value unsafe.Pointer ++ t unsafe.Pointer ++ h unsafe.Pointer ++ buckets unsafe.Pointer ++ bptr unsafe.Pointer ++ overflow *[]unsafe.Pointer ++ oldoverflow *[]unsafe.Pointer ++ startBucket uintptr ++ offset uint8 ++ wrapped bool ++ B uint8 ++ i uint8 ++ bucket uintptr ++ checkBucket uintptr + } + + // add returns p+x. diff --git a/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_unsafe__map.go b/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_unsafe__map.go new file mode 100644 index 000000000000..1e4699268cb7 --- /dev/null +++ b/www/pydio-cells/files/patch-vendor_github.com_modern-go_reflect2_unsafe__map.go @@ -0,0 +1,17 @@ +--- vendor/github.com/modern-go/reflect2/unsafe_map.go.orig 2022-04-16 22:00:28 UTC ++++ vendor/github.com/modern-go/reflect2/unsafe_map.go +@@ -107,14 +107,6 @@ func (type2 *UnsafeMapType) Iterate(obj interface{}) M + return type2.UnsafeIterate(objEFace.data) + } + +-func (type2 *UnsafeMapType) UnsafeIterate(obj unsafe.Pointer) MapIterator { +- return &UnsafeMapIterator{ +- hiter: mapiterinit(type2.rtype, *(*unsafe.Pointer)(obj)), +- pKeyRType: type2.pKeyRType, +- pElemRType: type2.pElemRType, +- } +-} +- + type UnsafeMapIterator struct { + *hiter + pKeyRType unsafe.Pointer