From nobody Wed Jan 26 20:04:32 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CCC0519856FE; Wed, 26 Jan 2022 20:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JkZSJ5H3Tz4rq9; Wed, 26 Jan 2022 20:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643227472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+er9RziQfNqLVnFCL2pi4dddd8GZn4PgvWV9kbAGSKg=; b=PbWxephHMrCWvHhtscUwjg4jV9cSv5tBU+0IFdAYIhXWHpGR+LN9n5iLiOc7m9edLoGBY3 ed0T/sqoLjVw71/jXPptkM3vVyuozWiO0O3+V+SPl36V+2JD7atFlrMFTyM2s42dF/IVDm zflJyPAsFO1+QYQWzCv7cfIsc2+TVQZ+KEh9eI3KY+eE/2WYEvnlII9hswZujkKvDOJo7p R/JQy165MAeuiDxM5+13RjJFLdMMe8/0s35m4A6w6JQMYMShfA9kqBeFuVQj2vKL0XaJda rIMf44ca7c3Opc5a3UXPgWbotnBU6isnYqHepfEvZ8y/b7jWmRNFk1b4r2vfNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 95683CB4; Wed, 26 Jan 2022 20:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20QK4WaI066485; Wed, 26 Jan 2022 20:04:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QK4WhJ066484; Wed, 26 Jan 2022 20:04:32 GMT (envelope-from git) Date: Wed, 26 Jan 2022 20:04:32 GMT Message-Id: <202201262004.20QK4WhJ066484@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: c2da42cc80a9 - main - net-mgmt/pmacct: update 1.7.5 -> 1.7.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2da42cc80a9b3f707f6186c1e8c4ecbf1efb0f1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643227472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+er9RziQfNqLVnFCL2pi4dddd8GZn4PgvWV9kbAGSKg=; b=pHNWyzxn1quDu4BnJbYUwGaBd9/7ug7zIOH1yRmuJTlBLGMrGrdojMxHtcxbQWEq58QKd0 cnjE6EB+1FRUW5AFMlEs4RlzeJHVq6VZMCOwSaMPmCrxwOng8N5MleiFtVOhpDLeoE0pje GDnl5N1Bpc1LcP/9/AZy2oLO5hcsJ+JbIQi8uNtGVIeyqasnvXd4Vf1MjoOFmfisYBlB9v rfVXaLMHVGtewKBGWj2oE7lVfv0Zy1LaMT61WXSLZQeCSAdsBCfquRKNKxEOwz4qVMedQ9 kjwtZA7LXvqaloa/JcMdl8U5Eera8+2Dwy2bxY4Kse2Astfd+L4psiPUcujS9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643227472; a=rsa-sha256; cv=none; b=h8k8W25QNLqYmzIa98RoDh+OezH41tXFURu8cgp/dWc39WasrOy2+lG6FNkFiIZlOTJp/S Fva2LF0huy/OJrtTvqLMMOq4RRgKikWW/u8TJcp7v7Yok6JvrwiEvpfbzxBIfhF9DkMUB8 ipFQUpqzTDflAPyLcfpCNKOsYwEHTyt7q7FXU4H6fAgsrdZsirLEMlkXpQNXGK0cNmFWRy EmO/LaqQ7yQJ3F9lvM7nN6DD3THfrpTwFD+w69snrR83g6tYQvVrztWkN5iFg+e0JHND3O epqIhr4fc2CNVW1EMG2NEjuxk0Tu/BAp8IKkpsN+4ujGO/A5Nc7JQmEoGMFwoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2da42cc80a9b3f707f6186c1e8c4ecbf1efb0f1 commit c2da42cc80a9b3f707f6186c1e8c4ecbf1efb0f1 Author: Robert Clausecker AuthorDate: 2022-01-26 20:03:41 +0000 Commit: Kurt Jaeger CommitDate: 2022-01-26 20:03:41 +0000 net-mgmt/pmacct: update 1.7.5 -> 1.7.7 - remove -Werror as per policy - touch up patches - remove PLABEL option for feature removed in 1.7.6 PR: 260194 Changes: http://www.pmacct.net/ChangeLog-1.7.7 --- net-mgmt/pmacct/Makefile | 20 ++++++------- net-mgmt/pmacct/distinfo | 6 ++-- net-mgmt/pmacct/files/extra-patch-i386 | 29 ++++++++++++++++++ net-mgmt/pmacct/files/patch-Makefile.in | 4 +-- net-mgmt/pmacct/files/patch-src_nfacctd.c | 11 ------- .../files/patch-src_nfprobe__plugin_netflow9.c | 4 +-- net-mgmt/pmacct/files/patch-src_pgsql__plugin.c | 4 +-- net-mgmt/pmacct/files/patch-src_pmacct.c | 8 ++--- net-mgmt/pmacct/files/patch-src_pmacctd.c | 11 ------- net-mgmt/pmacct/files/patch-src_pmbgpd.c | 11 ------- net-mgmt/pmacct/files/patch-src_pmbmpd.c | 11 ------- net-mgmt/pmacct/files/patch-src_pmtelemetryd.c | 11 ------- net-mgmt/pmacct/files/patch-src_sfacctd.c | 11 ------- net-mgmt/pmacct/files/patch-src_sql__common.c | 34 ---------------------- net-mgmt/pmacct/files/patch-src_sqlite3__plugin.c | 4 +-- net-mgmt/pmacct/files/patch-src_util.c | 13 ++------- net-mgmt/pmacct/pkg-plist | 2 ++ 17 files changed, 58 insertions(+), 136 deletions(-) diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile index 15b98614f119..b160bd88c9ad 100644 --- a/net-mgmt/pmacct/Makefile +++ b/net-mgmt/pmacct/Makefile @@ -1,8 +1,7 @@ # Created by: Kirill Ponomarew PORTNAME= pmacct -DISTVERSION= 1.7.5 -PORTREVISION= 1 +DISTVERSION= 1.7.7 CATEGORIES= net-mgmt MASTER_SITES= http://www.pmacct.net/ @@ -11,13 +10,13 @@ COMMENT= Accounting and aggregation tool for IPv4 and IPv6 traffic LICENSE= GPLv2 -USES= libtool pkgconfig localbase +USES= 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 PLABEL RABBITMQ REDIS KAFKA AVRO EXAMPLES + DOCS RABBITMQ REDIS KAFKA AVRO EXAMPLES OPTIONS_DEFAULT=LAYER2 OPTIONS_SUB= yes @@ -25,7 +24,6 @@ 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 -PLABEL_DESC= Enable IP prefix labels RABBITMQ_DESC= Enable RabbitMQ/AMQP support REDIS_DESC= Enable Redis support SQLITE3_DESC= Enable SQLite3 support @@ -46,7 +44,6 @@ SQLITE3_CONFIGURE_ENABLE= sqlite3 SQLITE3_VARS= SQLDOC="" LAYER2_CONFIGURE_ENABLE= l2 -PLABEL_CONFIGURE_ENABLE= plabel DEBUG_CONFIGURE_ENABLE= debug RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c-devel @@ -66,6 +63,12 @@ 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} @@ -73,9 +76,6 @@ LIB_DEPENDS+= libjansson.so:devel/jansson CONFIGURE_ARGS+=--enable-jansson .endif -post-patch: - @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure - post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) @@ -86,4 +86,4 @@ post-install: .endfor ${MKDIR} ${STAGEDIR}${DATADIR} -.include +.include diff --git a/net-mgmt/pmacct/distinfo b/net-mgmt/pmacct/distinfo index bb1716bee674..e0c589a9eb67 100644 --- a/net-mgmt/pmacct/distinfo +++ b/net-mgmt/pmacct/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1596635446 -SHA256 (pmacct-1.7.5.tar.gz) = 2e778bd3cdd968c4b9f22e28008b9b72f229980201d2cc2ee04cb02f6b0bdcd5 -SIZE (pmacct-1.7.5.tar.gz) = 1626770 +TIMESTAMP = 1638535520 +SHA256 (pmacct-1.7.7.tar.gz) = 8c781f38565bb899a31feb0962676a3c9ce712cf180fe0dca9120bfb15ddfb8c +SIZE (pmacct-1.7.7.tar.gz) = 2149629 diff --git a/net-mgmt/pmacct/files/extra-patch-i386 b/net-mgmt/pmacct/files/extra-patch-i386 new file mode 100644 index 000000000000..6a0a6a38ca01 --- /dev/null +++ b/net-mgmt/pmacct/files/extra-patch-i386 @@ -0,0 +1,29 @@ +--- src/sql_common_m.c.orig 2022-01-26 18:30:42.475639000 +0100 ++++ src/sql_common_m.c 2022-01-26 18:31:05.795499000 +0100 +@@ -259,7 +259,7 @@ + + strncat(envbuf.ptr, "ELAPSED_TIME=", envbuf.end-envbuf.ptr); + tmpptr = envbuf.ptr + strlen(envbuf.ptr); +- snprintf(tmpptr, envbuf.end-tmpptr, "%lu", idata->elap_time); ++ snprintf(tmpptr, envbuf.end-tmpptr, "%u", idata->elap_time); + ptrs[count] = envbuf.ptr; + envbuf.ptr += strlen(envbuf.ptr)+1; + count++; +@@ -292,7 +292,7 @@ + + strncat(envbuf.ptr, "SQL_HISTORY_BASETIME=", envbuf.end-envbuf.ptr); + tmpptr = envbuf.ptr + strlen(envbuf.ptr); +- snprintf(tmpptr, envbuf.end-tmpptr, "%lu", idata->basetime); ++ snprintf(tmpptr, envbuf.end-tmpptr, "%u", idata->basetime); + ptrs[count] = envbuf.ptr; + envbuf.ptr += strlen(envbuf.ptr)+1; + count++; +@@ -303,7 +303,7 @@ + + strncat(envbuf.ptr, "SQL_HISTORY_TIMESLOT=", envbuf.end-envbuf.ptr); + tmpptr = envbuf.ptr + strlen(envbuf.ptr); +- snprintf(tmpptr, envbuf.end-tmpptr, "%lu", idata->timeslot); ++ snprintf(tmpptr, envbuf.end-tmpptr, "%u", idata->timeslot); + ptrs[count] = envbuf.ptr; + envbuf.ptr += strlen(envbuf.ptr)+1; + count++; diff --git a/net-mgmt/pmacct/files/patch-Makefile.in b/net-mgmt/pmacct/files/patch-Makefile.in index cf7b889797dc..7d6adba5db55 100644 --- a/net-mgmt/pmacct/files/patch-Makefile.in +++ b/net-mgmt/pmacct/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2020-06-17 22:02:42 UTC +--- Makefile.in.orig 2021-11-05 15:04:53 UTC +++ Makefile.in -@@ -417,7 +417,7 @@ pmacct_examples_avro_dir = $(pmacct_examples_dir)/avro +@@ -429,7 +429,7 @@ pmacct_examples_avro_dir = $(pmacct_examples_dir)/avro @USING_BGP_BINS_TRUE@pmacct_examples_lg_dir = $(pmacct_examples_dir)/lg @USING_BGP_BINS_TRUE@pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg pmacct_examples_custom_dir = $(pmacct_examples_arch_dir)/custom diff --git a/net-mgmt/pmacct/files/patch-src_nfacctd.c b/net-mgmt/pmacct/files/patch-src_nfacctd.c deleted file mode 100644 index 1a74e6d99c8c..000000000000 --- a/net-mgmt/pmacct/files/patch-src_nfacctd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/nfacctd.c.orig 2020-08-24 15:07:56 UTC -+++ src/nfacctd.c -@@ -49,7 +49,7 @@ struct template_cache tpl_cache; - struct host_addr debug_a; - char debug_agent_addr[50]; - u_int16_t debug_agent_port; --struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ -+extern struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ - - /* Functions */ - void usage_daemon(char *prog_name) diff --git a/net-mgmt/pmacct/files/patch-src_nfprobe__plugin_netflow9.c b/net-mgmt/pmacct/files/patch-src_nfprobe__plugin_netflow9.c index 6ba07373eba9..399f1e1b395d 100644 --- a/net-mgmt/pmacct/files/patch-src_nfprobe__plugin_netflow9.c +++ b/net-mgmt/pmacct/files/patch-src_nfprobe__plugin_netflow9.c @@ -1,6 +1,6 @@ ---- src/nfprobe_plugin/netflow9.c.orig 2020-05-10 13:57:54 UTC +--- src/nfprobe_plugin/netflow9.c.orig 2021-11-05 15:03:23 UTC +++ src/nfprobe_plugin/netflow9.c -@@ -2233,7 +2233,7 @@ send_netflow_v9(struct FLOW **flows, int num_flows, in +@@ -2232,7 +2232,7 @@ send_netflow_v9(struct FLOW **flows, int num_flows, in /* Refresh template headers if we need to */ if (nf9_pkts_until_template <= 0) { diff --git a/net-mgmt/pmacct/files/patch-src_pgsql__plugin.c b/net-mgmt/pmacct/files/patch-src_pgsql__plugin.c index 22042ef4be7e..29da2faf65c5 100644 --- a/net-mgmt/pmacct/files/patch-src_pgsql__plugin.c +++ b/net-mgmt/pmacct/files/patch-src_pgsql__plugin.c @@ -1,7 +1,7 @@ ---- src/pgsql_plugin.c.orig 2019-12-07 17:48:46 UTC +--- src/pgsql_plugin.c.orig 2021-11-05 15:03:23 UTC +++ src/pgsql_plugin.c @@ -611,7 +611,7 @@ void PG_cache_purge(struct db_cache *queue[], int inde - if (pqq_ptr) goto start; + if (sql_pqq_ptr) goto start; idata->elap_time = time(NULL)-start; - Log(LOG_INFO, "INFO ( %s/%s ): *** Purging cache - END (PID: %u, QN: %u/%u, ET: %lu) ***\n", diff --git a/net-mgmt/pmacct/files/patch-src_pmacct.c b/net-mgmt/pmacct/files/patch-src_pmacct.c index f6812f0d6ae8..14d2edd28d6e 100644 --- a/net-mgmt/pmacct/files/patch-src_pmacct.c +++ b/net-mgmt/pmacct/files/patch-src_pmacct.c @@ -1,15 +1,15 @@ ---- src/pmacct.c.orig 2020-05-10 13:57:54 UTC +--- src/pmacct.c.orig 2021-11-05 15:03:23 UTC +++ src/pmacct.c -@@ -2898,7 +2898,7 @@ int main(int argc,char **argv) +@@ -2915,7 +2915,7 @@ int main(int argc,char **argv) /* print packets */ else if (which_counter == 1) printf("%" PRIu64 "\n", acc_elem->pkt_num); /* print packets+bytes+flows+num */ - else if (which_counter == 2) printf("%" PRIu64 " %" PRIu64 " %" PRIu64 " %lu\n", acc_elem->pkt_num, acc_elem->pkt_len, acc_elem->flo_num, acc_elem->time_start.tv_sec); -+ else if (which_counter == 2) printf("%" PRIu64 " %" PRIu64 " %" PRIu64 " %zu\n", acc_elem->pkt_num, acc_elem->pkt_len, acc_elem->flo_num, acc_elem->time_start.tv_sec); ++ else if (which_counter == 2) printf("%" PRIu64 " %" PRIu64 " %" PRIu64 " %jd\n", acc_elem->pkt_num, acc_elem->pkt_len, acc_elem->flo_num, (intmax_t)acc_elem->time_start.tv_sec); /* print flows */ else if (which_counter == 3) printf("%" PRIu64 "\n", acc_elem->flo_num); } -@@ -3725,8 +3725,8 @@ void pmc_compose_timestamp(char *buf, int buflen, stru +@@ -3753,8 +3753,8 @@ void pmc_compose_timestamp(char *buf, int buflen, stru struct tm *time2; if (tstamp_since_epoch) { diff --git a/net-mgmt/pmacct/files/patch-src_pmacctd.c b/net-mgmt/pmacct/files/patch-src_pmacctd.c deleted file mode 100644 index 31e58ee74ada..000000000000 --- a/net-mgmt/pmacct/files/patch-src_pmacctd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pmacctd.c.orig 2020-08-24 15:11:03 UTC -+++ src/pmacctd.c -@@ -41,7 +41,7 @@ - #include "jhash.h" - - /* variables to be exported away */ --struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ -+extern struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ - - /* Functions */ - void usage_daemon(char *prog_name) diff --git a/net-mgmt/pmacct/files/patch-src_pmbgpd.c b/net-mgmt/pmacct/files/patch-src_pmbgpd.c deleted file mode 100644 index 773db531cfd2..000000000000 --- a/net-mgmt/pmacct/files/patch-src_pmbgpd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pmbgpd.c.orig 2020-08-24 15:02:08 UTC -+++ src/pmbgpd.c -@@ -35,7 +35,7 @@ - #include "thread_pool.h" - - /* global var */ --struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ -+extern struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ - - /* Functions */ - void usage_daemon(char *prog_name) diff --git a/net-mgmt/pmacct/files/patch-src_pmbmpd.c b/net-mgmt/pmacct/files/patch-src_pmbmpd.c deleted file mode 100644 index d9fc09e7ef28..000000000000 --- a/net-mgmt/pmacct/files/patch-src_pmbmpd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pmbmpd.c.orig 2020-08-24 14:59:55 UTC -+++ src/pmbmpd.c -@@ -33,7 +33,7 @@ - #include "net_aggr.h" - - /* global var */ --struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ -+extern struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ - - /* Functions */ - void usage_daemon(char *prog_name) diff --git a/net-mgmt/pmacct/files/patch-src_pmtelemetryd.c b/net-mgmt/pmacct/files/patch-src_pmtelemetryd.c deleted file mode 100644 index 71041d5a1f51..000000000000 --- a/net-mgmt/pmacct/files/patch-src_pmtelemetryd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/pmtelemetryd.c.orig 2020-08-24 15:00:31 UTC -+++ src/pmtelemetryd.c -@@ -33,7 +33,7 @@ - #include "net_aggr.h" - - /* global var */ --struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ -+extern struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ - - /* Functions */ - void usage_daemon(char *prog_name) diff --git a/net-mgmt/pmacct/files/patch-src_sfacctd.c b/net-mgmt/pmacct/files/patch-src_sfacctd.c deleted file mode 100644 index 99eeed1da19a..000000000000 --- a/net-mgmt/pmacct/files/patch-src_sfacctd.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sfacctd.c.orig 2020-08-24 15:09:12 UTC -+++ src/sfacctd.c -@@ -50,7 +50,7 @@ - #endif - - /* variables to be exported away */ --struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ -+extern struct channels_list_entry channels_list[MAX_N_PLUGINS]; /* communication channels: core <-> plugins */ - int sfacctd_counter_backend_methods; - struct bgp_misc_structs *sf_cnt_misc_db; - struct host_addr debug_a; diff --git a/net-mgmt/pmacct/files/patch-src_sql__common.c b/net-mgmt/pmacct/files/patch-src_sql__common.c deleted file mode 100644 index c82962568ec7..000000000000 --- a/net-mgmt/pmacct/files/patch-src_sql__common.c +++ /dev/null @@ -1,34 +0,0 @@ ---- src/sql_common.c.orig 2020-05-10 13:57:54 UTC -+++ src/sql_common.c -@@ -45,8 +45,8 @@ unsigned char *pipebuf; - struct db_cache *sql_cache; - struct db_cache **sql_queries_queue, **sql_pending_queries_queue; - struct db_cache *collision_queue; --int cq_ptr, qq_ptr, qq_size, pp_size, pb_size, pn_size, pm_size, pt_size; --int pc_size, dbc_size, cq_size, pqq_ptr; -+int cq_ptr, qq_size; -+int cq_size; - struct db_cache lru_head, *lru_tail; - struct frags where[N_PRIMITIVES+2]; - struct frags values[N_PRIMITIVES+2]; -@@ -60,8 +60,7 @@ time_t glob_committed_basetime; /* last resort for sig - int glob_dyn_table, glob_dyn_table_time_only; /* last resort for signal handling */ - int glob_timeslot; /* last resort for sql handlers */ - --struct sqlfunc_cb_registry sqlfunc_cbr; --void (*insert_func)(struct primitives_ptrs *, struct insert_data *); -+struct sqlfunc_cb_registry sqlfunc_cbr; - struct DBdesc p; - struct DBdesc b; - struct BE_descs bed; -@@ -126,8 +125,8 @@ void sql_init_global_buffers() - lru_tail = &lru_head; - - Log(LOG_INFO, "INFO ( %s/%s ): cache entries=%d base cache memory=%luu bytes\n", config.name, config.type, -- config.sql_cache_entries, ((config.sql_cache_entries * sizeof(struct db_cache)) + -- (2 * (qq_size * sizeof(struct db_cache *))))); -+ config.sql_cache_entries, (unsigned long) ((config.sql_cache_entries * sizeof(struct db_cache)) + -+ (2 * (qq_size * sizeof(struct db_cache *)))) ); - - pipebuf = (unsigned char *) malloc(config.buffer_size); - sql_cache = (struct db_cache *) malloc(config.sql_cache_entries*sizeof(struct db_cache)); diff --git a/net-mgmt/pmacct/files/patch-src_sqlite3__plugin.c b/net-mgmt/pmacct/files/patch-src_sqlite3__plugin.c index cb546d7bad45..27020d9b47a8 100644 --- a/net-mgmt/pmacct/files/patch-src_sqlite3__plugin.c +++ b/net-mgmt/pmacct/files/patch-src_sqlite3__plugin.c @@ -1,7 +1,7 @@ ---- src/sqlite3_plugin.c.orig 2020-05-10 13:57:54 UTC +--- src/sqlite3_plugin.c.orig 2021-11-05 15:03:23 UTC +++ src/sqlite3_plugin.c @@ -537,7 +537,7 @@ void SQLI_cache_purge(struct db_cache *queue[], int in - if (pqq_ptr) goto start; + if (sql_pqq_ptr) goto start; idata->elap_time = time(NULL)-start; - Log(LOG_INFO, "INFO ( %s/%s ): *** Purging cache - END (PID: %u, QN: %u/%u, ET: %lu) ***\n", diff --git a/net-mgmt/pmacct/files/patch-src_util.c b/net-mgmt/pmacct/files/patch-src_util.c index 2c9b8765fe73..5217664662c8 100644 --- a/net-mgmt/pmacct/files/patch-src_util.c +++ b/net-mgmt/pmacct/files/patch-src_util.c @@ -1,15 +1,6 @@ ---- src/util.c.orig 2020-05-10 13:57:54 UTC +--- src/util.c.orig 2021-11-05 15:03:23 UTC +++ src/util.c -@@ -1594,7 +1594,7 @@ void *pm_malloc(size_t size) - - obj = (unsigned char *) malloc(size); - if (!obj) { -- Log(LOG_ERR, "ERROR ( %s/%s ): Unable to grab enough memory (requested: %lu bytes). Exiting ...\n", -+ Log(LOG_ERR, "ERROR ( %s/%s ): Unable to grab enough memory (requested: %zu bytes). Exiting ...\n", - config.name, config.type, size); - exit_gracefully(1); - } -@@ -2010,8 +2010,8 @@ void compose_timestamp(char *buf, int buflen, struct t +@@ -2069,8 +2069,8 @@ void compose_timestamp(char *buf, int buflen, struct t if (buflen < VERYSHORTBUFLEN) return; if (since_epoch) { diff --git a/net-mgmt/pmacct/pkg-plist b/net-mgmt/pmacct/pkg-plist index 1918393d531c..a64a1b764aeb 100644 --- a/net-mgmt/pmacct/pkg-plist +++ b/net-mgmt/pmacct/pkg-plist @@ -11,6 +11,7 @@ sbin/sfacctd %%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 @@ -73,6 +74,7 @@ sbin/sfacctd %%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