On Mon Oct 21, 2019 at 09:16:28PM +0200, Rafael Sadowski wrote: > Update telegraf to the lastest stable version after sthen@ tarball fix. > I'd like to use doas instead sudo to collect openntpd, pf and openntpd > metrics so I added a couple simple patches. > > Tested influxdb on amd64. > > OK?
Any objection? I'd also take the maintenance. > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/sysutils/telegraf/Makefile,v > retrieving revision 1.6 > diff -u -p -u -p -r1.6 Makefile > --- Makefile 21 Oct 2019 10:52:20 -0000 1.6 > +++ Makefile 21 Oct 2019 19:08:02 -0000 > @@ -6,11 +6,10 @@ BROKEN-i386 = build fails, no error mess > > GH_ACCOUNT = influxdata > GH_PROJECT = telegraf > -GH_TAGNAME = 1.9.0 > -REVISION = 0 > +GH_TAGNAME = 1.12.3 > HOMEPAGE = https://influxdata.com > # selfhosted because we bundle go deps > -MASTER_SITES = https://rhaalovely.net/stuff/ > +MASTER_SITES = https://sizeofvoid.org/pub/OpenBSD/distfiles/ > > CATEGORIES = sysutils > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/sysutils/telegraf/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -u -p -r1.1.1.1 distinfo > --- distinfo 18 Dec 2018 19:31:28 -0000 1.1.1.1 > +++ distinfo 21 Oct 2019 19:08:02 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (telegraf-1.9.0.tar.gz) = MCBAuASXvOAVU5luKO1w4dBrzcbQrfkXPg2MpurOv7I= > -SIZE (telegraf-1.9.0.tar.gz) = 67990016 > +SHA256 (telegraf-1.12.3.tar.gz) = > 8SSUYLNR0GBsb2rNx5l0wqsXx1Cv4PoK8x2xqHw56AQ= > +SIZE (telegraf-1.12.3.tar.gz) = 127591107 > Index: patches/patch-plugins_inputs_openntpd_openntpd_go > =================================================================== > RCS file: patches/patch-plugins_inputs_openntpd_openntpd_go > diff -N patches/patch-plugins_inputs_openntpd_openntpd_go > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-plugins_inputs_openntpd_openntpd_go 21 Oct 2019 19:08:02 > -0000 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > + > +Index: plugins/inputs/openntpd/openntpd.go > +--- plugins/inputs/openntpd/openntpd.go.orig > ++++ plugins/inputs/openntpd/openntpd.go > +@@ -80,7 +80,7 @@ func openntpdRunner(cmdName string, Timeout internal.D > + > + if UseSudo { > + cmdArgs = append([]string{cmdName}, cmdArgs...) > +- cmd = exec.Command("sudo", cmdArgs...) > ++ cmd = exec.Command("doas", cmdArgs...) > + } > + > + var out bytes.Buffer > Index: patches/patch-plugins_inputs_opensmtpd_opensmtpd_go > =================================================================== > RCS file: patches/patch-plugins_inputs_opensmtpd_opensmtpd_go > diff -N patches/patch-plugins_inputs_opensmtpd_opensmtpd_go > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-plugins_inputs_opensmtpd_opensmtpd_go 21 Oct 2019 > 19:08:02 -0000 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > + > +Index: plugins/inputs/opensmtpd/opensmtpd.go > +--- plugins/inputs/opensmtpd/opensmtpd.go.orig > ++++ plugins/inputs/opensmtpd/opensmtpd.go > +@@ -58,7 +58,7 @@ func opensmtpdRunner(cmdName string, Timeout internal. > + > + if UseSudo { > + cmdArgs = append([]string{cmdName}, cmdArgs...) > +- cmd = exec.Command("sudo", cmdArgs...) > ++ cmd = exec.Command("doas", cmdArgs...) > + } > + > + var out bytes.Buffer > Index: patches/patch-plugins_inputs_pf_pf_go > =================================================================== > RCS file: patches/patch-plugins_inputs_pf_pf_go > diff -N patches/patch-plugins_inputs_pf_pf_go > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-plugins_inputs_pf_pf_go 21 Oct 2019 19:08:02 -0000 > @@ -0,0 +1,17 @@ > +$OpenBSD$ > + > +Index: plugins/inputs/pf/pf.go > +--- plugins/inputs/pf/pf.go.orig > ++++ plugins/inputs/pf/pf.go > +@@ -213,9 +213,9 @@ func (pf *PF) buildPfctlCmd() (string, []string, error > + args := []string{"-s", "info"} > + if pf.UseSudo { > + args = append([]string{cmd}, args...) > +- cmd, err = execLookPath("sudo") > ++ cmd, err = execLookPath("doas") > + if err != nil { > +- return "", nil, fmt.Errorf("can't locate sudo: %v", err) > ++ return "", nil, fmt.Errorf("can't locate doas: %v", err) > + } > + } > + return cmd, args, nil >
