Bug 221798 - databases/libzbxpgsql: Update to 1.1.0, Rename to databases/zabbix3-libzbxpgsql
Summary: databases/libzbxpgsql: Update to 1.1.0, Rename to databases/zabbix3-libzbxpgsql
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: Danilo G. Baio
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-08-25 11:47 UTC by Martin Waschbüsch
Modified: 2017-08-26 19:10 UTC (History)
2 users (show)

See Also:
martin: maintainer-feedback+


Attachments
update to latest upstream v1.1.0; rename to zabbix32-libzbxpgsql (3.54 KB, patch)
2017-08-25 11:47 UTC, Martin Waschbüsch
martin: maintainer-approval+
Details | Diff
update to latest upstream v1.1.0; rename to zabbix3-libzbxpgsql (4.59 KB, patch)
2017-08-26 06:19 UTC, Martin Waschbüsch
martin: maintainer-approval+
Details | Diff
zabbix3-libzbxpgsql-1.1.0.patch (5.04 KB, patch)
2017-08-26 14:50 UTC, Danilo G. Baio
no flags Details | Diff
zabbix3-libzbxpgsql-1.1.0.patch (5.04 KB, patch)
2017-08-26 15:04 UTC, Danilo G. Baio
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Waschbüsch 2017-08-25 11:47:42 UTC
Created attachment 185754 [details]
update to latest upstream v1.1.0; rename to zabbix32-libzbxpgsql
Comment 1 Martin Waschbüsch 2017-08-25 12:14:23 UTC
QA: both portlint and poudriere testport showed no errors.
Comment 2 Danilo G. Baio freebsd_committer freebsd_triage 2017-08-26 00:46:06 UTC
Hi Martin.

You are moving zabbix dependency from zabbix3 to zabbix32 (your patch is not showing this), and this can be a problem for some users, so I would suggest that you do this:

Move databases/libzbxpgsql to databases/zabbix3-libzbxpgsql (And update to v1.1.0)

Then, copy databases/zabbix3-libzbxpgsql to the other versions (changing the zabbix version):

databases/zabbix3-libzbxpgsql -> databases/zabbix32-libzbxpgsql
databases/zabbix3-libzbxpgsql -> databases/zabbix22-libzbxpgsql
databases/zabbix3-libzbxpgsql -> databases/zabbix34-libzbxpgsql (Future reference)

Therefore will be available libzbxpgsql for any zabbix version in the ports tree, like here:
http://cavaliercoder.com/libzbxpgsql/download/

If you need some help, let me know.
Comment 3 Martin Waschbüsch 2017-08-26 04:47:03 UTC
(In reply to Danilo G. Baio from comment #2)
Hi Danilo,

You are right, of course. It seems I had updated this in my private ports tree when I movedto zabbix 3.2, but never submitted a patch. Sorry about that.

I'll follow your suggestion and update / rename the current package to zabbix3-libzbxpgsql and then copy / adapt for the other version.

Patches will follow - stay tuned. :-)
Comment 4 Martin Waschbüsch 2017-08-26 06:19:15 UTC
Created attachment 185773 [details]
update to latest upstream v1.1.0; rename to zabbix3-libzbxpgsql

this patch should cleanly apply to the current libzbxpgsql port and do the following:

- update the port to the latest upstream v1.1.0
- rename the port to zabbix3-libzbxpgsql
Comment 5 Danilo G. Baio freebsd_committer freebsd_triage 2017-08-26 12:55:39 UTC
Thanks for the quick response.
Comment 6 Danilo G. Baio freebsd_committer freebsd_triage 2017-08-26 14:50:08 UTC
Created attachment 185783 [details]
zabbix3-libzbxpgsql-1.1.0.patch


Hi Martin.

I made some improvements to simplify the port, let me know if it looks good to you.
- Let users choose to install the templates (Option EXAMPLES)
- Add CONFLICTS (Prepare for multiple versions)
- Improve LICENSE
Comment 7 Danilo G. Baio freebsd_committer freebsd_triage 2017-08-26 15:04:19 UTC
Created attachment 185785 [details]
zabbix3-libzbxpgsql-1.1.0.patch

This is the right patch
Comment 8 Martin Waschbüsch 2017-08-26 15:16:51 UTC
(In reply to Danilo G. Baio from comment #7)
Hi Danilo,

Looks good to me, except for one line:

CONFLICTS=	zabbix[0-9][0-9]-libzbxpgsql zabbix[0-24-9]-libzbxpgsql

The first regex ([0-9][0-9]), I understand as matching any two digit numeric from 00 to 99.

The second one I read as any of the following two digit numerics:
04 05 06 07 08 09
14 15 16 17 18 19
24 25 26 27 28 29

Now, since the second is a subset of the first, I guess I either do not understand the regex or the CONFLICTS= syntax?

Can you please clarify?
Comment 9 Danilo G. Baio freebsd_committer freebsd_triage 2017-08-26 16:06:33 UTC
(In reply to Martin Waschbüsch from comment #8)

I was thinking in this.

We have today these versions of zabbix agent:
zabbix2-agent
zabbix22-agent
zabbix3-agent
zabbix34-agent
zabbix4-agent (probably in January 2018)

The second part matches any one digit, except the 3.

zabbix2-libzbxpgsql   --> zabbix[0-24-9]-libzbxpgsql
zabbix22-libzbxpgsql  --> zabbix[0-9][0-9]-libzbxpgsql
zabbix3-libzbxpgsql   --> Not matched
zabbix32-libzbxpgsql  --> zabbix[0-9][0-9]-libzbxpgsql
zabbix34-libzbxpgsql  --> zabbix[0-9][0-9]-libzbxpgsql
zabbix4-libzbxpgsql   --> zabbix[0-24-9]-libzbxpgsql

If there is no plan to have zabbix2-libzbxpgsql in the ports tree now, I can remove the second part.
Comment 10 Danilo G. Baio freebsd_committer freebsd_triage 2017-08-26 16:07:40 UTC
(In reply to Danilo G. Baio from comment #9)

We have today these versions of zabbix agent:
zabbix2-agent
zabbix22-agent
zabbix3-agent
zabbix32-agent
zabbix34-agent
zabbix4-agent (probably in January 2018)
Comment 11 Martin Waschbüsch 2017-08-26 16:11:22 UTC
(In reply to Danilo G. Baio from comment #9)
Ah, that was my mistake. Of course [0-24-9] only matches one digit.

All good!
Comment 12 Martin Waschbüsch 2017-08-26 16:13:31 UTC
(In reply to Danilo G. Baio from comment #10)

As far as I can see, libzbxpgsql requires at least version 2.2 of Zabbix:
http://cavaliercoder.com/libzbxpgsql/documentation/system-requirements/

And anything earlier is EOL anyway. (v2.0 support ended in May 2017):
https://www.zabbix.com/life_cycle_and_release_policy
Comment 13 Danilo G. Baio freebsd_committer freebsd_triage 2017-08-26 16:21:31 UTC
(In reply to Martin Waschbüsch from comment #12)

Goog catch, I will remove the second part of CONFLICTS. Thanks.
Comment 14 commit-hook freebsd_committer freebsd_triage 2017-08-26 18:15:12 UTC
A commit references this bug:

Author: dbaio
Date: Sat Aug 26 18:14:56 UTC 2017
New revision: 448779
URL: https://svnweb.freebsd.org/changeset/ports/448779

Log:
  databases/libzbxpgsql: Update to 1.1.0, Rename to databases/zabbix3-libzbxpgsql

  Rename to allow multiple version of libzbxpgsql to coexist, each one
  uses a different zabbix-agent version.

  Add CONFLICTS in preparation for multiple versions as well.

  PR:		221798
  Submitted by:	Martin Waschb?sch <martin@waschbuesch.de> (maintainer)

Changes:
  head/MOVED
  head/databases/Makefile
  head/databases/libzbxpgsql/
  head/databases/zabbix3-libzbxpgsql/
  head/databases/zabbix3-libzbxpgsql/Makefile
  head/databases/zabbix3-libzbxpgsql/distinfo
  head/databases/zabbix3-libzbxpgsql/pkg-descr
  head/databases/zabbix3-libzbxpgsql/pkg-message
  head/databases/zabbix3-libzbxpgsql/pkg-plist
Comment 15 Danilo G. Baio freebsd_committer freebsd_triage 2017-08-26 19:10:34 UTC
Committed, thanks!