From 512c553671bef26e93342d4ae1ec5f60d8ae112b Mon Sep 17 00:00:00 2001 From: Joseph Mingrone Date: Thu, 30 Mar 2023 18:41:09 -0300 Subject: 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 -- cgit v1.2.3