Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Sep 2025 08:18:34 GMT
From:      Lexi Winter <ivy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: a053f948ade6 - main - libbsm: Rename package to audit-lib
Message-ID:  <202509300818.58U8IYX6024858@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=a053f948ade60e8a63ebdaa676bf95c5ce38af07

commit a053f948ade60e8a63ebdaa676bf95c5ce38af07
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-09-30 08:13:03 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-09-30 08:14:58 +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
---
 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 = <<EOD
-The libbsm library routines provide an interface to BSM audit record streams,
-allowing both the parsing of existing audit streams, as well as the creation
-of new audit records and streams.
-EOD
-
-annotations {
-	set = "optional,optional-jail"
-}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202509300818.58U8IYX6024858>