Index: head/net-mgmt/pmacct/Makefile =================================================================== --- head/net-mgmt/pmacct/Makefile (revision 467408) +++ head/net-mgmt/pmacct/Makefile (revision 467409) @@ -1,180 +1,180 @@ # Created by: Kirill Ponomarew # $FreeBSD$ PORTNAME= pmacct -DISTVERSION= 1.6.2 +DISTVERSION= 1.7.0 PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= http://www.pmacct.net/ MAINTAINER= pi@FreeBSD.org COMMENT= Accounting and aggregation tool for IPv4 and IPv6 traffic LICENSE= GPLv2 BROKEN_aarch64= fails to build: undefined reference to sbrk BROKEN_powerpc64= fails to build: cc: Internal error: Segmentation fault (program ld) USE_RC_SUBR= pmacctd nfacctd sfacctd SUB_FILES= pkg-message GNU_CONFIGURE= yes CPPFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= "-L${LOCALBASE}/lib" OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 THREADS LAYER2 IPV6 DEBUG \ DOCS PLABEL RABBITMQ KAFKA JANSSON AVRO OPTIONS_DEFAULT=MMAP LAYER2 THREADS SHARED AVRO_DESC= Enable avro support JANSSON_DESC= Enable Jansson support KAFKA_DESC= Enable Kafka support LAYER2_DESC= Enable Layer-2 support: MAC addresses and VLANs # Requires libnetfilter_log port/package # NFLOG_DESC= Enable NFLOG support # Requires legacy mongo-c-driver version 0.8 which is not available # MONGO_DESC= Enable MongoDB support PLABEL_DESC= Enable IP prefix labels RABBITMQ_DESC= Enable RabbitMQ/AMQP support SQLITE3_DESC= Enable SQLite3 support OPTIONS_RADIO= GEOLOC OPTIONS_RADIO_GEOLOC=GEOIP GEOIP2 GEOLOC_DESC= Geolocation support GEOIP_DESC= Enable legacy GeoIP support GEOIP2_DESC= Enable GeoIPv2 (libmaxminddb) support .include .if ${PORT_OPTIONS:MMYSQL} USES+= mysql CONFIGURE_ARGS+=--enable-mysql PLIST_SUB+= WITH_MYSQL="" .else CONFIGURE_ARGS+=--disable-mysql PLIST_SUB+= WITH_MYSQL="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql WANT_PGSQL= client CONFIGURE_ARGS+=--enable-pgsql PLIST_SUB+= WITH_PGSQL="" .else CONFIGURE_ARGS+=--disable-pgsql PLIST_SUB+= WITH_PGSQL="@comment " .endif .if ${PORT_OPTIONS:MSQLITE3} USES+= pkgconfig sqlite CONFIGURE_ARGS+=--enable-sqlite3 \ --with-sqlite3-includes=${LOCALBASE}/include PLIST_SUB+= WITH_SQLITE3="" .else CONFIGURE_ARGS+=--disable-sqlite3 PLIST_SUB+= WITH_SQLITE3="@comment " .endif .if ${PORT_OPTIONS:MLAYER2} CONFIGURE_ARGS+=--enable-l2 .else CONFIGURE_ARGS+=--disable-l2 .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--enable-ipv6 .else CONFIGURE_ARGS+=--disable-ipv6 .endif .if ${PORT_OPTIONS:MPLABEL} CONFIGURE_ARGS+=--enable-plabel .else CONFIGURE_ARGS+=--disable-plabel .endif .if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+=--enable-threads .else CONFIGURE_ARGS+=--disable-threads .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MMONGO} #CONFIGURE_ARGS+=--enable-mongodb .else CONFIGURE_ARGS+=--disable-mongodb .endif .if ${PORT_OPTIONS:MRABBITMQ} .if ${PORT_OPTIONS:MJANSSON} LIB_DEPENDS+= libjansson.so:devel/jansson CONFIGURE_ARGS+=--enable-jansson .else IGNORE= RabbitMQ support requires enabled Jansson support .endif LIB_DEPENDS+= librabbitmq.so:net/rabbitmq-c-devel CONFIGURE_ARGS+=--enable-rabbitmq .endif .if ${PORT_OPTIONS:MKAFKA} .if ${PORT_OPTIONS:MJANSSON} LIB_DEPENDS+= libjansson.so:devel/jansson CONFIGURE_ARGS+=--enable-jansson .else IGNORE= Kafaka support requires enabled Jansson support .endif LIB_DEPENDS+= librdkafka.so:net/librdkafka CONFIGURE_ARGS+=--enable-kafka PLIST_SUB+=WITH_KAFKA="" .else PLIST_SUB+=WITH_KAFKA="@comment " .endif .if ${PORT_OPTIONS:MAVRO} LIB_DEPENDS+= libavro.so:devel/avro-c CONFIGURE_ARGS+=--enable-avro .endif .if ${PORT_OPTIONS:MNFLOG} #CONFIGURE_ARGS+=--enable-nflog #PLIST_SUB+=WITH_NFLOG="" .else CONFIGURE_ARGS+=--disable-nflog PLIST_SUB+=WITH_NFLOG="@comment " .endif .if ${PORT_OPTIONS:MGEOIP} USES+= pkgconfig LIB_DEPENDS+= libGeoIP.so:net/GeoIP CONFIGURE_ARGS+=--enable-geoip .endif .if ${PORT_OPTIONS:MGEOIP2} LIB_DEPENDS+= libmaxminddb.so:net/libmaxminddb CONFIGURE_ARGS+=--enable-geoipv2 .endif .include .if ${ARCH} == "amd64" || ${ARCH} == "sparc64" CONFIGURE_ARGS+=--enable-64bit .endif post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (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 ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sql/* ${STAGEDIR}${DATADIR} .include Index: head/net-mgmt/pmacct/distinfo =================================================================== --- head/net-mgmt/pmacct/distinfo (revision 467408) +++ head/net-mgmt/pmacct/distinfo (revision 467409) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518121340 -SHA256 (pmacct-1.6.2.tar.gz) = e6ede7f500fb1771b5cdfb63dfa016e34c19b8aa2d2f672bd4c63016a5d6bbe2 -SIZE (pmacct-1.6.2.tar.gz) = 1311678 +TIMESTAMP = 1523821290 +SHA256 (pmacct-1.7.0.tar.gz) = 19c3795db452191c2b1b9533fecaf69c6767c9fb7b4ae60ae3f28e24eb2ee9c8 +SIZE (pmacct-1.7.0.tar.gz) = 1351888 Index: head/net-mgmt/pmacct/pkg-plist =================================================================== --- head/net-mgmt/pmacct/pkg-plist (revision 467408) +++ head/net-mgmt/pmacct/pkg-plist (revision 467409) @@ -1,104 +1,106 @@ bin/pmacct 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%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/IPFIX %%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%%/amqp/amqp_receiver.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/avro/avro_file_decoder.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp_md5.lst.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%%/lpref.map.example %%PORTEXAMPLES%%%%EXAMPLESDIR%%/med.map.example %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mrtg-example.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mrtg.conf.example %%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%%/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%%/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%%/README.64bit %%DATADIR%%/README.GeoIP %%DATADIR%%/README.IPv6 %%DATADIR%%/README.cos %%DATADIR%%/README.custom_primitives %%DATADIR%%/README.etype %%DATADIR%%/README.export_proto %%DATADIR%%/README.iface %%DATADIR%%/README.label %%DATADIR%%/README.mask %%DATADIR%%/README.mpls %%WITH_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.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