Page MenuHomeFreeBSD

net-mgmt/collectd5 - upstream released version 5.5.0
ClosedPublic

Authored by junovitch on Jul 30 2015, 12:46 AM.

Details

Summary

Proposed commit message:

net-mgmt/collectd5: update 5.4.2 -> 5.5.0

PR:		201514
Submitted by:	ports@bsdserwis.com (maintainer)
Approved by:	feld|delphij|pgollucci (mentor)

Mentor will reflect first approver and differential will be added to svn commit per wiki.FreeBSD.org/CodeReview

Test Plan

Poudriere:
https://bugs.FreeBSD.org/bugzilla/attachment.cgi?id=159450

All options but SNMP. SNMP fails testport QA due to an issue with net-mgmt/net-snmp. Bulk build does work. I notified the maintainer with https://bugs.FreeBSD.org/202040

Portlint:

WARN: Makefile: [167]: IGNORE messages should begin with a lowercase letter and end without a period.

The IGNORE message starts with "CGI" which is a proper acronym so I am considering this a false positive.

Runtime:
I've already worked with the maintainer over a week ago to help clean up his submission in https://bugs.FreeBSD.org/201514 and have been using it ever since.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

junovitch updated this revision to Diff 7492.Jul 30 2015, 12:46 AM
junovitch retitled this revision from to net-mgmt/collectd5 - upstream released version 5.5.0.
junovitch updated this object.
junovitch edited the test plan for this revision. (Show Details)
junovitch updated this object.Jul 30 2015, 12:52 AM
junovitch edited the test plan for this revision. (Show Details)
junovitch edited the test plan for this revision. (Show Details)Jul 30 2015, 12:56 AM
junovitch updated this revision to Diff 7493.Jul 30 2015, 1:16 AM
junovitch edited the test plan for this revision. (Show Details)

Fix svn autoprops

Reflect that the modbus.c patch is a svn move along with an update

feld added inline comments.Jul 30 2015, 1:56 AM
net-mgmt/collectd5/Makefile
24 ↗(On Diff #7493)

alpha sort this

65 ↗(On Diff #7493)

collectd 5.5 does now support varnish 4.x. A few changes need to happen to the port to allow it to build successfully, though. If you could get this working that would be cool.

net-mgmt/collectd5/pkg-plist
118 ↗(On Diff #7493)

What happened here? Is this related to the patch of collectd.h?

Addressed review comments inline.

net-mgmt/collectd5/Makefile
24 ↗(On Diff #7493)

Too easy. Will address in next revision.

65 ↗(On Diff #7493)

It would be cool. I'll look into it to see if they can coexist or must be enabled independently.

net-mgmt/collectd5/pkg-plist
118 ↗(On Diff #7493)

From what I tell tell /var/lib/collectd is not in use. However I'll consult with the maintainer and come to a conclusion on why it was removed.

feld requested changes to this revision.Jul 30 2015, 1:44 PM
feld edited edge metadata.
feld added inline comments.
net-mgmt/collectd5/pkg-plist
118 ↗(On Diff #7493)

I seem to recall now that a while ago when I used collectd that directory was always empty... so perhaps this is a good thing. But my memory might be hazy, so we'll see what the maintainer has to say.

This revision now requires changes to proceed.Jul 30 2015, 1:44 PM
junovitch updated this revision to Diff 7580.Aug 2 2015, 1:19 PM
junovitch edited edge metadata.

Update to address comments

junovitch marked 4 inline comments as done.Aug 2 2015, 1:28 PM

Address 2 of the 3 concerns however I will continue to work with the maintainer on the final concern of the /var/lib/colllectd removal.

net-mgmt/collectd5/Makefile
24 ↗(On Diff #7580)

Done.

30 ↗(On Diff #7580)

Also updated for alphabetical ordering here.

480 ↗(On Diff #7580)

I found when doing more QA that the SIGROK option failed to build as well since it could find GVarient data types. I added this to help with that.

net-mgmt/collectd5/files/patch-Makefile.am
7 ↗(On Diff #7580)

Pending maintainer feedback. The /var/lib/collectd dependencies are set in quite a few places and I don't like how fragile these fixes are.

net-mgmt/collectd5/files/patch-configure.ac
44 ↗(On Diff #7580)

The Varnish 4 compile issue came down to this. I've never worked with Varnish before but I am guess Varnish 3 had the necessary includes in /usr/local/include and not /usr/local/include/varnish.

net-mgmt/collectd5/files/patch-src__Makefile.in
8 ↗(On Diff #7580)

Pending maintainer feedback. The /var/lib/collectd dependencies are set in quite a few places and I don't like how fragile these fixes are.

net-mgmt/collectd5/files/patch-src__daemon__Makefile.am
8 ↗(On Diff #7580)

Pending maintainer feedback. The /var/lib/collectd dependencies are set in quite a few places and I don't like how fragile these fixes are.

junovitch edited the test plan for this revision. (Show Details)Aug 2 2015, 1:35 PM
junovitch edited edge metadata.
feld added a comment.Aug 2 2015, 2:13 PM

Address 2 of the 3 concerns however I will continue to work with the maintainer on the final concern of the /var/lib/colllectd removal.

If you have a running instance that shows this dir is empty it matches my memory. I'm OK with approving this revision if this is what you see as well.

net-mgmt/collectd5/files/patch-configure.ac
44 ↗(On Diff #7580)

ahh, yes, good catch.

feld accepted this revision.Aug 2 2015, 2:13 PM
feld edited edge metadata.
This revision is now accepted and ready to land.Aug 2 2015, 2:13 PM
junovitch marked an inline comment as done.Aug 2 2015, 2:20 PM

Sounds good. Thanks Mark. I'll commit this once I get an approval from the maintainer on my set of changes.

This revision was automatically updated to reflect the committed changes.