Attachment 8491 Details for Bug 19527 – patch to fix audit issue

[patch] patch to fix audit issue

audit.spec.diff (text/plain), 2.00 KB, created by David GEIGER on 2016-10-05 14:23:46 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: David GEIGER

Created: 2016-10-05 14:23:46 CEST

Size: 2.00 KB

patch

obsolete

>Index: audit.spec
>===================================================================
>--- audit.spec	(rÃ©vision 1058937)
>+++ audit.spec	(copie de travail)
>@@ -9,7 +9,7 @@
> Summary:        User-space tools for Linux 2.6 kernel auditing
> Name:           audit
> Version:        2.6.7
>-Release:        %mkrel 1
>+Release:        %mkrel 2
> License:        LGPLv2+
> Group:          System/Base
> URL:            http://people.redhat.com/sgrubb/audit/
>@@ -111,10 +111,8 @@
> (ITDS) set for Remote Audit service.
> 
> %prep
>-
> %setup -q
> 
>-
> find -type d -name ".libs" | xargs rm -rf
> 
> #fix build with new automake
>@@ -134,7 +132,7 @@
>     --enable-systemd \
>     --with-python3=yes
> 
>-%make
>+%make_build
> 
> %install
> %{__install} -d %{buildroot}%{_var}/log/audit
>@@ -142,7 +140,7 @@
> %{__install} -d %{buildroot}%{_var}/spool/audit
> %{__install} -D -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
> 
>-%makeinstall_std
>+%make_install
> 
> # uneeded files
> find %{buildroot} -name "*.la" -delete
>@@ -151,8 +149,13 @@
> # Copy default rules into place on new installation
> files=`ls /etc/audit/rules.d/ 2>/dev/null | wc -w`
> if [ "$files" -eq 0 ] ; then
>-# audit off by default, rhbz#1117953
>-        cp /usr/share/doc/audit/rules/10-no-audit.rules /etc/audit/rules.d/audit.rules
>+# FESCO asked for audit to be off by default. #1117953
>+	if [ -e /usr/share/doc/audit/rules/10-no-audit.rules ] ; then
>+	        cp /usr/share/doc/audit/rules/10-no-audit.rules /etc/audit/rules.d/audit.rules
>+	else
>+		touch /etc/audit/rules.d/audit.rules
>+	fi
>+	chmod 0600 /etc/audit/rules.d/audit.rules
> fi
> 
> %_tmpfilescreate %{name}
>@@ -163,9 +166,12 @@
> systemctl start -q auditd.service
> # %%_post_service auditd.service
> 
>-%postun
>+%preun
>+## For some unknow reason "systemctl stop" doesn't work so use "systemctl kill" instead.
>+## Failed to stop auditd.service: Operation refused, unit auditd.service may be requested
>+## by dependency only.
>+systemctl kill -q auditd.service
> systemctl disable -q auditd.service
>-systemctl stop -q auditd.service
> 
> 
> %files

Index: audit.spec
===================================================================
--- audit.spec	(rÃ©vision 1058937)
+++ audit.spec	(copie de travail)
@@ -9,7 +9,7 @@
 Summary:        User-space tools for Linux 2.6 kernel auditing
 Name:           audit
 Version:        2.6.7
-Release:        %mkrel 1
+Release:        %mkrel 2
 License:        LGPLv2+
 Group:          System/Base
 URL:            http://people.redhat.com/sgrubb/audit/
@@ -111,10 +111,8 @@
 (ITDS) set for Remote Audit service.
 
 %prep
-
 %setup -q
 
-
 find -type d -name ".libs" | xargs rm -rf
 
 #fix build with new automake
@@ -134,7 +132,7 @@
     --enable-systemd \
     --with-python3=yes
 
-%make
+%make_build
 
 %install
 %{__install} -d %{buildroot}%{_var}/log/audit
@@ -142,7 +140,7 @@
 %{__install} -d %{buildroot}%{_var}/spool/audit
 %{__install} -D -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 
-%makeinstall_std
+%make_install
 
 # uneeded files
 find %{buildroot} -name "*.la" -delete
@@ -151,8 +149,13 @@
 # Copy default rules into place on new installation
 files=`ls /etc/audit/rules.d/ 2>/dev/null | wc -w`
 if [ "$files" -eq 0 ] ; then
-# audit off by default, rhbz#1117953
-        cp /usr/share/doc/audit/rules/10-no-audit.rules /etc/audit/rules.d/audit.rules
+# FESCO asked for audit to be off by default. #1117953
+	if [ -e /usr/share/doc/audit/rules/10-no-audit.rules ] ; then
+	        cp /usr/share/doc/audit/rules/10-no-audit.rules /etc/audit/rules.d/audit.rules
+	else
+		touch /etc/audit/rules.d/audit.rules
+	fi
+	chmod 0600 /etc/audit/rules.d/audit.rules
 fi
 
 %_tmpfilescreate %{name}
@@ -163,9 +166,12 @@
 systemctl start -q auditd.service
 # %%_post_service auditd.service
 
-%postun
+%preun
+## For some unknow reason "systemctl stop" doesn't work so use "systemctl kill" instead.
+## Failed to stop auditd.service: Operation refused, unit auditd.service may be requested
+## by dependency only.
+systemctl kill -q auditd.service
 systemctl disable -q auditd.service
-systemctl stop -q auditd.service
 
 
 %files

Actions: View | Diff

Attachments on bug 19527: 8491