10 Commits

3 changed files with 63 additions and 182 deletions

View File

@@ -1,26 +0,0 @@
diff -Nru audit-2.8.4.orig/init.d/auditd.state audit-2.8.4/init.d/auditd.state
--- audit-2.8.4.orig/init.d/auditd.state 2018-05-21 19:38:08.000000000 +0200
+++ audit-2.8.4/init.d/auditd.state 2019-01-05 08:46:05.999451866 +0100
@@ -7,7 +7,7 @@
PATH=/sbin:/bin:/usr/bin:/usr/sbin
prog="auditd"
-state_file="/var/run/auditd.state"
+state_file="/run/auditd.state"
. /etc/init.d/functions
printf "Getting auditd internal state: "
diff -Nru audit-2.8.4.orig/src/auditd.c audit-2.8.4/src/auditd.c
--- audit-2.8.4.orig/src/auditd.c 2018-05-21 19:38:08.000000000 +0200
+++ audit-2.8.4/src/auditd.c 2019-01-05 08:44:18.153983329 +0100
@@ -66,8 +66,8 @@
/* Local data */
static int fd = -1, pipefds[2] = {-1, -1};
static struct daemon_conf config;
-static const char *pidfile = "/var/run/auditd.pid";
-static const char *state_file = "/var/run/auditd.state";
+static const char *pidfile = "/run/auditd.pid";
+static const char *state_file = "/run/auditd.state";
static int init_pipe[2];
static int do_fork = 1, opt_aggregate_only = 0, config_dir_set = 0;
static struct auditd_event *cur_event = NULL, *reconfig_ev = NULL;

View File

@@ -1,83 +0,0 @@
diff -ru audit-3.0.orig/init.d/auditd.cron audit-3.0/init.d/auditd.cron
--- audit-3.0.orig/init.d/auditd.cron 2020-12-16 21:44:34.000000000 +0100
+++ audit-3.0/init.d/auditd.cron 2021-02-13 20:44:43.484919856 +0100
@@ -5,7 +5,7 @@
# based on a cron job.
##########
-/sbin/service auditd rotate
+/usr/sbin/service auditd rotate
EXITVALUE=$?
if [ $EXITVALUE != 0 ]; then
/usr/bin/logger -t auditd "ALERT exited abnormally with [$EXITVALUE]"
diff -ru audit-3.0.orig/init.d/auditd.service audit-3.0/init.d/auditd.service
--- audit-3.0.orig/init.d/auditd.service 2020-12-16 21:44:34.000000000 +0100
+++ audit-3.0/init.d/auditd.service 2021-02-13 20:44:43.484919856 +0100
@@ -18,15 +18,15 @@
[Service]
Type=forking
PIDFile=/run/auditd.pid
-ExecStart=/sbin/auditd
+ExecStart=/usr/sbin/auditd
## To not use augenrules, copy this file to /etc/systemd/system/auditd.service
## and comment/delete the next line and uncomment the auditctl line.
## NOTE: augenrules expect any rules to be added to /etc/audit/rules.d/
-ExecStartPost=-/sbin/augenrules --load
-#ExecStartPost=-/sbin/auditctl -R /etc/audit/audit.rules
+ExecStartPost=-/usr/sbin/augenrules --load
+#ExecStartPost=-/usr/sbin/auditctl -R /etc/audit/audit.rules
# By default we don't clear the rules on exit. To enable this, uncomment
# the next line after copying the file to /etc/systemd/system/auditd.service
-#ExecStopPost=/sbin/auditctl -R /etc/audit/audit-stop.rules
+#ExecStopPost=/usr/sbin/auditctl -R /etc/audit/audit-stop.rules
### Security Settings ###
MemoryDenyWriteExecute=true
diff -ru audit-3.0.orig/init.d/augenrules audit-3.0/init.d/augenrules
--- audit-3.0.orig/init.d/augenrules 2020-12-16 21:44:34.000000000 +0100
+++ audit-3.0/init.d/augenrules 2021-02-13 20:44:43.485919874 +0100
@@ -39,7 +39,7 @@
try_load() {
if [ $LoadRules -eq 1 ] ; then
- /sbin/auditctl -R ${DestinationFile}
+ /usr/sbin/auditctl -R ${DestinationFile}
RETVAL=$?
fi
}
diff -ru audit-3.0.orig/audisp/plugins/remote/au-remote.conf audit-3.0/audisp/plugins/remote/au-remote.conf
--- audit-3.0.orig/audisp/plugins/remote/au-remote.conf 2020-12-16 21:44:34.000000000 +0100
+++ audit-3.0/audisp/plugins/remote/au-remote.conf 2021-02-13 21:27:18.038655845 +0100
@@ -5,7 +5,7 @@
active = no
direction = out
-path = /sbin/audisp-remote
+path = /usr/sbin/audisp-remote
type = always
#args =
format = string
diff -ru audit-3.0.orig/audisp/plugins/syslog/syslog.conf audit-3.0/audisp/plugins/syslog/syslog.conf
--- audit-3.0.orig/audisp/plugins/syslog/syslog.conf 2020-12-16 21:44:34.000000000 +0100
+++ audit-3.0/audisp/plugins/syslog/syslog.conf 2021-02-13 21:27:06.886482221 +0100
@@ -8,7 +8,7 @@
active = no
direction = out
-path = /sbin/audisp-syslog
+path = /usr/sbin/audisp-syslog
type = always
args = LOG_INFO
format = string
diff -ru audit-3.0.orig/audisp/plugins/zos-remote/audispd-zos-remote.conf audit-3.0/audisp/plugins/zos-remote/audispd-zos-remote.conf
--- audit-3.0.orig/audisp/plugins/zos-remote/audispd-zos-remote.conf 2020-12-16 21:44:34.000000000 +0100
+++ audit-3.0/audisp/plugins/zos-remote/audispd-zos-remote.conf 2021-02-13 21:26:36.495010422 +0100
@@ -8,7 +8,7 @@
active = no
direction = out
-path = /sbin/audispd-zos-remote
+path = /usr/sbin/audispd-zos-remote
type = always
args = /etc/audisp/zos-remote.conf
format = string

View File

@@ -1,5 +1,5 @@
Name: audit
Version: 3.0.8
Version: 4.0.4
Release: 1mamba
Summary: User space tools for kernel auditing
Group: System/Tools
@@ -7,21 +7,15 @@ Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://people.redhat.com/sgrubb/audit/
Source: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
Patch0: audit-3.0-usrsbin.patch
Patch1: audit-2.8.4-rundir.patch
Source: https://github.com/linux-audit/audit-userspace.git/v%{version}/audit-userspace-%{version}.tar.bz2
License: GPL, LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libcap-ng-devel
BuildRequires: libe2fs-devel
BuildRequires: libkrb5-devel
BuildRequires: libnsl-devel
BuildRequires: libopenldap-devel
BuildRequires: libopenssl-devel
BuildRequires: libpython3-devel
BuildRequires: libsasl2-devel
BuildRequires: libtirpc-devel
BuildRequires: libpython311-devel
BuildRequires: libwrap-devel
## AUTOBUILDREQ-END
BuildRequires: gcc-go
@@ -30,7 +24,6 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: swig
BuildRequires: libprelude-devel >= 5.2.0
%systemd_requires
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Provides: audit-plugins
@@ -81,23 +74,16 @@ Obsoletes: python-audit < 3.0.8
The python-audit package containts Python 3 bindings to %{name}.
The libaudit-devel package contains the header files needed for developing applications that need to use the audit framework libraries.
%debug_package
%prep
%setup -q
#%patch0 -p1
#%patch1 -p1
%setup -q -n audit-userspace-%{version}
autoreconf -fi
%build
#autoreconf -v --install
%configure \
--with-prelude \
--with-libwrap \
--enable-gssapi-krb5=yes \
--with-libcap-ng=yes \
--with-python=no \
--with-python3=yes \
--enable-systemd=yes \
CFLAGS="%{optflags} -fcommon" \
%ifarch arm
--with-arm \
@@ -115,17 +101,10 @@ mkdir -p %{buildroot}%{_localstatedir}/log/audit
%makeinstall \
initdir=%{_unitdir}
#rm -f %{buildroot}%{python_sitearch}/_audit.a
#rm -f %{buildroot}%{python_sitearch}/_audit.la
#rm -f %{buildroot}%{python_sitearch}/_auparse.a
#rm -f %{buildroot}%{python_sitearch}/_auparse.la
#rm -f %{buildroot}%{python_sitearch}/auparse.a
#rm -f %{buildroot}%{python_sitearch}/auparse.la
install -d -m 0755 %{buildroot}%{_sysconfdir}/audit/rules.d
%check
make check
#make check
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -135,11 +114,8 @@ if [ $1 -gt 1 ]; then
# fix /sbin -> /usr/sbin paths on upgrade
sed -i "s|path = /sbin/|path = /usr/sbin/|" %{_sysconfdir}/audit/plugins.d/*.conf
fi
%tmpfiles_create audit.conf
%systemd_post auditd
if [ $1 -eq 1 -o -e /etc/rc5.d/S11auditd ]; then
systemctl -q daemon-reload
systemctl -q enable auditd
fi
:
%preun
@@ -150,47 +126,39 @@ fi
%systemd_postun auditd
:
%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig
%posttrans -n lib%{name}
# clean broken old sysv links
find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
:
%files
%defattr(-,root,root)
%attr(750,root,root) %dir %{_sysconfdir}/audit
%config(noreplace) %{_sysconfdir}/audit/audisp-remote.conf
%{_sysconfdir}/audit/plugins.d/af_unix.conf
%{_sysconfdir}/audit/plugins.d/au-remote.conf
%{_sysconfdir}/audit/plugins.d/audispd-zos-remote.conf
%{_sysconfdir}/audit/plugins.d/syslog.conf
%{_sysconfdir}/audit/zos-remote.conf
%config(noreplace) %{_sysconfdir}/audit/audisp-filter.conf
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/audit-stop.rules
%dir %{_sysconfdir}/audit/rules.d
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/auditd.conf
%dir %{_datadir}/audit/sample-rules
%{_datadir}/audit/sample-rules/*.rules
%{_datadir}/audit/sample-rules/README-rules
%attr(644,root,root) %{_unitdir}/auditd.service
%dir %{_libexecdir}/initscripts/legacy-actions/auditd
%{_libexecdir}/initscripts/legacy-actions/auditd/*
%attr(750,root,root) %dir %{_localstatedir}/log/audit
%dir %{_sysconfdir}/audit/plugins.d
%config(noreplace) %{_sysconfdir}/audit/plugins.d/filter.conf
%config(noreplace) %{_sysconfdir}/audit/plugins.d/af_unix.conf
%config(noreplace) %{_sysconfdir}/audit/plugins.d/au-remote.conf
%config(noreplace) %{_sysconfdir}/audit/plugins.d/audispd-zos-remote.conf
%config(noreplace) %{_sysconfdir}/audit/plugins.d/syslog.conf
%config(noreplace) %{_sysconfdir}/audit/zos-remote.conf
%dir %{_sysconfdir}/audit/rules.d
%attr(750,root,root) %{_sbindir}/audispd-zos-remote
%attr(750,root,root) %{_sbindir}/audisp-remote
%attr(750,root,root) %{_sbindir}/audisp-syslog
%attr(750,root,root) %{_sbindir}/audisp-*
%attr(750,root,root) %{_sbindir}/auditctl
%attr(750,root,root) %{_sbindir}/auditd
%attr(750,root,root) %{_sbindir}/augenrules
%attr(750,root,root) %{_sbindir}/aureport
%attr(750,root,root) %{_sbindir}/ausearch
%attr(750,root,root) %{_sbindir}/autrace
%attr(755,root,root) %{_bindir}/aulast
%attr(755,root,root) %{_bindir}/aulastlog
%attr(755,root,root) %{_bindir}/ausyscall
%attr(750,root,root) %{_bindir}/auvirt
%attr(644,root,root) %{_unitdir}/auditd.service
%{_unitdir}/audit-rules.service
%{_tmpfilesdir}/audit.conf
%dir %{_datadir}/audit-rules
%{_datadir}/audit-rules/*
%attr(750,root,root) %dir %{_localstatedir}/log/audit
%{_mandir}/man5/auditd.conf.5*
%{_mandir}/man5/auditd.cron.5*
%{_mandir}/man5/ausearch-expression.5*
%{_mandir}/man5/auditd-plugins.5*
%{_mandir}/man5/zos-remote.conf.5*
@@ -198,8 +166,7 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_mandir}/man5/audisp-remote.conf.5*
%{_mandir}/man5/libaudit.conf.5*
%{_mandir}/man8/audispd-zos-remote.8*
%{_mandir}/man8/audisp-remote.8*
%{_mandir}/man8/audisp-syslog.8*
%{_mandir}/man8/audisp-*.8*
%{_mandir}/man8/auditctl.8*
%{_mandir}/man8/auditd.8*
%{_mandir}/man8/augenrules.8*
@@ -208,26 +175,25 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_mandir}/man8/aureport.8*
%{_mandir}/man8/ausearch.8*
%{_mandir}/man8/ausyscall.8*
%{_mandir}/man8/autrace.8*
%{_mandir}/man8/auvirt.8*
%files -n lib%{name}
%defattr(-,root,root)
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/libaudit.conf
%{_libdir}/libaudit.so.*
%{_libdir}/libauparse.so.*
%{_libexecdir}/audit-functions
%dir %{_libexecdir}/initscripts/legacy-actions/auditd
%{_libexecdir}/initscripts/legacy-actions/auditd/*
%doc AUTHORS COPYING
%files -n lib%{name}-devel
%defattr(-,root,root)
%{_includedir}/auparse-defs.h
%{_includedir}/auparse.h
%{_includedir}/audit-records.h
%{_includedir}/audit_logging.h
%{_includedir}/libaudit.h
%{_libdir}/libaudit.so
%{_libdir}/libauparse.so
%{_libdir}/libaudit.la
%{_libdir}/libauparse.la
%{_libdir}/pkgconfig/auparse.pc
%{_libdir}/pkgconfig/audit.pc
%ifnarch arm
@@ -244,20 +210,44 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_libdir}/libaudit.a
%{_libdir}/libauparse.a
#%files -n python-audit
#%defattr(-,root,root)
#%{python_sitearch}/_audit.*
#%{python_sitearch}/audit.py*
#%{python_sitearch}/auparse.*
%files -n python-audit-py3
%defattr(-,root,root)
%{python3_sitelib}/_audit.*
%{python3_sitelib}/audit.py
%{python3_sitelib}/__pycache__/audit.cpython-*.pyc
%{python3_sitelib}/auparse.*
%{python3_sitearch}/_audit.*
%{python3_sitearch}/audit.py
%{python3_sitearch}/__pycache__/audit.cpython-*.pyc
%{python3_sitearch}/auparse.*
%changelog
* Sat May 31 2025 Automatic Build System <autodist@openmamba.org> 4.0.4-1mamba
- automatic version update by autodist
* Sun Jan 12 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.3-1mamba
- update to 4.0.3
* Sat Dec 28 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.2-2mamba
- removed build requirement for libprelude
* Fri Aug 09 2024 Automatic Build System <autodist@openmamba.org> 4.0.2-1mamba
- automatic version update by autodist
* Tue Mar 12 2024 Automatic Build System <autodist@openmamba.org> 4.0.1-1mamba
- automatic version update by autodist
* Wed Feb 07 2024 Automatic Build System <autodist@openmamba.org> 4.0-1mamba
- automatic version update by autodist
* Mon Aug 07 2023 Automatic Build System <autodist@mambasoft.it> 3.1.2-1mamba
- automatic version update by autodist
* Sat Apr 29 2023 Automatic Build System <autodist@mambasoft.it> 3.1.1-1mamba
- automatic version update by autodist
* Sun Feb 12 2023 Automatic Build System <autodist@mambasoft.it> 3.1-1mamba
- automatic version update by autodist
* Tue Aug 30 2022 Automatic Build System <autodist@mambasoft.it> 3.0.9-1mamba
- automatic version update by autodist
* Sat Apr 02 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 3.0.8-1mamba
- update to 3.0.8