diff --git a/audit.spec b/audit.spec index 6f1a619b41d25a5a0a32e6e043aef0e98406efc8..f8f055f7e0dba1e3eea2d8c470f9ebdeb7df8691 100644 --- a/audit.spec +++ b/audit.spec @@ -4,7 +4,7 @@ Summary: User space tools for kernel auditing Name: audit Epoch: 1 Version: 3.0 -Release: 2 +Release: 3 License: GPLv2+ and LGPLv2+ URL: https://people.redhat.com/sgrubb/audit/ Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz @@ -22,8 +22,7 @@ BuildRequires: python2 python-unversioned-command BuildRequires: golang %endif Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires(pre): pkgconf -Requires(post): systemd coreutils pkgconf +Requires(post): systemd coreutils Requires(preun): systemd Requires(postun): systemd coreutils @@ -46,7 +45,6 @@ Summary: Plugins for audit event dispatcher License: GPLv2+ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires(post): pkgconf %description -n audispd-plugins This package provides plugins for the real-time interface to audispd. @@ -57,7 +55,6 @@ License: GPLv2+ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: openldap -Requires(post): pkgconf %description -n audispd-plugins-zos This package provides a z/OS plugin for audit event dispatcher that @@ -161,15 +158,26 @@ make check rm -f rules/Makefile* %pre -if [ -d "/etc/audisp/" -a `/usr/bin/pkgconf --modversion audit | cut -d'.' -f 1` -lt 3 ];then +if [ -d "/etc/audisp/" ];then # custom plugins, copy config files from /etc/audisp/plugins.d to /etc/audit/plugins.d # self-plugins confile files will be overwritten when installing + self_config_files_285=(syslog.conf au-remote.conf audispd-zos-remote.conf af_unix.conf) plugins_config_files=`ls /etc/audisp/plugins.d/*.conf 2>/dev/null | wc -w` if [ $plugins_config_files -gt 0 ];then if [ ! -d /etc/audit/plugins.d/ ];then mkdir -p /etc/audit/plugins.d/ fi - cp /etc/audisp/plugins.d/*.conf /etc/audit/plugins.d/ + + for file in `/usr/bin/ls /etc/audisp/plugins.d/*.conf` + do + if [[ " ${self_config_files_285} " =~ " `/usr/bin/basename $file` " ]];then + continue + else + if [ ! -f /etc/audit/plugins.d/`/usr/bin/basename $file` ];then + cp $file /etc/audit/plugins.d/ + fi + fi + done fi fi @@ -186,7 +194,7 @@ if [ "$files" -eq 0 ] ; then fi # merge custom changes to new file -if [ -d "/etc/audisp/" -a `/usr/bin/pkgconf --modversion audit | cut -d'.' -f 1` -lt 3 ];then +if [ -d "/etc/audisp/" ];then if [ -s "/etc/audisp/plugins.d/af_unix.conf" ];then diffrence=`diff /etc/audisp/plugins.d/af_unix.conf /etc/audit/plugins.d/af_unix.conf` if [ "X$diffrence" != "X" ];then @@ -199,7 +207,7 @@ fi %post -n audispd-plugins # after installing audispd-plugins -if [ -d "/etc/audisp/" -a `/usr/bin/pkgconf --modversion audit | cut -d'.' -f 1` -lt 3 ];then +if [ -d "/etc/audisp/" ];then for file in audisp-remote.conf au-remote.conf syslog.conf do # merge custom changes to new file @@ -237,7 +245,7 @@ fi %post -n audispd-plugins-zos # after installing audispd-plugins-zos -if [ -d "/etc/audisp/" -a `/usr/bin/pkgconf --modversion audit | cut -d'.' -f 1` -lt 3 ];then +if [ -d "/etc/audisp/" ];then for file in audispd-zos-remote.conf zos-remote.conf do # merge custom changes to new file @@ -360,6 +368,9 @@ fi %attr(644,root,root) %{_mandir}/man8/*.8.gz %changelog +* Fri May 28 2021 yixiangzhike - 3.0-3 +- solve the script failure when package upgrade + * Wed May 26 2021 yixiangzhike - 3.0-2 - remove unused patch