Bug 267825

Summary: net-mgmt/netdata: renamed fields in struct tcpstat in sys/netinet/tcp_var.h
Product: Ports & Packages Reporter: Trond Endrestøl <Trond.Endrestol>
Component: Individual Port(s)Assignee: Neel Chauhan <nc>
Status: Open ---    
Severity: Affects Some People CC: grahamperrin, mike.jakubik, netchild
Priority: --- Flags: bugzilla: maintainer-feedback? (nc)
Version: Latest   
Hardware: Any   
OS: Any   
See Also: https://github.com/netdata/netdata/pull/14446
https://reviews.freebsd.org/D38659
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269629
Attachments:
Description Flags
Patch for collectors/freebsd.plugin/freebsd_sysctl.c none

Description Trond Endrestøl 2022-11-17 08:51:29 UTC
Created attachment 238134 [details]
Patch for collectors/freebsd.plugin/freebsd_sysctl.c

Commit 1a70101a870015304d5b2446b480d8677d8aad36 in src/main renamed three fields in struct tcpstat in sys/netinet/tcp_var.h.
Comment 1 Alexander Leidinger freebsd_committer freebsd_triage 2023-01-11 09:16:51 UTC
Hi,

this patch should be gated on OSVERSION >= 1400074. Unfortunately the __FreeBSD_Version was not bumped in the corresponding commit (https://cgit.freebsd.org/src/commit/sys/netinet/tcp_var.h?id=1a70101a870015304d5b2446b480d8677d8aad36), and this is the closed OSVERSION afterwards.

---snip---
.include <bsd.port.options.mk>

# Patch in the iconv const qualifier before this
.if ${OSVERSION} >= 1400074
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ecn
.endif

.include <bsd.port.mk>
---snip---

Note, the real fix is for upstream to take into account that there are now such variables for send and receive, but as a workaround this looks suitable.

Bye,
Alexander.
Comment 2 mike jakubik 2023-02-07 22:17:55 UTC
This has been resolve upstream now, thanks to all involved, we can probably close this PR now.

https://github.com/netdata/netdata/issues/14375
Comment 3 Trond Endrestøl 2023-02-08 07:36:44 UTC
Fixed upstream.
Comment 4 Alexander Leidinger freebsd_committer freebsd_triage 2023-02-08 09:14:39 UTC
This is fixed upstream, but no fix has reached our ports tree yet...
Comment 5 Graham Perrin freebsd_committer freebsd_triage 2023-02-26 16:18:23 UTC
* <https://github.com/netdata/netdata/commit/357ed779a3cd4b9834808d82acc1e4d9c06f0d64> 
  is on the v1.38 branch

* D38659 is (partly) for an update to 1.38.1.