Date: Thu, 30 Mar 2023 22:52:39 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 512c553671be - main - tcpdump: Backport a fix required for upcoming libpcap update Message-ID: <202303302252.32UMqdFP000849@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=512c553671bef26e93342d4ae1ec5f60d8ae112b commit 512c553671bef26e93342d4ae1ec5f60d8ae112b Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2023-03-30 21:41:09 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2023-03-30 22:52:10 +0000 tcpdump: Backport a fix required for upcoming libpcap update See also: https://github.com/the-tcpdump-group/tcpdump/commit/51f9c3b947eac89254c4e3662902487e0844a699 Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- contrib/tcpdump/interface.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h index 46d338b4af24..cbe1851c5bb8 100644 --- a/contrib/tcpdump/interface.h +++ b/contrib/tcpdump/interface.h @@ -73,7 +73,13 @@ extern char *program_name; /* used to generate self-identifying messages */ #ifndef HAVE_BPF_DUMP struct bpf_program; +#endif +/* + * With Capsicum bpf_dump() may be not declared even if HAVE_BPF_DUMP is set. + */ +#if !defined(HAVE_BPF_DUMP) || \ + (defined(HAVE_BPF_DUMP) && HAVE_CAPSICUM && !defined(bpf_dump)) extern void bpf_dump(const struct bpf_program *, int); #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303302252.32UMqdFP000849>