From nobody Mon Mar 27 11:27:20 2023 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 4PlVsP28qrz428Pv; Mon, 27 Mar 2023 11:27:21 +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 4PlVsP024pz3L3t; Mon, 27 Mar 2023 11:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916441; 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=5Jv3+lPQxNl0/AQhWHykFefffYXlZwPWcd/IPHEuBh4=; b=L3fVJ+hSIOQAg/T8YLowhLzaU7qMhL385lsWllCrE5giIpbz+/2de2JKv21EzjQtdYMfBz c7Oi7Eibh5tdAAN1l9Sbjn7IeR63oAdZ7wwYJhmymhoQguclkMsMLYerS8uGTNHVC/6ouh swN0Lhffu9COYgAkC2UvdJot2v6b9noLa1lnRNjk+bvgdTkwYLHAyYkJv4Ot/Q/NoXwgPg jCk5o1Suk3LuHd3Mc7GOfV92RGdZma2aPYCdTLYHk/UBbPD6NTwv8hoJ/26tTw+JhFA5SK po4PadpBScco2hD8ESAvk5WQ/Y+oR41pgcIrd5dtNMd72WQ8A/E5mqt46XdCgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916441; 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=5Jv3+lPQxNl0/AQhWHykFefffYXlZwPWcd/IPHEuBh4=; b=w1wMhpdEYAsTBglSOyiPW5h6F8nmnQAvsaA5kPAbKLrZfGgf8OmZvFhVDQATU0QQz+gHgy 9eb7ntMDG38iNkzAts9m2nI+Fl1LJDh5YXub1JzULq29+H48rAlIQ5ujFIOEZqclaKHbW+ tXxmUtl/9iWea/VQYTuwgHbrbiCky+r0yi32yaFIYfc8Y8cX0ZDD5xr/f4yB3x3I0w/XDl yAdUKpdaSJfnWHRI7ONrSfL0SniqQXqX2A1NFIwel3X1nZF7tF7EgvoZTVOnWw1jsrEEOf hPT6i2s3VOwyLqjp99QtH6Jb50nv2ohHATrTDGBTPLcZ9uixnUD2lnQeBa965A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679916441; a=rsa-sha256; cv=none; b=ujCq++BBYCTIta/+NJN9zCp/EuP31TLb8nVR/ny8J5J+09pF86GtpYO3PvPYY28wCRy8Pu EKyIOTmW/NhARBojZaLb9MyJMK3bcEBhDxYM6tVsFDnMaIV1rAKuD9HwOnNPXtI4mgwBCh RMNyxqQmT+XLCv+/hAF5y2ZOVT0CTSycfF3Filnbn+ORr+xpkTeQsE94Rm16QmI/Q6nG3I W7Jcezsh0ANUDOTyciO3qE9kdgYOFY/HN/MasnVytwvic8RVOyZNTCqGMZBlUvu/ZlDDvL syahG2sqvMNUt5e5+aR0NNllPaZVzIlXcLhHU9cnabgurDsYCWhy5neviIL92w== 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 4PlVsN5RCHzKXT; Mon, 27 Mar 2023 11:27:20 +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 32RBRKXq058647; Mon, 27 Mar 2023 11:27:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RBRKvm058646; Mon, 27 Mar 2023 11:27:20 GMT (envelope-from git) Date: Mon, 27 Mar 2023 11:27:20 GMT Message-Id: <202303271127.32RBRKvm058646@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 25ce624e15ad - main - deskutils/dstask: fix build on riscv64 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25ce624e15ad79b594608f907eca2d9b9f8cbdf1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=25ce624e15ad79b594608f907eca2d9b9f8cbdf1 commit 25ce624e15ad79b594608f907eca2d9b9f8cbdf1 Author: Robert Clausecker AuthorDate: 2023-03-25 01:26:06 +0000 Commit: Robert Clausecker CommitDate: 2023-03-27 11:24:57 +0000 deskutils/dstask: fix build on riscv64 Bump golang.org/x/sys dependency to a version new enough to support riscv64-freebsd. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) --- deskutils/dstask/Makefile | 5 ++ deskutils/dstask/distinfo | 4 +- deskutils/dstask/files/patch-go.mod | 39 ++++++++++++ deskutils/dstask/files/patch-go.sum | 11 ++++ deskutils/dstask/files/patch-vendor_modules.txt | 85 +++++++++++++++++++++++++ 5 files changed, 143 insertions(+), 1 deletion(-) diff --git a/deskutils/dstask/Makefile b/deskutils/dstask/Makefile index 3cdb8a5396f3..b0cb11699e18 100644 --- a/deskutils/dstask/Makefile +++ b/deskutils/dstask/Makefile @@ -18,6 +18,11 @@ GO_TARGET= ./cmd/dstask ./cmd/dstask-import USE_GITHUB= yes GH_ACCOUNT= naggie +GH_TUPLE= golang:sys:v0.6.0:sys + +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/deskutils/dstask/distinfo b/deskutils/dstask/distinfo index 53dc9dd7ac72..feb3c1e605f3 100644 --- a/deskutils/dstask/distinfo +++ b/deskutils/dstask/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1668093439 +TIMESTAMP = 1679707302 SHA256 (naggie-dstask-v0.26_GH0.tar.gz) = ccd7afcb825eb799bdaaaf6eaf8150bbb8ceda02fec6c97f042b7bbc913a46fc SIZE (naggie-dstask-v0.26_GH0.tar.gz) = 3297022 +SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/deskutils/dstask/files/patch-go.mod b/deskutils/dstask/files/patch-go.mod new file mode 100644 index 000000000000..0f544bb90dff --- /dev/null +++ b/deskutils/dstask/files/patch-go.mod @@ -0,0 +1,39 @@ +--- go.mod.orig 2023-03-25 01:23:43 UTC ++++ go.mod +@@ -1,21 +1,30 @@ + module github.com/naggie/dstask + +-go 1.16 ++go 1.17 + + require ( + github.com/BurntSushi/toml v0.3.1 + github.com/gofrs/uuid v3.3.0+incompatible +- github.com/google/go-cmp v0.5.2 // indirect + github.com/mattn/go-isatty v0.0.12 + github.com/mvdan/xurls v1.1.0 +- github.com/pkg/errors v0.9.1 // indirect + github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b +- github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect + github.com/sirupsen/logrus v1.7.0 + github.com/stretchr/testify v1.6.1 +- golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect + golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 +- golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 ++ golang.org/x/sys v0.6.0 + gopkg.in/yaml.v2 v2.3.0 + gotest.tools v2.2.0+incompatible ++) ++ ++require ( ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/golang/protobuf v1.4.2 // indirect ++ github.com/google/go-cmp v0.5.2 // indirect ++ github.com/pkg/errors v0.9.1 // indirect ++ github.com/pmezard/go-difflib v1.0.0 // indirect ++ github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect ++ golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect ++ google.golang.org/appengine v1.6.6 // indirect ++ google.golang.org/protobuf v1.25.0 // indirect ++ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + ) diff --git a/deskutils/dstask/files/patch-go.sum b/deskutils/dstask/files/patch-go.sum new file mode 100644 index 000000000000..f098fdb4eeed --- /dev/null +++ b/deskutils/dstask/files/patch-go.sum @@ -0,0 +1,11 @@ +--- go.sum.orig 2023-03-25 01:23:46 UTC ++++ go.sum +@@ -248,6 +248,8 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go + golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k= + golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= ++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/deskutils/dstask/files/patch-vendor_modules.txt b/deskutils/dstask/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..e6913ec2180c --- /dev/null +++ b/deskutils/dstask/files/patch-vendor_modules.txt @@ -0,0 +1,85 @@ +--- vendor/modules.txt.orig 2023-03-25 01:24:08 UTC ++++ vendor/modules.txt +@@ -2,21 +2,23 @@ + ## explicit + github.com/BurntSushi/toml + # github.com/davecgh/go-spew v1.1.1 ++## explicit + github.com/davecgh/go-spew/spew + # github.com/gofrs/uuid v3.3.0+incompatible + ## explicit + github.com/gofrs/uuid + # github.com/golang/protobuf v1.4.2 ++## explicit; go 1.9 + github.com/golang/protobuf/proto + # github.com/google/go-cmp v0.5.2 +-## explicit ++## explicit; go 1.8 + github.com/google/go-cmp/cmp + github.com/google/go-cmp/cmp/internal/diff + github.com/google/go-cmp/cmp/internal/flags + github.com/google/go-cmp/cmp/internal/function + github.com/google/go-cmp/cmp/internal/value + # github.com/mattn/go-isatty v0.0.12 +-## explicit ++## explicit; go 1.12 + github.com/mattn/go-isatty + # github.com/mvdan/xurls v1.1.0 + ## explicit +@@ -25,6 +27,7 @@ github.com/mvdan/xurls + ## explicit + github.com/pkg/errors + # github.com/pmezard/go-difflib v1.0.0 ++## explicit + github.com/pmezard/go-difflib/difflib + # github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b + ## explicit +@@ -35,25 +38,26 @@ github.com/shurcooL/graphql + github.com/shurcooL/graphql/ident + github.com/shurcooL/graphql/internal/jsonutil + # github.com/sirupsen/logrus v1.7.0 +-## explicit ++## explicit; go 1.13 + github.com/sirupsen/logrus + # github.com/stretchr/testify v1.6.1 +-## explicit ++## explicit; go 1.13 + github.com/stretchr/testify/assert + # golang.org/x/net v0.0.0-20201021035429-f5854403a974 +-## explicit ++## explicit; go 1.11 + golang.org/x/net/context + golang.org/x/net/context/ctxhttp + # golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 +-## explicit ++## explicit; go 1.11 + golang.org/x/oauth2 + golang.org/x/oauth2/internal +-# golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 +-## explicit ++# golang.org/x/sys v0.6.0 ++## explicit; go 1.17 + golang.org/x/sys/internal/unsafeheader + golang.org/x/sys/unix + golang.org/x/sys/windows + # google.golang.org/appengine v1.6.6 ++## explicit; go 1.11 + google.golang.org/appengine/internal + google.golang.org/appengine/internal/base + google.golang.org/appengine/internal/datastore +@@ -62,6 +66,7 @@ google.golang.org/appengine/internal/remote_api + google.golang.org/appengine/internal/urlfetch + google.golang.org/appengine/urlfetch + # google.golang.org/protobuf v1.25.0 ++## explicit; go 1.9 + google.golang.org/protobuf/encoding/prototext + google.golang.org/protobuf/encoding/protowire + google.golang.org/protobuf/internal/descfmt +@@ -92,6 +97,7 @@ google.golang.org/protobuf/runtime/protoimpl + ## explicit + gopkg.in/yaml.v2 + # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c ++## explicit + gopkg.in/yaml.v3 + # gotest.tools v2.2.0+incompatible + ## explicit