From nobody Mon Dec 23 16:52:49 2024 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 4YH3wy1r3fz5Wx5n; Mon, 23 Dec 2024 16:52:50 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YH3wx70Tpz4xdy; Mon, 23 Dec 2024 16:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734972770; 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=+bF3Utsvy9oC3BYs6Usj9A1j8tRfV7nOWokMnIBJ0+Q=; b=xFQU14C6OI/sIfmntrBai+BXYZS352bpdLRk1ohEuEBGggykLdsqtQFSMiQJB7NxHloq5I ycwBuBu4T9itWwbywyp/ECG3qHESh2VF7V3MAVBHOhUmmVrwhzHWUVNclmCj4fA/LpyMcE cDddFXf93rj9uIwWxUCPGtmSwRkqRZhpjQGS67uPQPYyyk+vFXITMDWlIbtQ1R5y//xrVB PoSVe7H3CpC+Y3HdoUNq1uNezWnnMCplG/QBpliG4Aqp3JvNCE66XnMO8IX5DngJEge6n4 9uMflD2gATGd7bEtsiK+Xkb0MQDNZ8QfDuy6NhMW37/xzmAi88Y0ElmcrSXvSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734972770; 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=+bF3Utsvy9oC3BYs6Usj9A1j8tRfV7nOWokMnIBJ0+Q=; b=TESbGOiDZlwkzFugQHgLBe3fdy1T6kAH6RDucUjBDTe/l0QuUw87r7rznT9NTkE7jgDRrr 4/aRKB9tEZD+bWlmwfosBplcAzhTdFYeuCYwz12RuwrMXqgqINVKOjgJw1yzdjgpHf+ee1 6QgqM6y4rtekVUlJakTuLvUY3wAM8pBY4c4MPGzjjyv3yAoYpxjmNvexmYAwiHCLEA6Itp g+OgTMvP2kmgacOd4b2+kMWufFWfc3fWAkA1EobMVWgfD9eF/dpO/tazlmKyHW0Au1rEPc fPf0uREcwglwt6wgjtz6ZBn0NpRAu4tlMa6LYDi1+pYCm8ZMqY+o0EjD1lTLYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734972770; a=rsa-sha256; cv=none; b=ROoBB34tAryllKQl/jH7nFNfH3X5Avsu9CcuXQXygEHl2zzv9A55Cw7lHfQ4imC5gE5iQI 2j+tyTAvbsoObdwOPsNDbbz3CvsQW5okBX6BuFgp7TPPTGYY/AX6Jj7VjU/Z7WC4jIs9fM A/xyr9zQwi0gGwlsMHbNxv1FWSelic1fOrBBctVYS5tAe7Zq4HXuuAV+uWDkJFM1ynxupf dpFH69nW+d2oRWsR9pk8KfJbre7iw8Zd5z634gxg9mw7GhrsP2uUTKPnQ5VJdj+HwFvAP4 EH8FmtMM70qoQvjLsFwfOT/3lRVs0RNBEjfBtLZtBT5SGPIB0sFeYSvgFo943w== 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 4YH3wx6d13z12CG; Mon, 23 Dec 2024 16:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BNGqnGe040912; Mon, 23 Dec 2024 16:52:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNGqnG5040909; Mon, 23 Dec 2024 16:52:49 GMT (envelope-from git) Date: Mon, 23 Dec 2024 16:52:49 GMT Message-Id: <202412231652.4BNGqnG5040909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ae21b1f88e02 - stable/14 - ipfw.d: Add required dependency declarations 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae21b1f88e0227602017d9cc6d2b5f3f51a82e3c Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae21b1f88e0227602017d9cc6d2b5f3f51a82e3c commit ae21b1f88e0227602017d9cc6d2b5f3f51a82e3c Author: Mark Johnston AuthorDate: 2024-12-16 22:09:39 +0000 Commit: Mark Johnston CommitDate: 2024-12-23 16:51:33 +0000 ipfw.d: Add required dependency declarations ipfw.d requires definitions of, at least, in_addr_t and struct ip6_addr, which it must obtain from CTF info. This is found by looking at $(sysctl -n kern.bootfile)/kernel, which might not be available in a jail. These depends_on declarations ensure that dtrace(1) invocations will simply abort processing of ipfw.d if the required binaries can't be found, rather than raising an error. PR: 283359 MFC after: 1 week (cherry picked from commit b64c5a0ace59af62eff52bfe110a521dc73c937b) --- share/dtrace/ipfw.d | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/dtrace/ipfw.d b/share/dtrace/ipfw.d index c2933dbe96ad..66cd6abea74a 100644 --- a/share/dtrace/ipfw.d +++ b/share/dtrace/ipfw.d @@ -27,6 +27,8 @@ */ #pragma D depends_on provider ipfw +#pragma D depends_on module kernel +#pragma D depends_on module ipfw.ko /* ipfw_chk() return values */ #pragma D binding "1.0" IP_FW_PASS