From nobody Thu Apr 04 00:28:04 2024 X-Original-To: dev-commits-src-main@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 4V92X42b2Bz5GDgL; Thu, 4 Apr 2024 00:28:04 +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 4V92X41sP5z4pTg; Thu, 4 Apr 2024 00:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712190484; 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=VydZ9Q2RTlhOuOVMacjncWBzgWtxQFHXDtSjM9BHsdw=; b=PCwZp8vGtSLf5449pEtbfW0ye6GERfTWz2445InA04V5fmtrN6repwYhLiCPiHW1PvArmp 3WShotUlIOoLfPoO2Wi8DkijUoodE2Jl55oNH2utsvCnzJ1Qt/D/b4KOjUn71GiJb4KYwi u8C0IWW3TWCI7u1e9LqYGGqttQ3gDUPXEUGUjk63S/pHn0b2w1U89WZYXHuJ3Q1oHkf40B mPFaI887gz1vkC+oKOK1Kmn/GZf4eNVg1nDrRnSFKWpmthHmRuilLD+SYRuM0ude4yWdqV ycFicifHibTQfcHyA0IFJy0B8hNZ/7ZmINoNngPENzEwX8F42IM8g6bQIB2KIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712190484; a=rsa-sha256; cv=none; b=mjPSrieUTh6jpfRP2Or3NHXEthHXVIA3SYHv7eG59gMKoZOgyF653OK0lawWk2PzV+TAeJ 3ZR8zoJgZcka9nV/VYHpdIiBczL9t2mNRyAlseZQJ2ahYXn8RXXKFDq3oVf0/dTBnIO3Ao LIFVkHxCLdS/gs8IQN2luA5oOnZiOeAfbuzdu/GsS5IpjKdJ3amrohvqNKSf58+pwp40FN K11PRuuRsbGSAPERDHnbNg9nN8WEEc1gplX0H+o5zyB78gWh8HOzFzeWBKe3UoOui83NNp KXNsV5kyG13iiYIKj7eh4eK82/9WUcfAk+QNZoPkKPOiwiAlTwZOKjLh2RKYfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712190484; 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=VydZ9Q2RTlhOuOVMacjncWBzgWtxQFHXDtSjM9BHsdw=; b=lIiObIQeRrRp1h5itmAXVGtY5pltxON9dUP3qJbulIn5/HfdqVy1x8YgLvr6smYQ8z7ORb j2cGLac0UyQ872BDmRXztqeY+g1aW0MkNhOQ1xMli2oor9a2YuiNbgqep0ApH0LG4moZKf /yer8ZZF4V4KxpOu9egsdrEz7X4POxY9CudTpU0iDUMNomBUo49xs63LCSfDFkxjGov6uD 0KoKVUfV7+E6cc71VXsqmWEuN3txcZEG3jrOWH3cBxL5iwXiZta/DkU+Kl0FDqlZPdEV5e rRb8m2KZy4oe7GsncArmaOSYuPWJvXu8tTFLzF9DU7Q/+p3jHpbwVtp3uDfHug== 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 4V92X41SWcztpL; Thu, 4 Apr 2024 00:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4340S468025276; Thu, 4 Apr 2024 00:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4340S4m7025273; Thu, 4 Apr 2024 00:28:04 GMT (envelope-from git) Date: Thu, 4 Apr 2024 00:28:04 GMT Message-Id: <202404040028.4340S4m7025273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 41956c13f950 - main - include: Ensure security/audit/audit.h gets staged properly. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41956c13f95004882e2080862e3158e820c8db33 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=41956c13f95004882e2080862e3158e820c8db33 commit 41956c13f95004882e2080862e3158e820c8db33 Author: Stephen J. Kiernan AuthorDate: 2024-04-04 00:22:29 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-04 00:26:33 +0000 include: Ensure security/audit/audit.h gets staged properly. There is a conflict between bsm/audit.h and security/audit/audit.h due to the way that staging is being set up using .PATH to point to the full directory and the leaf files being specified in the list. Due to this, the bsm/audit.h was getting staged as both bsm/audit.h and security/audit/audit.h since the sys/bsm directory is listed first in the .PATH list. Use sys/security in the .PATH instead of sys/security/audit and specify the audit header files as audit/.h. This ensures that we get the correct audit.h stanged for security/audit/audit.h. Reviewed by: sjg Obtained from: Juniper Networks, Inc. --- include/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Makefile b/include/Makefile index d9f0951c94a0..d44c982d950c 100644 --- a/include/Makefile +++ b/include/Makefile @@ -96,10 +96,10 @@ BSM= audit.h \ BSMPACKAGE= libbsm BSMDIR= ${INCLUDEDIR}/bsm -.PATH: ${SRCTOP}/sys/security/audit -SECAUDIT= audit.h \ - audit_ioctl.h \ - audit_private.h +.PATH: ${SRCTOP}/sys/security +SECAUDIT= audit/audit.h \ + audit/audit_ioctl.h \ + audit/audit_private.h SECAUDITPACKAGE= libbsm SECAUDITDIR= ${INCLUDEDIR}/security/audit