From 1133b74a3687e4e06df12c7a015fde15f0d41134 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Sun, 3 Mar 2024 22:30:56 -0800 Subject: [PATCH] net-mgmt/unbound_exporter: upgrade to 0.4.6. PR: ports/277467, ports/270442, ports/268852 Approved by: maintainer timeout --- net-mgmt/unbound_exporter/Makefile | 28 +++++--- net-mgmt/unbound_exporter/distinfo | 32 +++++++-- net-mgmt/unbound_exporter/files/patch-go.mod | 31 -------- net-mgmt/unbound_exporter/files/patch-go.sum | 11 --- .../files/patch-vendor_modules.txt | 70 ------------------- .../files/unbound_exporter.in | 4 +- 6 files changed, 46 insertions(+), 130 deletions(-) delete mode 100644 net-mgmt/unbound_exporter/files/patch-go.mod delete mode 100644 net-mgmt/unbound_exporter/files/patch-go.sum delete mode 100644 net-mgmt/unbound_exporter/files/patch-vendor_modules.txt diff --git a/net-mgmt/unbound_exporter/Makefile b/net-mgmt/unbound_exporter/Makefile index 04848e063a405..845cdf037aec7 100644 --- a/net-mgmt/unbound_exporter/Makefile +++ b/net-mgmt/unbound_exporter/Makefile @@ -1,7 +1,6 @@ PORTNAME= unbound_exporter +PORTVERSION= 0.4.6 DISTVERSIONPREFIX= v -DISTVERSION= 0.4.1 -PORTREVISION= 11 CATEGORIES= net-mgmt MAINTAINER= aduitsis@cpan.org @@ -11,10 +10,25 @@ WWW= https://github.com/letsencrypt/unbound_exporter LICENSE= APACHE20 USES= go:modules -USE_GITHUB= nodefault -GH_TUPLE= golang:sys:v0.6.0:sys +USE_GITHUB= yes +GH_ACCOUNT= letsencrypt + +GH_TUPLE= \ + beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ + cespare:xxhash:v2.2.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \ + go-kit:log:v0.2.1:go_kit_log/vendor/github.com/go-kit/log \ + go-logfmt:logfmt:v0.6.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \ + golang:sys:v0.14.0:golang_sys/vendor/golang.org/x/sys \ + matttproud:golang_protobuf_extensions:v2.0.0:matttproud_golang_protobuf_extensions_v2/vendor/github.com/matttproud/golang_protobuf_extensions/v2 \ + prometheus:client_golang:v1.17.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ + prometheus:client_model:v0.5.0:prometheus_client_model/vendor/github.com/prometheus/client_model \ + prometheus:common:v0.45.0:prometheus_common/vendor/github.com/prometheus/common \ + prometheus:procfs:v0.12.0:prometheus_procfs/vendor/github.com/prometheus/procfs \ + protocolbuffers:protobuf-go:v1.31.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf + + USE_RC_SUBR= unbound_exporter -GO_MODULE= github.com/letsencrypt/unbound_exporter +GO_MODULES= github.com/letsencrypt/unbound_exporter SUB_FILES= pkg-message SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} @@ -24,8 +38,4 @@ 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 779a56468a72d..1542ff9960438 100644 --- a/net-mgmt/unbound_exporter/distinfo +++ b/net-mgmt/unbound_exporter/distinfo @@ -1,7 +1,25 @@ -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 +TIMESTAMP = 1709533586 +SHA256 (letsencrypt-unbound_exporter-v0.4.6_GH0.tar.gz) = 6ab5933f67a87025fb744dec4a3ae328a4c9fada623222aa28df8b85105e5311 +SIZE (letsencrypt-unbound_exporter-v0.4.6_GH0.tar.gz) = 16620 +SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 +SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 +SHA256 (cespare-xxhash-v2.2.0_GH0.tar.gz) = b8c684b9e5e136510913727e6a845b28f8176e55db827b11f17769fba970fe13 +SIZE (cespare-xxhash-v2.2.0_GH0.tar.gz) = 12334 +SHA256 (go-kit-log-v0.2.1_GH0.tar.gz) = b37718967f9cbdb3eea4aa2fa9420b7d329b6bab7f9b85f970db197257226152 +SIZE (go-kit-log-v0.2.1_GH0.tar.gz) = 30579 +SHA256 (go-logfmt-logfmt-v0.6.0_GH0.tar.gz) = e4c26af3226cee1486004da7ebb1f0b8485df62513cca6671edf7c4d420fadfd +SIZE (go-logfmt-logfmt-v0.6.0_GH0.tar.gz) = 12609 +SHA256 (golang-sys-v0.14.0_GH0.tar.gz) = e1866095878c2ccf02d0eceff29d2563f7af56b771e7b98248a63d6ab6465771 +SIZE (golang-sys-v0.14.0_GH0.tar.gz) = 1441800 +SHA256 (matttproud-golang_protobuf_extensions-v2.0.0_GH0.tar.gz) = 69fd83cb3002df3359128c2748c8f319fc63ce0493d43a3dcd7a94a4f487f742 +SIZE (matttproud-golang_protobuf_extensions-v2.0.0_GH0.tar.gz) = 12099 +SHA256 (prometheus-client_golang-v1.17.0_GH0.tar.gz) = 258222e5193b551ab8adeb2e02c415038795839cb4fa5d7d0181377017d19d3a +SIZE (prometheus-client_golang-v1.17.0_GH0.tar.gz) = 1077705 +SHA256 (prometheus-client_model-v0.5.0_GH0.tar.gz) = 170873e0b91cab5da6634af1498b88876842ff3e01212e2dabf6b4e6512c948d +SIZE (prometheus-client_model-v0.5.0_GH0.tar.gz) = 17333 +SHA256 (prometheus-common-v0.45.0_GH0.tar.gz) = 775ce5c074b5261d85227d13c61075f9c36e6d3cf9ab2c5a7d90f4006ad24c40 +SIZE (prometheus-common-v0.45.0_GH0.tar.gz) = 133098 +SHA256 (prometheus-procfs-v0.12.0_GH0.tar.gz) = 2e10f60725a5905d6cfaeffd0bc1441171aa694236a6c7031aad5a87ff841495 +SIZE (prometheus-procfs-v0.12.0_GH0.tar.gz) = 237430 +SHA256 (protocolbuffers-protobuf-go-v1.31.0_GH0.tar.gz) = 96d670e9bae145ff2dd0f48a3693edb1f45ec3ee56d5f50a5f01cc7e060314bc +SIZE (protocolbuffers-protobuf-go-v1.31.0_GH0.tar.gz) = 1311732 diff --git a/net-mgmt/unbound_exporter/files/patch-go.mod b/net-mgmt/unbound_exporter/files/patch-go.mod deleted file mode 100644 index 8e42c72fab48d..0000000000000 --- a/net-mgmt/unbound_exporter/files/patch-go.mod +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 deleted file mode 100644 index ecb9e1e9a6595..0000000000000 --- a/net-mgmt/unbound_exporter/files/patch-go.sum +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index da7166da9325d..0000000000000 --- a/net-mgmt/unbound_exporter/files/patch-vendor_modules.txt +++ /dev/null @@ -1,70 +0,0 @@ ---- 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 diff --git a/net-mgmt/unbound_exporter/files/unbound_exporter.in b/net-mgmt/unbound_exporter/files/unbound_exporter.in index ee0c24cdefc08..786ac85acbf03 100644 --- a/net-mgmt/unbound_exporter/files/unbound_exporter.in +++ b/net-mgmt/unbound_exporter/files/unbound_exporter.in @@ -44,8 +44,8 @@ command_args="-c -f -P ${pidfile} -u ${unbound_exporter_user} \ ${unbound_exporter_cert:+-unbound.cert $unbound_exporter_cert} \ ${unbound_exporter_host:+-unbound.host $unbound_exporter_host} \ ${unbound_exporter_key:+-unbound.key $unbound_exporter_key} \ - ${unbound_exporter_bind:+-web.listen-adress $unbound_exporter_bin} - ${unbound_exporter_path:+-web.telemetry-patch $unbound_exporter_path} + ${unbound_exporter_bind:+-web.listen-address $unbound_exporter_bind} \ + ${unbound_exporter_path:+-web.telemetry-path $unbound_exporter_path} \ ${unbound_exporter_args}" # these were used in the past, but now "daemon" takes care of everything and must run as root