Skip to content

audit: 4.1.0 -> 4.1.1, enable uring support and bash completions #429438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikstur merged 5 commits into from
Aug 4, 2025
Merged

audit: 4.1.0 -> 4.1.1, enable uring support and bash completions #429438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5226b9c
audit: enable io_uring support
LordGrimmauld Jul 29, 2025
e955229
audit: install bash completion
LordGrimmauld Jul 31, 2025
0e42aed
audit: 4.1.0 -> 4.1.1-unstable-2025-08-01
LordGrimmauld Jul 31, 2025
a9fd61f
audit: disable legacy actions
LordGrimmauld Aug 1, 2025
025afda
audit: disallow bash requirement for lib output
LordGrimmauld Aug 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 0 additions & 76 deletions pkgs/by-name/au/audit/musl.patch
View file
Open in desktop

This file was deleted.

36 changes: 27 additions & 9 deletions pkgs/by-name/au/audit/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
fetchFromGitHub,
autoreconfHook,
bash,
bashNonInteractive,
buildPackages,
linuxHeaders,
python3,
swig,
pkgsCross,
libcap_ng,
installShellFiles,

# Enabling python support while cross compiling would be possible, but the
# configure script tries executing python to gather info instead of relying on
Expand All @@ -21,20 +23,15 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "audit";
version = "4.1.0";
version = "4.1.1-unstable-2025-08-01";

src = fetchFromGitHub {
owner = "linux-audit";
repo = "audit-userspace";
tag = "v${finalAttrs.version}";
hash = "sha256-MWlHaGue7Ca8ks34KNg74n4Rfj8ivqAhLOJHeyE2Q04=";
rev = "bee5984843d0b38992a369825a87a65fb54b18fc"; # musl fixes, --disable-legacy-actions and --runstatedir support
hash = "sha256-l3JHWEHz2xGrYxEvfCUD29W8xm5llUnXwX5hLymRG74=";
};

patches = [
# https://github.com/linux-audit/audit-userspace/pull/476
./musl.patch
];

postPatch = ''
substituteInPlace bindings/swig/src/auditswig.i \
--replace-fail "/usr/include/linux/audit.h" \
Expand All @@ -61,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {

nativeBuildInputs = [
autoreconfHook
installShellFiles
]
++ lib.optionals enablePython [
python3
Expand All @@ -76,14 +74,34 @@ stdenv.mkDerivation (finalAttrs: {
# z/OS plugin is not useful on Linux, and pulls in an extra openldap
# dependency otherwise
"--disable-zos-remote"
# remove legacy start/stop scripts to remove a bash dependency in $lib
# People interested in logging auditd interactions (e.g. for compliance) can start/stop audit using `auditctl --signal`
# See also https://github.com/linux-audit/audit-userspace?tab=readme-ov-file#starting-and-stopping-the-daemon
Comment on lines +77 to +79
Copy link
Contributor

@nikstur nikstur Aug 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I don't think this is necessarily the right spot to put this kind of information. Probably better suited for the NixOS manual.

"--disable-legacy-actions"
"--with-arm"
"--with-aarch64"
"--with-io_uring"
# allows putting audit files in /run/audit, which removes the requirement
# to wait for tmpfiles to set up the /var/run -> /run symlink
"--runstatedir=/run"
# capability dropping, currently mostly for plugins as those get spawned as root
# see auditd-plugins(5)
"--with-libcap-ng=yes"
(if enablePython then "--with-python" else "--without-python")
];

__structuredAttrs = true;

# lib output is part of the mandatory nixos system closure, so avoid bash here
outputChecks.lib.disallowedRequisites = [
bash
bashNonInteractive
];

postInstall = ''
installShellCompletion --bash init.d/audit.bash_completion
'';

enableParallelBuilding = true;

passthru = {
Expand All @@ -98,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
homepage = "https://people.redhat.com/sgrubb/audit/";
description = "Audit Library";
changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v${finalAttrs.version}";
changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.1";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ grimmauld ];
pkgConfigModules = [
Expand Down
Loading