pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

collectd-unbound: finish package



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Nov 30 17:05:59 2025 +0100
Changeset:	0f478ff1052abcfa5a484bd99c21f29768353a50

Modified Files:
	collectd-unbound/Makefile
	collectd-unbound/distinfo
Removed Files:
	collectd-unbound/patches/patch-collectd-unbound.go

Log Message:
collectd-unbound: finish package

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0f478ff1052abcfa5a484bd99c21f29768353a50

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 collectd-unbound/Makefile                          |  6 +-
 collectd-unbound/distinfo                          |  7 +--
 collectd-unbound/patches/patch-collectd-unbound.go | 64 ----------------------
 3 files changed, 4 insertions(+), 73 deletions(-)

diffs:
diff --git a/collectd-unbound/Makefile b/collectd-unbound/Makefile
index a35d92056f..c7aca39023 100644
--- a/collectd-unbound/Makefile
+++ b/collectd-unbound/Makefile
@@ -5,17 +5,13 @@ PKGNAME=		${DISTNAME}-20150830
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GITHUB:=falzm/}
 GITHUB_PROJECT=		${DISTNAME}
-#GITHUB_TAG=		e751f86301
-GITHUB_TAG=		e751f863013753578f47d6528cea1b4f91a5f6c6
+GITHUB_TAG=		300a1131368e717d8c57509a2ea3619372b4004a
 
 MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		https://github.com/falzm/collectd-unbound
 COMMENT=		Collectd plugin for submitting unbound statistics
 LICENSE=		modified-bsd
 
-GO_SRCPATH=		github.com/falzm/collectd-unbound
-GO_DIST_BASE=		${DISTNAME}-${GITHUB_TAG}*
-
 DEPENDS+=		go-collectd-[0-9]*:../../wip/go-collectd
 DEPENDS+=		collectd-[0-9]*:../../sysutils/collectd
 
diff --git a/collectd-unbound/distinfo b/collectd-unbound/distinfo
index 71a2ea0cb3..5781d5f550 100644
--- a/collectd-unbound/distinfo
+++ b/collectd-unbound/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-BLAKE2s (collectd-unbound-e751f863013753578f47d6528cea1b4f91a5f6c6.tar.gz) = 873899a8f03688cc933e695bd6ff63bebdc2af9d214cdce8cf0864e8a0b90bfc
-SHA512 (collectd-unbound-e751f863013753578f47d6528cea1b4f91a5f6c6.tar.gz) = 83fb4fce2a299049d7e63ff6b06d148ffcb00e5dcf1a515ecfdfd902c8a8960a8c4fee20ae81befb908df4a0f0151648ca49169020af8289bdaa213e3c42cd59
-Size (collectd-unbound-e751f863013753578f47d6528cea1b4f91a5f6c6.tar.gz) = 2639 bytes
+BLAKE2s (collectd-unbound-300a1131368e717d8c57509a2ea3619372b4004a.tar.gz) = 3d5e8c1def9c3840ddde646678fe842a0fe5ec9f71681f28a2e62e52e6da69ae
+SHA512 (collectd-unbound-300a1131368e717d8c57509a2ea3619372b4004a.tar.gz) = 34e133006a3fa0c95c847feedc0afd83f37a2ff0913bf63f96ab1c374968c818b12662498315eac9dcdc57745514f8a2fb1bc7ce71d2ee88e9d31794372a2dc6
+Size (collectd-unbound-300a1131368e717d8c57509a2ea3619372b4004a.tar.gz) = 2786 bytes
 BLAKE2s (collectd.org_@v_v0.6.0.mod) = 44a06a84593a7ee1a7e1318402e997e8e5f04c6e55097a77ccfa6c974ffff2de
 SHA512 (collectd.org_@v_v0.6.0.mod) = 4868cb2d53e60c3f69f2b2ab56cdc4df9edbe9b6b2cbb3bbb59dc38bc46e51a1b3092060c5ac40c45dac59181720918b81fab7b8049c3477f70b531c42ac770b
 Size (collectd.org_@v_v0.6.0.mod) = 426 bytes
@@ -15,4 +15,3 @@ Size (go.uber.org_multierr_@v_v1.11.0.mod) = 228 bytes
 BLAKE2s (go.uber.org_multierr_@v_v1.11.0.zip) = 38cc533a0c9eea9b5cc6393d1d24d1c18c1a8e2cbd986575e627372fa23e7389
 SHA512 (go.uber.org_multierr_@v_v1.11.0.zip) = 68040fe6658ae4d8215b807c5ccb00df995cbf6bae56d68beef8335abb38d1008f2814abf71b196ccb1ccde10d5234de2da77055171ae87780816ac20521a662
 Size (go.uber.org_multierr_@v_v1.11.0.zip) = 25681 bytes
-SHA1 (patch-collectd-unbound.go) = 8c9b7aee55b78897fe49bdec46a28020ee409071
diff --git a/collectd-unbound/patches/patch-collectd-unbound.go b/collectd-unbound/patches/patch-collectd-unbound.go
deleted file mode 100644
index 34b118b819..0000000000
--- a/collectd-unbound/patches/patch-collectd-unbound.go
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD$
-
-Change from requiring unbound be configured with
-
-  statistics-cumulative: no
-
-to instead requiring
-
-  statistics-cumulative: yes
-
-...and we want all the stats to be collected, and some
-of those are counters and some are gauges.
-
---- collectd-unbound.go.orig	2015-03-21 07:56:41.000000000 +0000
-+++ collectd-unbound.go
-@@ -33,7 +33,8 @@ func unboundStats(interval time.Duration
- 	scanner := bufio.NewScanner(buf)
- 	for scanner.Scan() {
- 		line := scanner.Text()
--		if !strings.HasPrefix(line, "total.") {
-+		// Skip per-thread statistics:
-+		if strings.HasPrefix(line, "thread") {
- 			continue
- 		}
- 
-@@ -43,7 +44,6 @@ func unboundStats(interval time.Duration
- 		}
- 
- 		metric := fields[0]
--		metric = strings.TrimPrefix(metric, "total.")
- 		metric = strings.Replace(metric, ".", "_", -1)
- 
- 		value, err := strconv.ParseFloat(fields[1], 64)
-@@ -51,19 +51,28 @@ func unboundStats(interval time.Duration
- 			log.Printf("error: unable to parse metric value: %v", err)
- 			continue
- 		}
-+		vartype := "counter"
-+		if strings.Contains(fields[1], ".") {
-+			vartype = "gauge"
-+		}
-+		if strings.HasPrefix(metric, "total_requestlist") {
-+			vartype = "gauge"
-+		}
-+		if strings.HasPrefix(metric, "total_recursion") {
-+			vartype = "gauge"
-+		}
- 
- 		vl := api.ValueList{
- 			Identifier: api.Identifier{
- 				Host:         exec.Hostname(),
- 				Plugin:       "unbound",
--				Type:         "gauge",
-+				Type:         vartype,
- 				TypeInstance: metric,
- 			},
- 			Time:     now,
- 			Interval: interval,
- 			Values:   []api.Value{api.Gauge(value)},
- 		}
--
- 		exec.Putval.Write(vl)
- 	}
- }


Home | Main Index | Thread Index | Old Index