mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

net-mgmt/pmacct: upgrade 1.7.0 -> 1.7.3, fix depends for RABBITMQ or KAFKA

Browse Source 
- lots of changes since 1.7.0

PR:		238383
Submitted by:	pizzamig
Relnotes:	http://www.pmacct.net/ChangeLog-1.7.3
This commit is contained in:
Kurt Jaeger 2019-06-07 20:02:06 +00:00
parent 14ffd13f14
commit 739a673bc5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=503646
4 changed files with 165 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net-mgmt/pmacct/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pmacct
DISTVERSION= 1.7.0
PORTREVISION= 1
DISTVERSION= 1.7.3
CATEGORIES= net-mgmt
MASTER_SITES= http://www.pmacct.net/
@ -14,6 +13,7 @@ LICENSE= GPLv2
BROKEN_aarch64= fails to build: undefined reference to sbrk
USES= libtool
USE_RC_SUBR= pmacctd nfacctd sfacctd
SUB_FILES= pkg-message
GNU_CONFIGURE= yes
@ -104,6 +104,7 @@ CONFIGURE_ARGS+=--disable-mongodb
.if ${PORT_OPTIONS:MRABBITMQ}
.if ${PORT_OPTIONS:MJANSSON}
USES+= pkgconfig
LIB_DEPENDS+= libjansson.so:devel/jansson
CONFIGURE_ARGS+=--enable-jansson
.else
@ -115,6 +116,7 @@ CONFIGURE_ARGS+=--enable-rabbitmq
.if ${PORT_OPTIONS:MKAFKA}
.if ${PORT_OPTIONS:MJANSSON}
USES+= pkgconfig
LIB_DEPENDS+= libjansson.so:devel/jansson
CONFIGURE_ARGS+=--enable-jansson
.else
@ -159,7 +161,7 @@ post-install:
(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
.for i in AUTHORS CONFIG-KEYS COPYING ChangeLog FAQS INSTALL QUICKSTART TOOLS UPGRADE
.for i in AUTHORS CONFIG-KEYS COPYING ChangeLog FAQS INSTALL QUICKSTART UPGRADE
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
.endfor
@${MKDIR} ${STAGEDIR}${DATADIR}

6
net-mgmt/pmacct/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1523821290
SHA256 (pmacct-1.7.0.tar.gz) = 19c3795db452191c2b1b9533fecaf69c6767c9fb7b4ae60ae3f28e24eb2ee9c8
SIZE (pmacct-1.7.0.tar.gz) = 1351888
TIMESTAMP = 1559915336
SHA256 (pmacct-1.7.3.tar.gz) = 82ca04674a0d6f1ce11dc64d5d44d49bcf923cefff99799359148abb6bfd4f1d
SIZE (pmacct-1.7.3.tar.gz) = 1467237

23
net-mgmt/pmacct/files/patch-src_mysql_plugin.c
View File

@ -1,23 +0,0 @@
--- src/mysql_plugin.c.orig 2019-01-06 20:48:02.557254000 +0100
+++ src/mysql_plugin.c 2019-01-06 20:49:11.176001000 +0100
@@ -668,8 +668,9 @@
MYSQL *dbptr = db->desc;
if (!db->fail) {
+ my_bool reconnect = 1;
mysql_init(db->desc);
- dbptr->reconnect = TRUE;
+ mysql_options(db->desc, MYSQL_OPT_RECONNECT, &reconnect);
if (!mysql_real_connect(db->desc, host, config.sql_user, config.sql_passwd, config.sql_db, 0, NULL, 0)) {
sql_db_fail(db);
MY_get_errmsg(db);
@@ -768,5 +769,9 @@
void MY_mysql_get_version()
{
+#ifdef MARIADB_CLIENT_VERSION_STR
+ printf("MySQL %s\n", MARIADB_CLIENT_VERSION_STR);
+#else
printf("MySQL %s\n", MYSQL_SERVER_VERSION);
+#endif
}

210
net-mgmt/pmacct/pkg-plist
View File

@ -1,58 +1,81 @@
bin/pmacct
lib/pmacct/examples/lg/pmbgp
sbin/nfacctd
sbin/pmacctd
sbin/pmbgpd
sbin/pmbmpd
sbin/pmtelemetryd
sbin/sfacctd
%%WITH_NFLOG%%sbin/uacctd
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/CONFIG-KEYS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/FAQS
%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
%%PORTDOCS%%%%DOCSDIR%%/FLOW_AUGMENTATION_PROCESS_DESCRIPTION.md
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
%%PORTDOCS%%%%DOCSDIR%%/IPFIX
%%PORTDOCS%%%%DOCSDIR%%/LOOKING_GLASS_FORMAT
%%PORTDOCS%%%%DOCSDIR%%/MSGLOG_DUMP_FORMATS
%%PORTDOCS%%%%DOCSDIR%%/PLUGINS
%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
%%PORTDOCS%%%%DOCSDIR%%/SIGNALS
%%PORTDOCS%%%%DOCSDIR%%/TOOLS
%%PORTDOCS%%%%DOCSDIR%%/TRIGGER_VARS
%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/agent_to_peer.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/allow-list.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/allow.lst.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amqp/amqp_receiver.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/avro/avro_file_decoder.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp_agent.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp_md5.lst.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp_xconnects.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/.deps/libcustom_la-libcustom.Plo
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/.libs/libcustom.a
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/.libs/libcustom_la-libcustom.o
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/Makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/Makefile.am
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/Makefile.in
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/libcustom.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/libcustom.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/libcustom_la-libcustom.lo
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/libcustom_la-libcustom.o
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom/nfacctd-custom.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flow_to_rd.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnuplot-example.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnuplot.script.example
%%WITH_KAFKA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kafka/kafka_confluent_consumer.py
%%WITH_KAFKA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kafka/kafka_consumer.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kafka/kafka_consumer.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/.deps/pmbgp-pmbgp.Po
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/Makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/Makefile.am
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/Makefile.in
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/pmbgp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/pmbgp-pmbgp.o
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/pmbgp.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/pmbgp.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lg/pmbgp.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lpref.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/med.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mrtg-example.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mrtg.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/gnuplot-example.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/gnuplot.script.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/mrtg-example.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/mrtg.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misc/rrdtool-example.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/networks.lst.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nfacctd-print.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nfacctd-sql_v1.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nfacctd-sql_v2.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nfacctd-sql.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcap_interfaces.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/peers.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-imt.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-multiple-plugins.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sql_v1.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sql_v2.conf.example
%%WITH_SQLITE3%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sqlite3_v4.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sql.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sqlite3.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ports.lst.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pretag.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/primitives.lst.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/probe_netflow.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/probe_sflow.conf.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rrdtool-example.sh
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampling.map.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tee_receivers.lst.example
%%DATADIR%%/CONFIG-KEYS
%%DATADIR%%/FAQS
%%DATADIR%%/QUICKSTART
%%DATADIR%%/README.64bit
%%DATADIR%%/README.GeoIP
%%DATADIR%%/README.IPv6
@ -64,43 +87,124 @@ sbin/sfacctd
%%DATADIR%%/README.label
%%DATADIR%%/README.mask
%%DATADIR%%/README.mpls
%%WITH_MYSQL%%%%DATADIR%%/README.mysql
%%DATADIR%%/README.mysql
%%DATADIR%%/README.nat
%%WITH_PGSQL%%%%DATADIR%%/README.pgsql
%%DATADIR%%/README.pkt_len_distrib
%%DATADIR%%/README.sampling_rate
%%WITH_SQLITE3%%%%DATADIR%%/README.sqlite3
%%DATADIR%%/README.pgsql
%%DATADIR%%/README.sampling
%%DATADIR%%/README.sqlite3
%%DATADIR%%/README.tag2
%%DATADIR%%/README.timestamp
%%DATADIR%%/README.tunnel
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-db.pgsql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_bgp_v1.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v1.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v2.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v3.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v4.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v5.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v6.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v7.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v8.mysql
%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v9.mysql
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_bgp_v1.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_bgp_v1.sqlite3
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v1.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v1.sqlite3
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v2.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v2.sqlite3
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v3.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v3.sqlite3
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v4.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v4.sqlite3
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v5.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v5.sqlite3
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v6.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v6.sqlite3
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v7.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v7.sqlite3
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v8.sqlite3
%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v9.pgsql
%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v9.sqlite3
%%WITH_MYSQL%%%%DATADIR%%/pmacct-grant-db.mysql
%%DATADIR%%/UPGRADE
%%DATADIR%%/docs/IPFIX
%%DATADIR%%/docs/LOOKING_GLASS_FORMAT
%%DATADIR%%/docs/MSGLOG_DUMP_FORMATS
%%DATADIR%%/docs/SIGNALS
%%DATADIR%%/docs/TRIGGER_VARS
%%DATADIR%%/examples/allow.lst.example
%%DATADIR%%/examples/amqp/amqp_receiver.py
%%DATADIR%%/examples/avro/avro_file_decoder.py
%%DATADIR%%/examples/bgp_agent.map.example
%%DATADIR%%/examples/bgp_md5.lst.example
%%DATADIR%%/examples/bgp_xconnects.map.example
%%DATADIR%%/examples/flow_to_rd.map.example
%%DATADIR%%/examples/kafka/kafka_consumer.py
%%DATADIR%%/examples/lg/pmbgp.py
%%DATADIR%%/examples/networks.lst.example
%%DATADIR%%/examples/nfacctd-sql.conf.example
%%DATADIR%%/examples/pcap_interfaces.map.example
%%DATADIR%%/examples/peers.map.example
%%DATADIR%%/examples/pmacctd-imt.conf.example
%%DATADIR%%/examples/pmacctd-multiple-plugins.conf.example
%%DATADIR%%/examples/pmacctd-sql.conf.example
%%DATADIR%%/examples/pmacctd-sqlite3.conf.example
%%DATADIR%%/examples/ports.lst.example
%%DATADIR%%/examples/pretag.map.example
%%DATADIR%%/examples/primitives.lst.example
%%DATADIR%%/examples/probe_netflow.conf.example
%%DATADIR%%/examples/probe_sflow.conf.example
%%DATADIR%%/examples/sampling.map.example
%%DATADIR%%/examples/tee_receivers.lst.example
%%DATADIR%%/pmacct-create-db.pgsql
%%DATADIR%%/pmacct-create-db_bgp_v1.mysql
%%DATADIR%%/pmacct-create-db_v1.mysql
%%DATADIR%%/pmacct-create-db_v2.mysql
%%DATADIR%%/pmacct-create-db_v3.mysql
%%DATADIR%%/pmacct-create-db_v4.mysql
%%DATADIR%%/pmacct-create-db_v5.mysql
%%DATADIR%%/pmacct-create-db_v6.mysql
%%DATADIR%%/pmacct-create-db_v7.mysql
%%DATADIR%%/pmacct-create-db_v8.mysql
%%DATADIR%%/pmacct-create-db_v9.mysql
%%DATADIR%%/pmacct-create-table_bgp_v1.pgsql
%%DATADIR%%/pmacct-create-table_bgp_v1.sqlite3
%%DATADIR%%/pmacct-create-table_v1.pgsql
%%DATADIR%%/pmacct-create-table_v1.sqlite3
%%DATADIR%%/pmacct-create-table_v2.pgsql
%%DATADIR%%/pmacct-create-table_v2.sqlite3
%%DATADIR%%/pmacct-create-table_v3.pgsql
%%DATADIR%%/pmacct-create-table_v3.sqlite3
%%DATADIR%%/pmacct-create-table_v4.pgsql
%%DATADIR%%/pmacct-create-table_v4.sqlite3
%%DATADIR%%/pmacct-create-table_v5.pgsql
%%DATADIR%%/pmacct-create-table_v5.sqlite3
%%DATADIR%%/pmacct-create-table_v6.pgsql
%%DATADIR%%/pmacct-create-table_v6.sqlite3
%%DATADIR%%/pmacct-create-table_v7.pgsql
%%DATADIR%%/pmacct-create-table_v7.sqlite3
%%DATADIR%%/pmacct-create-table_v8.sqlite3
%%DATADIR%%/pmacct-create-table_v9.pgsql
%%DATADIR%%/pmacct-create-table_v9.sqlite3
%%DATADIR%%/pmacct-grant-db.mysql
%%DATADIR%%/sql/README.64bit
%%DATADIR%%/sql/README.GeoIP
%%DATADIR%%/sql/README.IPv6
%%DATADIR%%/sql/README.cos
%%DATADIR%%/sql/README.custom_primitives
%%DATADIR%%/sql/README.etype
%%DATADIR%%/sql/README.export_proto
%%DATADIR%%/sql/README.iface
%%DATADIR%%/sql/README.label
%%DATADIR%%/sql/README.mask
%%DATADIR%%/sql/README.mpls
%%DATADIR%%/sql/README.mysql
%%DATADIR%%/sql/README.nat
%%DATADIR%%/sql/README.pgsql
%%DATADIR%%/sql/README.sampling
%%DATADIR%%/sql/README.sqlite3
%%DATADIR%%/sql/README.tag2
%%DATADIR%%/sql/README.timestamp
%%DATADIR%%/sql/README.tunnel
%%DATADIR%%/sql/pmacct-create-db.pgsql
%%DATADIR%%/sql/pmacct-create-db_bgp_v1.mysql
%%DATADIR%%/sql/pmacct-create-db_v1.mysql
%%DATADIR%%/sql/pmacct-create-db_v2.mysql
%%DATADIR%%/sql/pmacct-create-db_v3.mysql
%%DATADIR%%/sql/pmacct-create-db_v4.mysql
%%DATADIR%%/sql/pmacct-create-db_v5.mysql
%%DATADIR%%/sql/pmacct-create-db_v6.mysql
%%DATADIR%%/sql/pmacct-create-db_v7.mysql
%%DATADIR%%/sql/pmacct-create-db_v8.mysql
%%DATADIR%%/sql/pmacct-create-db_v9.mysql
%%DATADIR%%/sql/pmacct-create-table_bgp_v1.pgsql
%%DATADIR%%/sql/pmacct-create-table_bgp_v1.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v1.pgsql
%%DATADIR%%/sql/pmacct-create-table_v1.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v2.pgsql
%%DATADIR%%/sql/pmacct-create-table_v2.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v3.pgsql
%%DATADIR%%/sql/pmacct-create-table_v3.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v4.pgsql
%%DATADIR%%/sql/pmacct-create-table_v4.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v5.pgsql
%%DATADIR%%/sql/pmacct-create-table_v5.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v6.pgsql
%%DATADIR%%/sql/pmacct-create-table_v6.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v7.pgsql
%%DATADIR%%/sql/pmacct-create-table_v7.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v8.sqlite3
%%DATADIR%%/sql/pmacct-create-table_v9.pgsql
%%DATADIR%%/sql/pmacct-create-table_v9.sqlite3
%%DATADIR%%/sql/pmacct-grant-db.mysql
@dir lib/pmacct/examples/custom
%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/lg/.libs