Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Dec 2025 23:00:00 +0000
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7cec89293b78 - main - net-mgmt/ng_ipacct: unbreak for 14.3+
Message-ID:  <693f4170.8e73.74dbe56@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by eugen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7cec89293b789f683cfc853c7ea47de771fe16c1

commit 7cec89293b789f683cfc853c7ea47de771fe16c1
Author:     Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2025-12-14 22:58:26 +0000
Commit:     Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2025-12-14 22:59:53 +0000

    net-mgmt/ng_ipacct: unbreak for 14.3+
    
    This change fixes built, so PORTREVISION not bumped.
---
 net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c b/net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c
index b62bc827ebf4..ba17901b5d19 100644
--- a/net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c
+++ b/net-mgmt/ng_ipacct/files/patch-ng__ipacct_ng__ipacct.c
@@ -1,4 +1,4 @@
---- ng_ipacct/ng_ipacct.c.orig	2022-09-13 09:05:22 UTC
+--- ng_ipacct/ng_ipacct.c.orig	2021-03-14 18:52:22 UTC
 +++ ng_ipacct/ng_ipacct.c
 @@ -49,6 +49,9 @@ static const char rcs_id[] =
  #include <netinet/in_systm.h>
@@ -10,3 +10,14 @@
  #include <netinet/ip.h>
  #include <netinet/ip_icmp.h>
  #include <netinet/ip_var.h>
+@@ -980,7 +983,9 @@ pcb_get_cred(struct ip_acct_stream *r, struct inpcbinf
+ #endif
+ #endif
+ 	for (i = 0, ina = r->r_dst, port = r->r_dport; i < 2; i++) {
+-#if __FreeBSD_version >= 700110
++#if __FreeBSD_version >= 1402502
++		pcb = in_pcblookup_local(pcbinfo, ina, port, RT_ALL_FIBS, 1, thread0.td_ucred);
++#elif __FreeBSD_version >= 700110
+ 		pcb = in_pcblookup_local(pcbinfo, ina, port, 1, NOCRED);
+ #else
+ 		pcb = in_pcblookup_local(pcbinfo, ina, port, 1);


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?693f4170.8e73.74dbe56>