Bug 204583 - net-mgmt/collectd5: VARNISH option does not compile with varnish 4.1
Summary: net-mgmt/collectd5: VARNISH option does not compile with varnish 4.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Jason Unovitch
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-11-16 03:09 UTC by Jason Unovitch
Modified: 2015-11-17 01:05 UTC (History)
2 users (show)

See Also:
ports: maintainer-feedback+


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jason Unovitch freebsd_committer freebsd_triage 2015-11-16 03:09:34 UTC

    
Comment 1 Jason Unovitch freebsd_committer freebsd_triage 2015-11-16 03:12:35 UTC
Open separate PR for tracking scope of work for the collectd5 VARNISH option.

CC Mark as www/varnish4 maintainer.  FYI looks like the update to 4.1 isn't compatible for collectd5.  Feel free to remove yourself from CC if you don't need any updates on progress here.

https://people.FreeBSD.org/~junovitch/poudriere/PR204583/collectd5-5.5.0_3.log
Comment 2 commit-hook freebsd_committer freebsd_triage 2015-11-16 03:51:14 UTC
A commit references this bug:

Author: junovitch
Date: Mon Nov 16 03:50:24 UTC 2015
New revision: 401750
URL: https://svnweb.freebsd.org/changeset/ports/401750

Log:
  net-mgmt/collectd5: partially convert to option helpers [1]

  - Add explicit CURL_JSON and CURL_XML options.  Previously these options
    would be automatically enabled when CURL and JSON or CURL and XML were
    selected together.  Change them to an _IMPLIES variable as an explicit
    option
  - Convert all options except PERL and PYTHON, for the time being, to the
    new framework.  The option helper variant is not expanding ${PYTHON_CMD}
    and is currently passing it as "--with-python= " which fails to build.
  - No PORTREVISION change given no change to package
  - While here, tag VARNISH as BROKEN, fails to compile with varnish4-4.1 [2]

  PR:		204220 [1]
  PR:		204583 [2]
  Submitted by:	Krzysztof <ports@bsdserwis.com> (maintainer) [1]

Changes:
  head/net-mgmt/collectd5/Makefile
Comment 3 Mark Felder freebsd_committer freebsd_triage 2015-11-16 14:38:50 UTC
Apply this patch until the next Collectd release


https://github.com/mfournier/collectd/commit/d010d9eff882765201359959a583033dae4b373c
Comment 4 Krzysztof 2015-11-16 22:28:39 UTC
Yes, that's true: collectd support varnish 4.0 [1]. I think it's quite good idea to add temporarily patch [2] to support new versions of varnish.

Also I've made a typo [3] during converting Makefile, so it should be corrected during this commit. 

I think I should collect all our work, thoughts and suggestions from these PRs and made a new (cummulative) patch to cover all issues. But I don't know in which PR add this new patch

[1] https://collectd.org/wiki/index.php/Plugin:Varnish
[2] https://github.com/mfournier/collectd/commit/d010d9eff882765201359959a583033dae4b373c
[3] bug #204608
Comment 5 commit-hook freebsd_committer freebsd_triage 2015-11-17 00:57:50 UTC
A commit references this bug:

Author: junovitch
Date: Tue Nov 17 00:57:09 UTC 2015
New revision: 401796
URL: https://svnweb.freebsd.org/changeset/ports/401796

Log:
  net-mgmt/collectd5: fix typo and add patch for Varnish 4.1 compatability

  - Fix copy/paste typo in XML_LIB_DEPENDS [1]
  - Add patch for building with varnish4-4.1 and drop VARNISH_BROKEN [2]
  - Bump PORTREVISION for package change with XML_LIB_DEPENDS option

  PR:		204608 [1]
  PR:		204583 [2]
  Reported by:	rhavenn@rhavenn.net [1]
  Submitted by:	feld [2]
  Obtained from:	https://github.com/mfournier/collectd [2]
  Approved by:	Krzysztof <ports@bsdserwis.com> (maintainer)

Changes:
  head/net-mgmt/collectd5/Makefile
  head/net-mgmt/collectd5/files/patch-src__varnish.c
Comment 6 Jason Unovitch freebsd_committer freebsd_triage 2015-11-17 01:05:16 UTC
(In reply to Mark Felder from comment #3)
Mark,
Thanks!  That patch alone didn't apply and there was actually 3 separate commits for this in the pull request for Varnish 4.1 compat.  One additional commit was pulled as a prerequisite [2] as it was touched the same area of code. 

[1] https://github.com/collectd/collectd/pull/1336
[2] https://github.com/mfournier/collectd/commit/0eebd2655842fbb634f67afd44fa4fdcf4e6f189

(In reply to Krzysztof from comment #4)
Don't worry about it, I pooled together the work from bug 204608 with this PR.