[packages/audit] - up to 2.3 - look at TODO - more work is needed
zawadaa
zawadaa at pld-linux.org
Thu May 16 16:23:28 CEST 2013
commit 896d27e1854664f056b693276720fa7b5344e9a7
Author: Andrzej Zawadzki <zawadaa at pld-linux.org>
Date: Thu May 16 16:22:29 2013 +0200
- up to 2.3
- look at TODO - more work is needed
audit-install.patch | 16 ++++++++--------
audit-systemd-notonly.patch | 24 +++++++++++++++---------
audit.spec | 19 ++++++++++++++-----
3 files changed, 37 insertions(+), 22 deletions(-)
---
diff --git a/audit.spec b/audit.spec
index 07966e0..ad065d9 100644
--- a/audit.spec
+++ b/audit.spec
@@ -1,4 +1,10 @@
-# TODO: revise our auditd.service vs upstream version
+# TODO: - revise our auditd.service vs upstream version
+# - add triggers for existing rules
+# look at https://www.redhat.com/archives/linux-audit/2013-May/msg00000.html
+# - files:
+# warning: Installed (but unpackaged) file(s) found:
+# /usr/lib/initscripts/legacy-actions/auditd/resume
+# /usr/lib/initscripts/legacy-actions/auditd/rotate
#
# Conditional build:
%bcond_without kerberos5 # do not build with heimdal
@@ -10,12 +16,12 @@
Summary: User space tools for 2.6 kernel auditing
Summary(pl.UTF-8): Narzędzia przestrzeni użytkownika do audytu jąder 2.6
Name: audit
-Version: 2.2.3
-Release: 1
+Version: 2.3
+Release: 0.1
License: GPL v2+
Group: Daemons
Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-# Source0-md5: 4cdd3756f7b7122fc1a3e4627f01b446
+# Source0-md5: c26381c3b44e4b171ea625a90ee9be69
Source2: %{name}d.init
Source3: %{name}d.sysconfig
Source4: %{name}d.service
@@ -242,6 +248,7 @@ fi
%attr(750,root,root) %{_sbindir}/audispd
%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
@@ -258,7 +265,8 @@ fi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/plugins.d/syslog.conf
%dir %{_sysconfdir}/audit
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audit/auditd.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audit/audit.rules
+%dir %{_sysconfdir}/audit/rules.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audit/rules.d/audit.rules
%attr(754,root,root) /etc/rc.d/init.d/auditd
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/auditd
%{systemdunitdir}/auditd.service
@@ -274,6 +282,7 @@ fi
%{_mandir}/man8/audispd.8*
%{_mandir}/man8/auditctl.8*
%{_mandir}/man8/auditd.8*
+%{_mandir}/man8/augenrules.8*
%{_mandir}/man8/aulast.8*
%{_mandir}/man8/aulastlog.8*
%{_mandir}/man8/aureport.8*
diff --git a/audit-install.patch b/audit-install.patch
index 6cf1d9e..2f62e81 100644
--- a/audit-install.patch
+++ b/audit-install.patch
@@ -1,7 +1,7 @@
---- audit-2.2.2/init.d/Makefile.am.orig 2012-12-16 08:26:46.514737404 +0100
-+++ audit-2.2.2/init.d/Makefile.am 2012-12-16 08:33:42.088062075 +0100
-@@ -37,8 +37,8 @@
- dist_audit_DATA = auditd.conf audit.rules
+--- audit-2.3/init.d/Makefile.am.orig 2013-04-30 16:26:09.000000000 +0200
++++ audit-2.3/init.d/Makefile.am 2013-05-15 15:34:15.728741312 +0200
+@@ -42,8 +42,8 @@
+ sbin_SCRIPTS = augenrules
install-data-hook:
- $(INSTALL_DATA) -D -m 640 ${srcdir}/${dispconfig} ${DESTDIR}${dispconfigdir}
@@ -11,12 +11,12 @@
if ENABLE_SYSTEMD
else
$(INSTALL_DATA) -D -m 640 ${srcdir}/auditd.sysconfig ${DESTDIR}${sysconfigdir}/auditd
-@@ -47,7 +47,7 @@
- install-exec-hook:
+@@ -53,7 +53,7 @@
if ENABLE_SYSTEMD
mkdir -p ${DESTDIR}${initdir}
+ mkdir -p ${DESTDIR}${legacydir}
- $(INSTALL_SCRIPT) -D -m 640 ${srcdir}/auditd.service ${DESTDIR}${initdir}
+ $(INSTALL_SCRIPT) -D -m 640 ${srcdir}/auditd.service ${DESTDIR}${initdir}/auditd.service
+ $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.rotate ${DESTDIR}${legacydir}/rotate
+ $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.resume ${DESTDIR}${legacydir}/resume
else
- $(INSTALL_SCRIPT) -D ${srcdir}/auditd.init ${DESTDIR}${initdir}/auditd
- endif
diff --git a/audit-systemd-notonly.patch b/audit-systemd-notonly.patch
index 7ee54da..583dff1 100644
--- a/audit-systemd-notonly.patch
+++ b/audit-systemd-notonly.patch
@@ -1,20 +1,21 @@
---- audit-2.2.2/init.d/Makefile.am.orig 2012-12-16 08:46:05.098046590 +0100
-+++ audit-2.2.2/init.d/Makefile.am 2012-12-16 09:26:03.771329926 +0100
-@@ -27,11 +27,10 @@
+--- audit-2.3/init.d/Makefile.am.orig 2013-05-15 16:19:13.077630064 +0200
++++ audit-2.3/init.d/Makefile.am 2013-05-16 13:40:32.110520842 +0200
+@@ -28,12 +28,11 @@
dispconfig = audispd.conf
dispconfigdir = $(sysconfdir)/audisp
if ENABLE_SYSTEMD
-initdir = /usr/lib/systemd/system
--else
+systemdunitdir = /lib/systemd/system
+ legacydir = $(libexecdir)/initscripts/legacy-actions/auditd
+-else
+endif
initdir = $(sysconfdir)/rc.d/init.d
sysconfigdir = $(sysconfdir)/sysconfig
-endif
auditdir = $(sysconfdir)/audit
- dist_audit_DATA = auditd.conf audit.rules
-@@ -39,26 +38,20 @@
+ auditrdir = $(auditdir)/rules.d
+@@ -44,21 +43,17 @@
install-data-hook:
$(INSTALL_DATA) -D -m 640 ${srcdir}/${dispconfig} ${DESTDIR}${dispconfigdir}/${dispconfig}
$(INSTALL_DATA) -D -m 640 ${srcdir}/${libconfig} ${DESTDIR}${sysconfdir}/${libconfig}
@@ -25,15 +26,20 @@
install-exec-hook:
if ENABLE_SYSTEMD
-- mkdir -p ${DESTDIR}${initdir}
+ mkdir -p ${DESTDIR}${initdir}
+ mkdir -p ${DESTDIR}${legacydir}
- $(INSTALL_SCRIPT) -D -m 640 ${srcdir}/auditd.service ${DESTDIR}${initdir}/auditd.service
++ $(INSTALL_SCRIPT) -D -m 640 ${srcdir}/auditd.service ${DESTDIR}${systemdunitdir}/auditd.service
+ $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.rotate ${DESTDIR}${legacydir}/rotate
+ $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.resume ${DESTDIR}${legacydir}/resume
-else
- $(INSTALL_SCRIPT) -D ${srcdir}/auditd.init ${DESTDIR}${initdir}/auditd
-+ $(INSTALL_SCRIPT) -D -m 640 ${srcdir}/auditd.service ${DESTDIR}${systemdunitdir}/auditd.service
endif
+ $(INSTALL_SCRIPT) -D ${srcdir}/auditd.init ${DESTDIR}${initdir}/auditd
+ chmod 0750 $(DESTDIR)$(sbindir)/augenrules
+
- uninstall-hook:
+@@ -66,9 +61,8 @@
rm ${DESTDIR}${dispconfigdir}/${dispconfig}
rm ${DESTDIR}${sysconfdir}/${libconfig}
if ENABLE_SYSTEMD
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/audit.git/commitdiff/896d27e1854664f056b693276720fa7b5344e9a7
More information about the pld-cvs-commit
mailing list