svn commit: r569430 - head/sysutils/node_exporter

Rainer Hurling rhurlin at FreeBSD.org
Mon Mar 29 06:13:51 UTC 2021 

Author: rhurlin
Date: Mon Mar 29 06:13:50 2021
New Revision: 569430
URL: https://svnweb.freebsd.org/changeset/ports/569430

Log:
  sysutils/node_exporter: Update to v1.1.2
  
  Removed nonfunctional test target from port for now.
  
  Changelog: https://github.com/prometheus/node_exporter/releases/tag/v1.1.2
  
  PR:		254393
  Submitted by:	David O'Rourke <dor.bsd at xm0.uk> (maintainer)

Modified:
  head/sysutils/node_exporter/Makefile
  head/sysutils/node_exporter/Makefile.modules
  head/sysutils/node_exporter/distinfo

Modified: head/sysutils/node_exporter/Makefile
==============================================================================
--- head/sysutils/node_exporter/Makefile	Mon Mar 29 05:44:37 2021	(r569429)
+++ head/sysutils/node_exporter/Makefile	Mon Mar 29 06:13:50 2021	(r569430)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	node_exporter
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.2
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
 
@@ -12,36 +12,24 @@ COMMENT=	Prometheus exporter for machine metrics
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	promtool:net-mgmt/prometheus2 \
-		bash:shells/bash \
-		gsed:textproc/gsed
-
 USES=		gmake go:modules shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	prometheus
 USE_RC_SUBR=	node_exporter
 
-# The ttar script is used to run the tests.
-SHEBANG_FILES=	ttar
-
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}"
 
-# A "checkrules" target is being added in >0.17.0.
-TEST_TARGET=	test
+OPTIONS_DEFINE=	DOCS
 
-TEST_ENV=	PROMTOOL=${LOCALBASE}/bin/promtool
-
 BUILD_USER?=	${USER}
-LD_FLAG_X_PREFIX=	-X ${GO_PKGNAME:H}/common/version
 LD_FLAG_STRING=	-s \
 		${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \
 		${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \
 		${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \
 		${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}
-GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}"
+LD_FLAG_X_PREFIX=	-X ${GO_PKGNAME:H}/common/version
 
-OPTIONS_DEFINE=	DOCS
-
 # This Makefile includes the GH_TUPLE section.
 .include "Makefile.modules"
 
@@ -50,24 +38,5 @@ post-install-DOCS-on:
 	cd ${WRKSRC}/docs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-
-# TestFileDescriptorLeak is being skipped at the moment because procfs(5) is
-# not properly detected.
-pre-test:
-	# Prevent Go from attempting to use Git to redownload its dependencies.
-	# They are already present in ${WRKSRC}/vendor.
-	${RM} ${WRKSRC}/go.mod
-
-	${REINPLACE_CMD} -e 's|sed|${LOCALBASE}/bin/gsed|g' ${WRKSRC}/ttar
-
-	${RM} -r ${WRKDIR}/src
-	${LN} -sf ${WRKSRC}/vendor ${WRKDIR}/src
-	${MKDIR} ${WRKSRC}/vendor/${GO_PKGNAME}
-	${LN} -sf ${WRKSRC}/collector ${WRKSRC}/vendor/${GO_PKGNAME}/collector
-
-	# GOPATH has to have exactly one element in order to have the test
-	# suite detect the node_exporter binary. "-v" is added here for us to
-	# see skipped tests.
-	${REINPLACE_CMD} -E 's|(\$$\(GO\) test)|env GOPATH="${WRKDIR}" \1 -v|g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>

Modified: head/sysutils/node_exporter/Makefile.modules
==============================================================================
--- head/sysutils/node_exporter/Makefile.modules	Mon Mar 29 05:44:37 2021	(r569429)
+++ head/sysutils/node_exporter/Makefile.modules	Mon Mar 29 06:13:50 2021	(r569430)
@@ -14,7 +14,7 @@ GH_TUPLE=	\
 		golang:crypto:5f87f3452ae9:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:6772e930b67b:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
+		golang:sync:09787c993a3a:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:22da62e12c0c:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
 		hodgesds:perf-utils:v0.2.5:hodgesds_perf_utils/vendor/github.com/hodgesds/perf-utils \
@@ -33,7 +33,7 @@ GH_TUPLE=	\
 		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.15.0:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:exporter-toolkit:v0.5.1:prometheus_exporter_toolkit/vendor/github.com/prometheus/exporter-toolkit \
-		prometheus:procfs:v0.3.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		protocolbuffers:protobuf-go:v1.23.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		siebenmann:go-kstat:4e8294f9e9d5:siebenmann_go_kstat/vendor/github.com/siebenmann/go-kstat \
 		soundcloud:go-runit:06ad41a06c4a:soundcloud_go_runit/vendor/github.com/soundcloud/go-runit \

Modified: head/sysutils/node_exporter/distinfo
==============================================================================
--- head/sysutils/node_exporter/distinfo	Mon Mar 29 05:44:37 2021	(r569429)
+++ head/sysutils/node_exporter/distinfo	Mon Mar 29 06:13:50 2021	(r569430)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1612812974
-SHA256 (prometheus-node_exporter-v1.1.0_GH0.tar.gz) = 32f41d5f007712937c6f63722fb3da15761038c0b8e1a82cfb909e97eb1cb134
-SIZE (prometheus-node_exporter-v1.1.0_GH0.tar.gz) = 313066
+TIMESTAMP = 1616104338
+SHA256 (prometheus-node_exporter-v1.1.2_GH0.tar.gz) = edb40c783bd5767f174b916c89a768496ccae0f74811ba1d03c57c32cd250bbd
+SIZE (prometheus-node_exporter-v1.1.2_GH0.tar.gz) = 313873
 SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
 SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
 SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
@@ -31,8 +31,8 @@ SHA256 (golang-net-6772e930b67b_GH0.tar.gz) = fde23e27
 SIZE (golang-net-6772e930b67b_GH0.tar.gz) = 1251401
 SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610
 SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969
-SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393
-SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956
+SHA256 (golang-sync-09787c993a3a_GH0.tar.gz) = e533f53d11330b61d7e9bcbec255699992ab47636f1b45403db6f9b09c3d0aba
+SIZE (golang-sync-09787c993a3a_GH0.tar.gz) = 18734
 SHA256 (golang-sys-22da62e12c0c_GH0.tar.gz) = 5a120a40c63be9383650b7757c00645b25d37a3b7daa523f2a85fac969e51b2a
 SIZE (golang-sys-22da62e12c0c_GH0.tar.gz) = 1106889
 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
@@ -69,8 +69,8 @@ SHA256 (prometheus-common-v0.15.0_GH0.tar.gz) = f0957d
 SIZE (prometheus-common-v0.15.0_GH0.tar.gz) = 124369
 SHA256 (prometheus-exporter-toolkit-v0.5.1_GH0.tar.gz) = 721740ad90ac0d32e51c94d05b67a276cbed2c138e9af16587f98e8664750220
 SIZE (prometheus-exporter-toolkit-v0.5.1_GH0.tar.gz) = 50475
-SHA256 (prometheus-procfs-v0.3.0_GH0.tar.gz) = 9d2c0f48911ec3c36b638e65012a36c171403f522ec83c2a9dbe0f87972d671b
-SIZE (prometheus-procfs-v0.3.0_GH0.tar.gz) = 162214
+SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
+SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
 SHA256 (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = e7266bedaa4f110216fce52ae533dc5eba475d3829bb0592e8876684e202ae1f
 SIZE (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = 1214648
 SHA256 (siebenmann-go-kstat-4e8294f9e9d5_GH0.tar.gz) = a0b47628924b21857d21963653a69a958853091c295aaa4b95b8882f3a796212

More information about the svn-ports-head mailing list