From nobody Mon Apr 29 04:34:27 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 4VSVpq2bdFz5JCdR; Mon, 29 Apr 2024 04:34:27 +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 4VSVpq21Ccz47Dh; Mon, 29 Apr 2024 04:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714365267; 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=qE+ym7ssiXCh/ckK2nUzbMe0SLHFa0IBt6PRnNJyydU=; b=Mxu8873H9/279Atnznf9em4PvnAP4TZBvZbBsjFZVurnwnZdqMdXu0XBDnsEd2Oy/CnIm/ PohCJKYY9Pj0+S3R3AXd7yG0JwlRBXPS1L4DeW4hRlTQVE00JOHf2kK6rtvlLsIXbN336q 7rumT1TEnV5qqj7ymC52pfxLzrfaRVdC2GpBLcru8XE5oNjzKlY4U+dLzzJCpWg3k1vvQY F9C1o7A/K6Ql9UxvvwiAY14CY20pHV00Y6mxnq4+m4L4MqrLGvcQCPmA9Sy+T2J4bpleDF HwHsNbKGWHxcdNHI5G4j0gNTHpDmL6Tfb7iblKzehFSzZcCWISGqEAwLqzV6wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714365267; a=rsa-sha256; cv=none; b=qX6p9UE8NCKh1RgGy8vIyih9vrQRY+qo4C+S8OTklrR/YeUvvCdMjlNmfGG/mFcEax7IaY 3qx2dnHT2/hSt0tJlcLTloMvcuNoQsN6+PXYfBdhdmy1r3vrBRsq1Ge1aUcqKXioXWi4us eh7kpciyT8lix2+EJlKGBKC9kNz8VT2WWqOMTQkFGfsa5z/qjkNs0QxZ0tTu091bKpbSBm DhrsQvydO39+nJTCR2FkOWzRlbC57kmWKDMxtdJPszFhzS8Q/9tqI+5GtFwMHZVP8zNqMs mc5UC7Xm1Perpbl7VPmID8pWy7lUIIUdnkDy2KBXGOk39l28UfCI/K/LUH8BHg== 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=1714365267; 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=qE+ym7ssiXCh/ckK2nUzbMe0SLHFa0IBt6PRnNJyydU=; b=IWAtJSE87tAYVp/49mwOfQQ+CunhDYIPmpfBwOvVkEosbcY7w3qb+aiDB2NNs2E0EkGbDL +mFn32wRfVuOBGHKNHtwnO5rCULk4ANky12fAR7ugQg8HPOBF0qNNF6iH6mRBB7wi4QIuP fpSQa7NyuRNpGHt9V5aD2HWU6wYQPa5fLUxHG0xkwF13OcGFXJ+KA3HDrq364u5vxJisdY wymLX7Pw+JDZXvVO0T29X6PumQ3ee+dxHOzZ4MdCpcCMje6Waf5s+P52d9uEeGczi/HjtC +fkBGo9LBjTGxQaoiJ7Cn8A8ML+ZkeO4c8lD0iohvBErWx+/nNl7OcvUJD0Lmg== 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 4VSVpq1dGHzvJ8; Mon, 29 Apr 2024 04:34:27 +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 43T4YRXR061489; Mon, 29 Apr 2024 04:34:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43T4YRDh061486; Mon, 29 Apr 2024 04:34:27 GMT (envelope-from git) Date: Mon, 29 Apr 2024 04:34:27 GMT Message-Id: <202404290434.43T4YRDh061486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1b3c07bed63c - main - package: move OpenBSM auditing into its own package 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b3c07bed63c045cf75e18ff053443cabee2360f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1b3c07bed63c045cf75e18ff053443cabee2360f commit 1b3c07bed63c045cf75e18ff053443cabee2360f Author: Lexi Winter AuthorDate: 2024-04-24 17:54:44 +0000 Commit: Warner Losh CommitDate: 2024-04-29 04:33:06 +0000 package: move OpenBSM auditing into its own package Move auditing runtime (auditd, etc.) into the new FreeBSD-audit package. Also move the runtime OpenBSM manual pages from libbsm into auditd so they get installed with the right package. Add an UPDATING entry noting the new packages. Reviewed by: imp, manu Pull Request: https://github.com/freebsd/freebsd-src/pull/1197 --- UPDATING | 5 +++++ lib/libauditd/Makefile | 1 + lib/libbsm/Makefile | 6 ------ libexec/rc/rc.d/Makefile | 2 +- release/packages/Makefile.package | 2 ++ usr.sbin/audit/Makefile | 1 + usr.sbin/auditd/Makefile | 11 ++++++++++- usr.sbin/auditdistd/Makefile | 1 + usr.sbin/auditreduce/Makefile | 1 + usr.sbin/praudit/Makefile | 1 + 10 files changed, 23 insertions(+), 8 deletions(-) diff --git a/UPDATING b/UPDATING index 0c0134022861..98d8b58dcd20 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20240428: + OpenBSM auditing runtime (auditd, etc.) has been moved into the new + package FreeBSD-audit. If you use OpenBSM auditing and pkgbase, you + should install FreeBSD-audit. + 20240424: cron, lpr, and ntpd have been moved from FreeBSD-utilities into their own packages. If you use pkgbase, you should install the relevant diff --git a/lib/libauditd/Makefile b/lib/libauditd/Makefile index 26da06489d05..76ffb70bbe25 100644 --- a/lib/libauditd/Makefile +++ b/lib/libauditd/Makefile @@ -5,6 +5,7 @@ OPENBSMDIR= ${SRCTOP}/contrib/openbsm _LIBAUDITDDIR= ${OPENBSMDIR}/libauditd _LIBBSMDIR= ${OPENBSMDIR}/libbsm +PACKAGE= audit LIB= auditd .PATH: ${_LIBAUDITDDIR} diff --git a/lib/libbsm/Makefile b/lib/libbsm/Makefile index 54af604eaa8e..67802eef62ac 100644 --- a/lib/libbsm/Makefile +++ b/lib/libbsm/Makefile @@ -60,12 +60,6 @@ MAN= libbsm.3 \ # they're not all libbsm parts. # MAN+= audit.2 \ - audit.log.5 \ - audit_class.5 \ - audit_control.5 \ - audit_event.5 \ - audit_user.5 \ - audit_warn.5 \ auditctl.2 \ auditon.2 \ getaudit.2 \ diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 6e9cb7fc50ae..9a04400e2924 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -167,7 +167,7 @@ APMPACKAGE= apm CONFGROUPS+= AUDIT AUDIT+= auditd AUDIT+= auditdistd -AUDITPACKAGE= rc +AUDITPACKAGE= audit .endif .if ${MK_AUTOFS} != "no" diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index 2c0aa259737d..aed7746e690f 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -11,6 +11,8 @@ apm_COMMENT= APM Utilities apm_DESC= APM Utilities at_COMMENT= AT Utilities at_DESC= AT Utilities +audit_COMMENT= OpenBSM auditing utilities +audit_DESC= OpenBSM auditing utilities autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities diff --git a/usr.sbin/audit/Makefile b/usr.sbin/audit/Makefile index 55ddfa4bc9a5..82b21081a97d 100644 --- a/usr.sbin/audit/Makefile +++ b/usr.sbin/audit/Makefile @@ -6,6 +6,7 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm CFLAGS+= -I${OPENBSMDIR} +PACKAGE=audit PROG= audit MAN= audit.8 diff --git a/usr.sbin/auditd/Makefile b/usr.sbin/auditd/Makefile index b13ff5355c4b..a381b5e7a60b 100644 --- a/usr.sbin/auditd/Makefile +++ b/usr.sbin/auditd/Makefile @@ -3,6 +3,7 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditd +.PATH: ${OPENBSMDIR}/man CFLAGS+= -I${OPENBSMDIR} @@ -18,9 +19,17 @@ CONFSMODE_${OPENBSMETCDIR}/audit_user= 600 CONFS+= ${OPENBSMETCDIR}/audit_warn CONFSMODE_${OPENBSMETCDIR}/audit_warn= 500 CONFSDIR= /etc/security + +PACKAGE=audit PROG= auditd SRCS= auditd.c audit_warn.c auditd_fbsd.c -MAN= auditd.8 +MAN= auditd.8 \ + audit.log.5 \ + audit_class.5 \ + audit_control.5 \ + audit_event.5 \ + audit_user.5 \ + audit_warn.5 LIBADD= auditd bsm diff --git a/usr.sbin/auditdistd/Makefile b/usr.sbin/auditdistd/Makefile index 9bfa3c444922..8b3c7dd7f87c 100644 --- a/usr.sbin/auditdistd/Makefile +++ b/usr.sbin/auditdistd/Makefile @@ -13,6 +13,7 @@ CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L NO_WFORMAT= NO_WMISSING_VARIABLE_DECLARATIONS= +PACKAGE=audit PROG= auditdistd SRCS= auditdistd.c SRCS+= parse.y pjdlog.c diff --git a/usr.sbin/auditreduce/Makefile b/usr.sbin/auditreduce/Makefile index 66bc55af87a9..566b36712782 100644 --- a/usr.sbin/auditreduce/Makefile +++ b/usr.sbin/auditreduce/Makefile @@ -6,6 +6,7 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm CFLAGS+= -I${OPENBSMDIR} +PACKAGE=audit PROG= auditreduce MAN= auditreduce.1 diff --git a/usr.sbin/praudit/Makefile b/usr.sbin/praudit/Makefile index 2eb78dddf292..bb4c0fdf3258 100644 --- a/usr.sbin/praudit/Makefile +++ b/usr.sbin/praudit/Makefile @@ -8,6 +8,7 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm CFLAGS+= -I${OPENBSMDIR} +PACKAGE=audit PROG= praudit MAN= praudit.1