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
This commit is contained in:
Lexi Winter 2024-04-24 18:54:44 +01:00 committed by Warner Losh
parent 0c0a2110f1
commit 1b3c07bed6
10 changed files with 23 additions and 8 deletions

View File

@ -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 world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) 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: 20240424:
cron, lpr, and ntpd have been moved from FreeBSD-utilities into their cron, lpr, and ntpd have been moved from FreeBSD-utilities into their
own packages. If you use pkgbase, you should install the relevant own packages. If you use pkgbase, you should install the relevant

View File

@ -5,6 +5,7 @@ OPENBSMDIR= ${SRCTOP}/contrib/openbsm
_LIBAUDITDDIR= ${OPENBSMDIR}/libauditd _LIBAUDITDDIR= ${OPENBSMDIR}/libauditd
_LIBBSMDIR= ${OPENBSMDIR}/libbsm _LIBBSMDIR= ${OPENBSMDIR}/libbsm
PACKAGE= audit
LIB= auditd LIB= auditd
.PATH: ${_LIBAUDITDDIR} .PATH: ${_LIBAUDITDDIR}

View File

@ -60,12 +60,6 @@ MAN= libbsm.3 \
# they're not all libbsm parts. # they're not all libbsm parts.
# #
MAN+= audit.2 \ MAN+= audit.2 \
audit.log.5 \
audit_class.5 \
audit_control.5 \
audit_event.5 \
audit_user.5 \
audit_warn.5 \
auditctl.2 \ auditctl.2 \
auditon.2 \ auditon.2 \
getaudit.2 \ getaudit.2 \

View File

@ -167,7 +167,7 @@ APMPACKAGE= apm
CONFGROUPS+= AUDIT CONFGROUPS+= AUDIT
AUDIT+= auditd AUDIT+= auditd
AUDIT+= auditdistd AUDIT+= auditdistd
AUDITPACKAGE= rc AUDITPACKAGE= audit
.endif .endif
.if ${MK_AUTOFS} != "no" .if ${MK_AUTOFS} != "no"

View File

@ -11,6 +11,8 @@ apm_COMMENT= APM Utilities
apm_DESC= APM Utilities apm_DESC= APM Utilities
at_COMMENT= AT Utilities at_COMMENT= AT Utilities
at_DESC= AT Utilities at_DESC= AT Utilities
audit_COMMENT= OpenBSM auditing utilities
audit_DESC= OpenBSM auditing utilities
autofs_COMMENT= Autofs Utilities autofs_COMMENT= Autofs Utilities
autofs_DESC= Autofs Utilities autofs_DESC= Autofs Utilities
bhyve_COMMENT= Bhyve Utilities bhyve_COMMENT= Bhyve Utilities

View File

@ -6,6 +6,7 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm
CFLAGS+= -I${OPENBSMDIR} CFLAGS+= -I${OPENBSMDIR}
PACKAGE=audit
PROG= audit PROG= audit
MAN= audit.8 MAN= audit.8

View File

@ -3,6 +3,7 @@
OPENBSMDIR=${SRCTOP}/contrib/openbsm OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/auditd .PATH: ${OPENBSMDIR}/bin/auditd
.PATH: ${OPENBSMDIR}/man
CFLAGS+= -I${OPENBSMDIR} CFLAGS+= -I${OPENBSMDIR}
@ -18,9 +19,17 @@ CONFSMODE_${OPENBSMETCDIR}/audit_user= 600
CONFS+= ${OPENBSMETCDIR}/audit_warn CONFS+= ${OPENBSMETCDIR}/audit_warn
CONFSMODE_${OPENBSMETCDIR}/audit_warn= 500 CONFSMODE_${OPENBSMETCDIR}/audit_warn= 500
CONFSDIR= /etc/security CONFSDIR= /etc/security
PACKAGE=audit
PROG= auditd PROG= auditd
SRCS= auditd.c audit_warn.c auditd_fbsd.c 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 LIBADD= auditd bsm

View File

@ -13,6 +13,7 @@ CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L
NO_WFORMAT= NO_WFORMAT=
NO_WMISSING_VARIABLE_DECLARATIONS= NO_WMISSING_VARIABLE_DECLARATIONS=
PACKAGE=audit
PROG= auditdistd PROG= auditdistd
SRCS= auditdistd.c SRCS= auditdistd.c
SRCS+= parse.y pjdlog.c SRCS+= parse.y pjdlog.c

View File

@ -6,6 +6,7 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm
CFLAGS+= -I${OPENBSMDIR} CFLAGS+= -I${OPENBSMDIR}
PACKAGE=audit
PROG= auditreduce PROG= auditreduce
MAN= auditreduce.1 MAN= auditreduce.1

View File

@ -8,6 +8,7 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm
CFLAGS+= -I${OPENBSMDIR} CFLAGS+= -I${OPENBSMDIR}
PACKAGE=audit
PROG= praudit PROG= praudit
MAN= praudit.1 MAN= praudit.1