From nobody Thu Mar 30 22:52:39 2023 X-Original-To: dev-commits-src-all@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 4Pndwm18Mxz42SrV; Thu, 30 Mar 2023 22:52:40 +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 4Pndwm0fjNz4837; Thu, 30 Mar 2023 22:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680216760; 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=l7rH0ah8BGBkoW69LzcZDac0Y8kkr+ltSSLxBHrchQE=; b=T2o+c2PN9NV5uG8XFJ8SX2nCGKaVx5Ruz3OxGH5psKTqMa89TWJ+Y2TRdXG8QCqznCM74Z xfmmNwJPXHgYVxdyZuSFxj5eq8lyExaAJ/OOAhE4XeMpvgt9jGjOP9ibvE6aQ7p4wHsi1i dzpObcT1zTJLYISz9snCcsGZaoBqw1X5PTCM9yCf2bI+fu+8PL9VU+qWvBOgh50gVeTDSL UJ1SYvwRwHVlCHV7Eq1081cu8WU618vkNDcLrekpgSIsSvNKV1J0b0pLV6RtocYE7J24RT gt0U3g+c4wJRaBlOrine6viOP2wxLeG2dgGTsrO4VChfC1TYSAQNejU2/5brDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680216760; 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=l7rH0ah8BGBkoW69LzcZDac0Y8kkr+ltSSLxBHrchQE=; b=MOkl8PxyiFp6mkL15/zRNBB1bjoFrPbMapzOibp/zwuIxV4J86aPgzIL/zgw1lAPcvnjxU FXCDGR+mVpxCpLh36cdX4QI6Tiilb2uXjGEZm2GXyKMqXMM2IFm5ocMRq/7od2FeKxS31Y 2pUP67ntPuQYN8bzRoZk/NGu85XhykapMcVOof6xK8sNq/jz6E8NWpWK+vGRsLs1SUdmmz NzArZX2vRJpD6wEyMHa28JGEvgvhNr22W4uYolQ+ArByAhuQ4+ZCd+e76NmhttTZwJysoS Ya9O0a2W80IwbqwHqrZQQfvRPhdeUm0jgX6/w/L25FX6j5oFCfaqP0KhMfwwkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680216760; a=rsa-sha256; cv=none; b=ga43jx79CK75rw1ReKx1yepzvf1HlItR0xxQgCaAOozI/cuqBkEdHHOTTgBIsiYZ3YpKYB bb91E8hxkhdRTQU4NzgsVC6wGf+C8YyJF3iHPxmP5kmi7wR1kuFX+qEMPwt1mt6MQgaShg Rn+TPlLybmcS53Bk+FGh4om9nUAJO71TR31mM9CHYpdLvlkwJiuUNrZmrt9eX9OHzIIwtS RuKydoTIzUeOgVAobUssYJMMOYQpDx9dyR2IYhuwaedHDSeJ81W09YF1pX9PsIAoj0FOSW iiHNyp1ibgQKA4f9m7wEn/nRs/Ll98uM1dTyVBlETy2OMosDn14FzhLJeJ3jBw== 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 4Pndwl6qN3zVT8; Thu, 30 Mar 2023 22:52:39 +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 32UMqdJ1000850; Thu, 30 Mar 2023 22:52:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UMqdFP000849; Thu, 30 Mar 2023 22:52:39 GMT (envelope-from git) Date: Thu, 30 Mar 2023 22:52:39 GMT Message-Id: <202303302252.32UMqdFP000849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 512c553671be - main - tcpdump: Backport a fix required for upcoming libpcap update List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 512c553671bef26e93342d4ae1ec5f60d8ae112b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=512c553671bef26e93342d4ae1ec5f60d8ae112b commit 512c553671bef26e93342d4ae1ec5f60d8ae112b Author: Joseph Mingrone AuthorDate: 2023-03-30 21:41:09 +0000 Commit: Joseph Mingrone 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