From nobody Fri Mar 24 20:56:51 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 4Pjvdv6Q0fz417DY; Fri, 24 Mar 2023 20:56:51 +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 4Pjvdv5lwDz3QYQ; Fri, 24 Mar 2023 20:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679691411; 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=e/Em04OiONqn3HEGZNP76CXZ68pOCr7Sj4Kh9XONXg0=; b=wQgfx7ijxQTEZeuoAaioPb6Bjvb+ZHH6uQqRz85w36ybfrdBNlnYqOCw21pvkhp+ftyFuA YDIKu3pkmQBJlC7u8fztGl5kwOh5Lgqvy8kpoG7YpndVEFFk9p9fxg6GJU7v1YWsN7fAdJ pXrfOtPuOsstFKqdqE3mG9Yw8/URJD6p4A5Ijm7sljLAKZNu9YQoZgz8/C+fmQPWx8wYrM kCwYNw3nLwHCZ/lt8rzJDzqpm6Wb5lbZgdaWN2xXlYYHZ4coCQYiF9GsHI1K8rnxpHgySO X6jCd65XW179QmKqksf1xipQsLooglKhladRqehfWVG5mtKXnWw5bKhSV0vQHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679691411; 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=e/Em04OiONqn3HEGZNP76CXZ68pOCr7Sj4Kh9XONXg0=; b=j3RLfBv+z+isHR1xPo1ju6UiSjws480XXgbJ0hICb1cjMsvrc5dB+ujoRs1YNWQ2ptDaFO NG+w4H5VP8BMY1fjOYGrpZllntKPsBOR1mtEXOLIwhBR7kjnCym0HwkgQWs1+ryxL+EUjG W0lOgGCN+KzJqs9CXTtCmx+659ppHTNrI7T2B0k5n9EFyDT+F40dCFvQknGTTL33By36rX kb9qS7n5DKcYQSEaqBZWSJ9mn7hRw04GUOkINVTWHhYi2TmOt4m3HMjfswoNwgOSdgk+Yj WLchPhPyUBXI0xRqfWNXiEmxGIqE2jBqAq7S2fcXvJQPtMhLvDsPAHwsa+Qkmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679691411; a=rsa-sha256; cv=none; b=edksAqdCmZ0ReZQVkbyn3fKHWv1cPYrrDN0CdmqoU7lRnbXrp80uNO1UhIveWqZf7tZPug yp/8DYc1ptqzwNM86n6UdPmKdKgDHAB8nrq7HayosZDIfnsGt2iAolWYR/lzLBSh0J3eaX jSHp17zS7weABvoXuT3VqA3csvQ9N+SIx+7fKgoFKStCNcFcIbxLufKb5ga/XrGxlJFaQx +hUmLtHh5GP9/4nFZO4nbmhM92hxuK9RJThlhPxJlSGIegCVfAACbs2CPN0oXVnSrj4izj wAsoYRrgV8XzL94O0nZxsvAYCGTvGmHBmUWKJUa2KX+YKaCIHDoDbV5afieU1g== 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 4Pjvdv4sHBzXnT; Fri, 24 Mar 2023 20:56:51 +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 32OKupAV088610; Fri, 24 Mar 2023 20:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OKupZM088609; Fri, 24 Mar 2023 20:56:51 GMT (envelope-from git) Date: Fri, 24 Mar 2023 20:56:51 GMT Message-Id: <202303242056.32OKupZM088609@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: 46d9a6db21a5 - main - net-mgmt/unbound_exporter: 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: 46d9a6db21a513c6db55b14a3bbfc36fcf56bc8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=46d9a6db21a513c6db55b14a3bbfc36fcf56bc8e commit 46d9a6db21a513c6db55b14a3bbfc36fcf56bc8e Author: Robert Clausecker AuthorDate: 2023-03-23 10:16:36 +0000 Commit: Robert Clausecker CommitDate: 2023-03-24 20:54:50 +0000 net-mgmt/unbound_exporter: 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) --- net-mgmt/unbound_exporter/Makefile | 10 +++- net-mgmt/unbound_exporter/distinfo | 4 +- net-mgmt/unbound_exporter/files/patch-go.mod | 31 ++++++++++ net-mgmt/unbound_exporter/files/patch-go.sum | 11 ++++ .../files/patch-vendor_modules.txt | 70 ++++++++++++++++++++++ 5 files changed, 123 insertions(+), 3 deletions(-) diff --git a/net-mgmt/unbound_exporter/Makefile b/net-mgmt/unbound_exporter/Makefile index a94412720c69..e10a7bd3dc46 100644 --- a/net-mgmt/unbound_exporter/Makefile +++ b/net-mgmt/unbound_exporter/Makefile @@ -1,7 +1,7 @@ PORTNAME= unbound_exporter -PORTVERSION= 0.4.1 -PORTREVISION= 4 DISTVERSIONPREFIX= v +DISTVERSION= 0.4.1 +PORTREVISION= 5 CATEGORIES= net-mgmt MAINTAINER= aduitsis@cpan.org @@ -11,6 +11,8 @@ WWW= https://github.com/letsencrypt/unbound_exporter LICENSE= APACHE20 USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys USE_RC_SUBR= unbound_exporter GO_MODULE= github.com/letsencrypt/unbound_exporter @@ -22,4 +24,8 @@ GROUPS= unbound PLIST_FILES= bin/unbound_exporter +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + .include diff --git a/net-mgmt/unbound_exporter/distinfo b/net-mgmt/unbound_exporter/distinfo index 6db3e95be3f9..779a56468a72 100644 --- a/net-mgmt/unbound_exporter/distinfo +++ b/net-mgmt/unbound_exporter/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1667511702 +TIMESTAMP = 1679566149 SHA256 (go/net-mgmt_unbound_exporter/unbound_exporter-v0.4.1/v0.4.1.mod) = 1bd03db78e5d0be6f7e91fdb7f1c689c811529a74c0e7988ed1e13bf63fff2dd SIZE (go/net-mgmt_unbound_exporter/unbound_exporter-v0.4.1/v0.4.1.mod) = 485 SHA256 (go/net-mgmt_unbound_exporter/unbound_exporter-v0.4.1/v0.4.1.zip) = 596d8f658e7f8a67ea2a5e36566a664168641fa5e793a170032df30a7c2d1092 SIZE (go/net-mgmt_unbound_exporter/unbound_exporter-v0.4.1/v0.4.1.zip) = 28044 +SHA256 (go/net-mgmt_unbound_exporter/unbound_exporter-v0.4.1/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/net-mgmt_unbound_exporter/unbound_exporter-v0.4.1/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/net-mgmt/unbound_exporter/files/patch-go.mod b/net-mgmt/unbound_exporter/files/patch-go.mod new file mode 100644 index 000000000000..8e42c72fab48 --- /dev/null +++ b/net-mgmt/unbound_exporter/files/patch-go.mod @@ -0,0 +1,31 @@ +--- go.mod.orig 2023-03-23 10:12:21 UTC ++++ go.mod +@@ -1,15 +1,23 @@ + module github.com/letsencrypt/unbound_exporter + +-go 1.16 ++go 1.17 + + require ( +- github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/go-kit/log v0.2.0 +- github.com/golang/protobuf v1.5.2 // indirect +- github.com/google/go-cmp v0.5.6 // indirect + github.com/prometheus/client_golang v1.11.0 + github.com/prometheus/common v0.32.1 ++) ++ ++require ( ++ github.com/beorn7/perks v1.0.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.2 // indirect ++ github.com/go-logfmt/logfmt v0.5.1 // indirect ++ github.com/golang/protobuf v1.5.2 // indirect ++ github.com/google/go-cmp v0.5.6 // indirect ++ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect ++ github.com/pkg/errors v0.9.1 // indirect ++ github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/procfs v0.7.3 // indirect +- golang.org/x/sys v0.0.0-20211112193437-faf0a1b62c6b // indirect ++ golang.org/x/sys v0.6.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect + ) diff --git a/net-mgmt/unbound_exporter/files/patch-go.sum b/net-mgmt/unbound_exporter/files/patch-go.sum new file mode 100644 index 000000000000..ecb9e1e9a659 --- /dev/null +++ b/net-mgmt/unbound_exporter/files/patch-go.sum @@ -0,0 +1,11 @@ +--- go.sum.orig 2023-03-23 10:12:24 UTC ++++ go.sum +@@ -312,6 +312,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go + golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20211112193437-faf0a1b62c6b h1:uo+9AuR+gDt/gdj+1BaLhdOHsaGI6YU6585IiDcLrFE= + golang.org/x/sys v0.0.0-20211112193437-faf0a1b62c6b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= ++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + 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= diff --git a/net-mgmt/unbound_exporter/files/patch-vendor_modules.txt b/net-mgmt/unbound_exporter/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..da7166da9325 --- /dev/null +++ b/net-mgmt/unbound_exporter/files/patch-vendor_modules.txt @@ -0,0 +1,70 @@ +--- vendor/modules.txt.orig 2023-03-23 10:12:52 UTC ++++ vendor/modules.txt +@@ -1,52 +1,57 @@ + # github.com/beorn7/perks v1.0.1 ++## explicit; go 1.11 + github.com/beorn7/perks/quantile + # github.com/cespare/xxhash/v2 v2.1.2 +-## explicit ++## explicit; go 1.11 + github.com/cespare/xxhash/v2 + # github.com/go-kit/log v0.2.0 +-## explicit ++## explicit; go 1.17 + github.com/go-kit/log + github.com/go-kit/log/level + # github.com/go-logfmt/logfmt v0.5.1 ++## explicit; go 1.17 + github.com/go-logfmt/logfmt + # github.com/golang/protobuf v1.5.2 +-## explicit ++## explicit; go 1.9 + github.com/golang/protobuf/proto + github.com/golang/protobuf/ptypes + github.com/golang/protobuf/ptypes/any + github.com/golang/protobuf/ptypes/duration + github.com/golang/protobuf/ptypes/timestamp + # github.com/google/go-cmp v0.5.6 +-## explicit ++## explicit; go 1.8 + # github.com/matttproud/golang_protobuf_extensions v1.0.1 ++## explicit + github.com/matttproud/golang_protobuf_extensions/pbutil + # github.com/pkg/errors v0.9.1 ++## explicit + github.com/pkg/errors + # github.com/prometheus/client_golang v1.11.0 +-## explicit ++## explicit; go 1.13 + github.com/prometheus/client_golang/prometheus + github.com/prometheus/client_golang/prometheus/internal + github.com/prometheus/client_golang/prometheus/promhttp + # github.com/prometheus/client_model v0.2.0 ++## explicit; go 1.9 + github.com/prometheus/client_model/go + # github.com/prometheus/common v0.32.1 +-## explicit ++## explicit; go 1.13 + github.com/prometheus/common/expfmt + github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg + github.com/prometheus/common/model + github.com/prometheus/common/promlog + # github.com/prometheus/procfs v0.7.3 +-## explicit ++## explicit; go 1.13 + github.com/prometheus/procfs + github.com/prometheus/procfs/internal/fs + github.com/prometheus/procfs/internal/util +-# golang.org/x/sys v0.0.0-20211112193437-faf0a1b62c6b +-## 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/protobuf v1.27.1 +-## explicit ++## explicit; go 1.9 + google.golang.org/protobuf/encoding/prototext + google.golang.org/protobuf/encoding/protowire + google.golang.org/protobuf/internal/descfmt