From nobody Wed Oct 1 12:36:19 2025 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 4ccDtr4Mzcz69Y0s; Wed, 01 Oct 2025 12:36:20 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccDtr10VGz3mX6; Wed, 01 Oct 2025 12:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759322180; 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=TXGiUzkJPp6RVg7ne+YdfSX2kd/BnSA+Iem68JTcOUA=; b=LTC3XUOv5M8+3KgRedyDqvNrMed7Fau3JpRSRmjbKNn4E7XJ0e4k6etAzhK8SIbkQDxryN i9JgJKOiRDgHzpBL7Zr8U/b/yoAtj8aB8pAMpx079C2mh97bMvyEVZ6RlDrGYHMQus5Lgp t5Wkdb3t3Eh4q/XmVrZtNHNBpzB7ZoLP3IJTg9vgDrUB4wxEYQI5ifIgk1nfZB2zjdtA5f qr/1B+I6OgGmgxKgrSDuDVldSNpl2j+BwietcHea6lszlh5/UyngRDWLQhOqsthJQGgU8i XBkmOtOaESDVLiUvyfGX8MZg1T1SRTcn5+1WruPNR9RixDPaGaGnF/jXxUg4OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759322180; 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=TXGiUzkJPp6RVg7ne+YdfSX2kd/BnSA+Iem68JTcOUA=; b=MxhuYbFVXrAZv+tVnBvaSp6e7m8jX2kizF1YaDXIRsekqbfAiEkP/V7sQn1NeT99We3/Ye eNzHOlhx0hWRor2J9Ns2JBRHTcptFyzVZfRw+I226vzNCwfLzOTUk335VHxPUZunP4DK31 Sm367ZqhJR87oCsBMP1ai7y76IxYKXKbBqtmrBR9Xc8A7gSr38wIc0WWQKz11VSKNTb2NR SNXLk8OPH0O7rFCXLzQ56k4u+A8my/n6LKrpVA8KQLlZ4yDn2oQuJ7ZWu7jX5w55c3OrCR toMs/bGqtiJhcTs58A42RnczW99awHrMO8wNkSX9cwVOe9QvQxfg+VM+KbMCLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759322180; a=rsa-sha256; cv=none; b=d72v/kMiMGSgpJ224Gg8srkd0Dk20CBTWNTPZu9KWJ04G5aByPEIXH8Yt1dSJc6DytDE4G /fFXXWsDVNxQvOdYIBRV+78yab1jsraKl6ggKhfusfL/sRDL2WBTGBHP9V0RATHR9m2Ile Rd3S5TkT31fD1wvy6X0RFVe6DCGjw4Fors/ElHTikSszJZq9pndIE56VyDr4moEOfx8Kn4 VPMqtCWt4lC+ZqAuxcKDnJ7LzjZhrIYOthpAdUiAur7fFPaftENrgQ6mNWSLlg6nm6UzzZ 73I66/Paac7sUwQ5Y4BPVkiyGLQvkQDOOxCZhxE+XADx8Exmxhdq8vvnW2y9+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ccDtr0YmCz6fN; Wed, 01 Oct 2025 12:36:20 +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 591CaJ3n057863; Wed, 1 Oct 2025 12:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591CaJDq057860; Wed, 1 Oct 2025 12:36:19 GMT (envelope-from git) Date: Wed, 1 Oct 2025 12:36:19 GMT Message-Id: <202510011236.591CaJDq057860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 9655d4f5e100 - stable/15 - libbsm: Rename package to audit-lib 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9655d4f5e10098ad741d171f3433dbb721da5410 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9655d4f5e10098ad741d171f3433dbb721da5410 commit 9655d4f5e10098ad741d171f3433dbb721da5410 Author: Lexi Winter AuthorDate: 2025-09-30 08:13:03 +0000 Commit: Lexi Winter CommitDate: 2025-10-01 10:36:37 +0000 libbsm: Rename package to audit-lib This is part of audit, so use the new LIB_PACKAGE feature to name the package audit-lib, rather than libbsm. MFC after: 1 day Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52789 (cherry picked from commit a053f948ade60e8a63ebdaa676bf95c5ce38af07) --- include/Makefile | 4 ++-- lib/libbsm/Makefile | 9 ++++----- release/packages/ucl/libbsm-all.ucl | 40 ------------------------------------- 3 files changed, 6 insertions(+), 47 deletions(-) diff --git a/include/Makefile b/include/Makefile index 07890362d7a6..661b2ee131ca 100644 --- a/include/Makefile +++ b/include/Makefile @@ -94,14 +94,14 @@ BSM= audit.h \ audit_fcntl.h \ audit_kevents.h \ audit_socket_type.h -BSMPACKAGE= libbsm +BSMPACKAGE= audit BSMDIR= ${INCLUDEDIR}/bsm .PATH: ${SRCTOP}/sys/security SECAUDIT= audit/audit.h \ audit/audit_ioctl.h \ audit/audit_private.h -SECAUDITPACKAGE= libbsm +SECAUDITPACKAGE= audit SECAUDITDIR= ${INCLUDEDIR}/security/audit .PATH: ${SRCTOP}/sys/cam diff --git a/lib/libbsm/Makefile b/lib/libbsm/Makefile index 67802eef62ac..4413a5dd79f7 100644 --- a/lib/libbsm/Makefile +++ b/lib/libbsm/Makefile @@ -1,9 +1,8 @@ -# -# +PACKAGE= audit +LIB_PACKAGE= -PACKAGE= lib${LIB} -OPENBSMDIR= ${SRCTOP}/contrib/openbsm -_LIBBSMDIR= ${OPENBSMDIR}/libbsm +OPENBSMDIR= ${SRCTOP}/contrib/openbsm +_LIBBSMDIR= ${OPENBSMDIR}/libbsm LIB= bsm SHLIB_MAJOR= 3 diff --git a/release/packages/ucl/libbsm-all.ucl b/release/packages/ucl/libbsm-all.ucl deleted file mode 100644 index 02022b91f83a..000000000000 --- a/release/packages/ucl/libbsm-all.ucl +++ /dev/null @@ -1,40 +0,0 @@ -/* - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2005-2007 Robert N. M. Watson - * Copyright (c) 2008-2009 Apple Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -comment = "Basic Security Module (BSM) audit library" - -desc = <