diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile index 584609cacfc5..ddfe7b8b521e 100644 --- a/net-mgmt/pmacct/Makefile +++ b/net-mgmt/pmacct/Makefile @@ -1,91 +1,91 @@ PORTNAME= pmacct -DISTVERSION= 1.7.8 -PORTREVISION= 1 +DISTVERSION= 1.7.9 CATEGORIES= net-mgmt MASTER_SITES= http://www.pmacct.net/ MAINTAINER= pi@FreeBSD.org COMMENT= Accounting and aggregation tool for IPv4 and IPv6 traffic WWW= http://www.pmacct.net/ LICENSE= GPLv2 LIB_DEPENDS= libcdada.so:devel/libcdada USES= gmake libtool pkgconfig localbase autoreconf USE_RC_SUBR= pmacctd nfacctd sfacctd SUB_FILES= pkg-message GNU_CONFIGURE= yes OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 LAYER2 DEBUG GEOIP2 \ DOCS RABBITMQ REDIS KAFKA AVRO EXAMPLES OPTIONS_DEFAULT=LAYER2 OPTIONS_SUB= yes AVRO_DESC= Enable avro support GEOIP2_DESC= Enable GeoIPv2 (libmaxminddb) support KAFKA_DESC= Enable Kafka support LAYER2_DESC= Enable Layer-2 support: MAC addresses and VLANs +PGSQL_DESC= PostgreSQL database support (broken) RABBITMQ_DESC= Enable RabbitMQ/AMQP support REDIS_DESC= Enable Redis support SQLITE3_DESC= Enable SQLite3 support SQLDOC= "@comment " MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql MYSQL_VARS+= SQLDOC="" PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= pgsql PGSQL_VARS+= WANT_PGSQL=client PGSQL_VARS+= SQLDOC="" SQLITE3_USES= sqlite SQLITE3_CONFIGURE_ENABLE= sqlite3 SQLITE3_VARS= SQLDOC="" LAYER2_CONFIGURE_ENABLE= l2 DEBUG_CONFIGURE_ENABLE= debug RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c RABBITMQ_CONFIGURE_ENABLE= rabbitmq REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis REDIS_CONFIGURE_ENABLE= redis KAFKA_LIB_DEPENDS= librdkafka.so:net/librdkafka KAFKA_CONFIGURE_ENABLE= kafka AVRO_LIB_DEPENDS= libavro.so:devel/avro-c AVRO_CONFIGURE_ENABLE= avro GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb GEOIP2_CONFIGURE_ENABLE= geoipv2 .include .include .if ${ARCH} == "i386" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-i386 .endif PLIST_SUB+= SQLDOC=${SQLDOC} .if ${PORT_OPTIONS:MRABBITMQ} || ${PORT_OPTIONS:MKAFKA} LIB_DEPENDS+= libjansson.so:devel/jansson CONFIGURE_ARGS+=--enable-jansson .endif post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/[A-Z]* ${STAGEDIR}${DOCSDIR} .for i in AUTHORS CONFIG-KEYS COPYING ChangeLog FAQS INSTALL QUICKSTART UPGRADE ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${MKDIR} ${STAGEDIR}${DATADIR} .include diff --git a/net-mgmt/pmacct/distinfo b/net-mgmt/pmacct/distinfo index f8ecc9c78900..08f66c5b4a67 100644 --- a/net-mgmt/pmacct/distinfo +++ b/net-mgmt/pmacct/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677233508 -SHA256 (pmacct-1.7.8.tar.gz) = 4df50a3c6c7bdace3345bbf3bd4f6fa7a6722ec1fb45dfd266ad956b327da98a -SIZE (pmacct-1.7.8.tar.gz) = 2175335 +TIMESTAMP = 1787995716 +SHA256 (pmacct-1.7.9.tar.gz) = 94185c33d659772035c63be0a82601bb9eb064fb4be1d68ba279b47204b2750a +SIZE (pmacct-1.7.9.tar.gz) = 2132268 diff --git a/net-mgmt/pmacct/files/patch-src_amqp__common.h b/net-mgmt/pmacct/files/patch-src_amqp__common.h deleted file mode 100644 index 400f57f6c39b..000000000000 --- a/net-mgmt/pmacct/files/patch-src_amqp__common.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/amqp_common.h.orig 2022-12-31 20:17:17.000000000 +0100 -+++ src/amqp_common.h 2024-03-29 19:10:46.740680000 +0100 -@@ -23,8 +23,9 @@ - #define AMQP_COMMON_H - - /* includes */ --#include --#include -+#include -+#include -+#include - #include "plugin_common.h" - - /* defines */ diff --git a/net-mgmt/pmacct/files/patch-src_amqp__plugin.h b/net-mgmt/pmacct/files/patch-src_amqp__plugin.h deleted file mode 100644 index b2a1979fbb60..000000000000 --- a/net-mgmt/pmacct/files/patch-src_amqp__plugin.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/amqp_plugin.h.orig 2022-12-31 20:17:17.000000000 +0100 -+++ src/amqp_plugin.h 2024-03-29 19:09:18.874002000 +0100 -@@ -22,8 +22,8 @@ - #define AMQP_PLUGIN_COMMON_H - - /* includes */ --#include --#include -+#include -+#include - #include - - #include "plugin_common.h" diff --git a/net-mgmt/pmacct/files/patch-src_ha.c b/net-mgmt/pmacct/files/patch-src_ha.c new file mode 100644 index 000000000000..db830c03dfe6 --- /dev/null +++ b/net-mgmt/pmacct/files/patch-src_ha.c @@ -0,0 +1,11 @@ +--- src/ha.c.orig 2024-08-01 20:49:09 UTC ++++ src/ha.c +@@ -105,7 +105,7 @@ int bmp_bgp_ha_msglog_init_kafka_host(void) + + int bmp_bgp_ha_msglog_init_kafka_host(void) + { +- int ret; ++ int ret = 0; + if (config.bmp_daemon) ret = bmp_ha_msglog_init_kafka_host(); + else if (config.bgp_daemon) ret = bgp_ha_msglog_init_kafka_host(); + return ret; diff --git a/net-mgmt/pmacct/files/patch-src_imt__plugin.c b/net-mgmt/pmacct/files/patch-src_imt__plugin.c new file mode 100644 index 000000000000..93e325c33075 --- /dev/null +++ b/net-mgmt/pmacct/files/patch-src_imt__plugin.c @@ -0,0 +1,11 @@ +--- src/imt_plugin.c.orig 2024-08-01 20:49:09 UTC ++++ src/imt_plugin.c +@@ -158,7 +158,7 @@ void imt_plugin(int pipe_fd, struct configuration *cfg + if (!config.imt_plugin_path) config.imt_plugin_path = path; + if (!config.buckets) config.buckets = MAX_HOSTS; + +- init_memory_pool_table(); ++ init_memory_pool_table(config); + if (mpd == NULL) { + Log(LOG_ERR, "ERROR ( %s/%s ): unable to allocate memory pools table\n", config.name, config.type); + exit_gracefully(1); diff --git a/net-mgmt/pmacct/files/patch-src_net__aggr.h b/net-mgmt/pmacct/files/patch-src_net__aggr.h deleted file mode 100644 index 35be9ad2e2c2..000000000000 --- a/net-mgmt/pmacct/files/patch-src_net__aggr.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/net_aggr.h.orig 2022-12-31 19:17:17 UTC -+++ src/net_aggr.h -@@ -91,7 +91,7 @@ typedef void (*net_func) (struct networks_table *, str - typedef void (*net_func) (struct networks_table *, struct networks_cache *, struct pkt_primitives *, struct pkt_bgp_primitives *, struct networks_file_data *); - - /* prototypes */ --extern void set_net_funcs(); -+extern void set_net_funcs(struct networks_table *); - extern void init_net_funcs(struct networks_table *, struct networks_cache *, struct pkt_primitives *, struct pkt_bgp_primitives *, struct networks_file_data *); - extern void mask_src_ipaddr(struct networks_table *, struct networks_cache *, struct pkt_primitives *, struct pkt_bgp_primitives *, struct networks_file_data *); - extern void mask_dst_ipaddr(struct networks_table *, struct networks_cache *, struct pkt_primitives *, struct pkt_bgp_primitives *, struct networks_file_data *); diff --git a/net-mgmt/pmacct/files/patch-src_setproctitle.c b/net-mgmt/pmacct/files/patch-src_setproctitle.c deleted file mode 100644 index 7a5a25fc45f6..000000000000 --- a/net-mgmt/pmacct/files/patch-src_setproctitle.c +++ /dev/null @@ -1,24 +0,0 @@ ---- src/setproctitle.c.orig 2022-12-31 19:17:17 UTC -+++ src/setproctitle.c -@@ -38,8 +38,7 @@ extern char *__progname; - * NEWSTR -- Create a copy of a C string - */ - --char *spt_newstr(s) --const char *s; -+char *spt_newstr(const char *s) - { - size_t l; - char *n; -@@ -81,10 +80,7 @@ void - static char *LastArgv = NULL; /* end of argv */ - - void --initsetproctitle(argc, argv, envp) -- int argc; -- char **argv; -- char **envp; -+initsetproctitle(int argc, char **argv, char **envp) - { - register int i; - extern char **environ; diff --git a/net-mgmt/pmacct/pkg-plist b/net-mgmt/pmacct/pkg-plist index 75af7936a429..416d28c1ec63 100644 --- a/net-mgmt/pmacct/pkg-plist +++ b/net-mgmt/pmacct/pkg-plist @@ -1,161 +1,163 @@ bin/pmacct lib/pmacct/examples/lg/pmbgp sbin/nfacctd sbin/pmacctd sbin/pmbgpd sbin/pmbmpd sbin/pmtelemetryd sbin/sfacctd %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BGP_BMP_METRICS.md %%PORTDOCS%%%%DOCSDIR%%/CONFIG-KEYS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/DOCKER.md %%PORTDOCS%%%%DOCSDIR%%/FAQS %%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%%/README.telemetry +%%PORTDOCS%%%%DOCSDIR%%/README_BGP_BMP_HA.md %%PORTDOCS%%%%DOCSDIR%%/SIGNALS %%PORTDOCS%%%%DOCSDIR%%/TRIGGER_VARS %%PORTDOCS%%%%DOCSDIR%%/UPGRADE %%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%%/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%%/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.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.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%%/sampling.map.example %%PORTEXAMPLES%%%%EXAMPLESDIR%%/systemd/systemd_service_file.md %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tee_receivers.lst.example %%DATADIR%%/CONFIG-KEYS %%DATADIR%%/FAQS %%DATADIR%%/QUICKSTART %%SQLDOC%%%%DATADIR%%/README.GeoIP %%SQLDOC%%%%DATADIR%%/README.cos %%SQLDOC%%%%DATADIR%%/README.custom_primitives %%SQLDOC%%%%DATADIR%%/README.etype %%SQLDOC%%%%DATADIR%%/README.export_proto %%SQLDOC%%%%DATADIR%%/README.iface %%SQLDOC%%%%DATADIR%%/README.label %%SQLDOC%%%%DATADIR%%/README.mask %%SQLDOC%%%%DATADIR%%/README.mpls %%SQLDOC%%%%DATADIR%%/README.mysql %%SQLDOC%%%%DATADIR%%/README.nat %%SQLDOC%%%%DATADIR%%/README.pgsql %%SQLDOC%%%%DATADIR%%/README.sampling %%SQLDOC%%%%DATADIR%%/README.sqlite3 %%SQLDOC%%%%DATADIR%%/README.tag2 %%SQLDOC%%%%DATADIR%%/README.timestamp %%SQLDOC%%%%DATADIR%%/README.tunnel %%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 %%SQLDOC%%%%DATADIR%%/pmacct-create-db.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_bgp_v1.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v1.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v2.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v3.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v4.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v5.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v6.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v7.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v8.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-db_v9.mysql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_bgp_v1.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_bgp_v1.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v1.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v1.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v2.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v2.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v3.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v3.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v4.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v4.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v5.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v5.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v6.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v6.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v7_v8.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v7.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v8.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v9.pgsql %%SQLDOC%%%%DATADIR%%/pmacct-create-table_v9.sqlite3 %%SQLDOC%%%%DATADIR%%/pmacct-grant-db.mysql @dir lib/pmacct/examples/custom %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/lg/.libs