diff --git a/audit.spec b/audit.spec index ee9a643..136f6eb 100644 --- a/audit.spec +++ b/audit.spec @@ -1,101 +1,94 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Summary: User space tools for kernel auditing -Name: audit -Version: 3.0 -Release: 2 -License: GPLv2+ and LGPLv2+ -URL: http://people.redhat.com/sgrubb/audit/ -Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha5.tar.gz -Source1: https://www.gnu.org/licenses/lgpl-2.1.txt +Summary: User space tools for kernel auditing +Name: audit +Version: 3.0 +Release: 3 +License: GPLv2+ and LGPLv2+ +URL: http://people.redhat.com/sgrubb/audit/ +Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha5.tar.gz +Source1: https://www.gnu.org/licenses/lgpl-2.1.txt -Patch6000: bindings-swig-src-auditswig.i-Do-not-hardcode-the-pa.patch -Patch6001: Fix-memory-leak-when-logs-are-corrupted.patch -Patch6002: fix-out-of-bound-read-on-shutdown.patch -Patch6003: Fix-a-couple-more-fuzzer-induced-bugs.patch -Patch6004: More-fuzzer-induced-bug-fixes.patch -Patch6005: Fix-memleak-in-auparse-caused-by-corrected-event-ordering.patch -Patch6006: Port-af_unix-plugin-to-libev.patch -Patch6007: 0067-Fix-minor-memory-leak-in-auditd-kerberos-credentials.patch +Patch6000: bindings-swig-src-auditswig.i-Do-not-hardcode-the-pa.patch +Patch6001: Fix-memory-leak-when-logs-are-corrupted.patch +Patch6002: fix-out-of-bound-read-on-shutdown.patch +Patch6003: Fix-a-couple-more-fuzzer-induced-bugs.patch +Patch6004: More-fuzzer-induced-bug-fixes.patch +Patch6005: Fix-memleak-in-auparse-caused-by-corrected-event-ordering.patch +Patch6006: Port-af_unix-plugin-to-libev.patch +Patch6007: 0067-Fix-minor-memory-leak-in-auditd-kerberos-credentials.patch -Patch9000: bugfix-audit-support-armv7b.patch -Patch9001: bugfix-audit-userspace-missing-syscalls-for-aarm64.patch -Patch9002: bugfix-audit-reload-coredump.patch +Patch9000: bugfix-audit-support-armv7b.patch +Patch9001: bugfix-audit-userspace-missing-syscalls-for-aarm64.patch +Patch9002: bugfix-audit-reload-coredump.patch -BuildRequires: gcc swig libtool -BuildRequires: openldap-devel -BuildRequires: krb5-devel libcap-ng-devel -BuildRequires: kernel-headers >= 2.6.29 -BuildRequires: python2 python-unversioned-command +BuildRequires: gcc swig libtool systemd kernel-headers >= 2.6.29 +BuildRequires: openldap-devel krb5-devel libcap-ng-devel +BuildRequires: python2 python-unversioned-command %ifarch %{golang_arches} -BuildRequires: golang +BuildRequires: golang %endif -BuildRequires: systemd -Requires: openldap -Requires(post): systemd coreutils -Requires(preun): systemd -Requires(postun): systemd coreutils +Requires: openldap +Requires(post): systemd coreutils +Requires(preun): systemd +Requires(postun): systemd coreutils -Provides: audit-libs = %{version}-%{release} -Provides: audit-libs%{?_isa} = %{version}-%{release} -Provides: audispd-plugins = %{version}-%{release} -Provides: audispd-plugins-zos = %{version}-%{release} -Obsoletes: audit-libs < %{version}-%{release} -Obsoletes: audit-libs%{?_isa} < %{version}-%{release} -Obsoletes: audispd-plugins < %{version}-%{release} -Obsoletes: audispd-plugins-zos < %{version}-%{release} +Provides: audit-libs = %{version}-%{release} +Provides: audit-libs%{?_isa} = %{version}-%{release} +Provides: audispd-plugins = %{version}-%{release} +Provides: audispd-plugins-zos = %{version}-%{release} +Obsoletes: audit-libs < %{version}-%{release} +Obsoletes: audit-libs%{?_isa} < %{version}-%{release} +Obsoletes: audispd-plugins < %{version}-%{release} +Obsoletes: audispd-plugins-zos < %{version}-%{release} %description -The audit package contains the user space utilities for -storing and searching the audit records generated by -the audit subsystem in the Linux 2.6 and later kernels. +The audit package contains the user space utilities for storing and searching +the audit records generated by the audit subsystem in the Linux 2.6 and later +kernels. %package devel -Summary: Header files for libaudit -License: LGPLv2+ -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: kernel-headers >= 2.6.29 +Summary: Header files for libaudit +License: LGPLv2+ +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: kernel-headers >= 2.6.29 +Provides: audit-libs-devel audit-libs-static +Obsoletes: audit-libs-devel audit-libs-static %description devel -The audit-libs-devel package contains the header files needed for -developing applications that need to use the audit framework libraries. +The audit-libs-devel package contains the header files needed for developing +applications that need to use the audit framework libraries. %package -n python2-audit -Summary: Python2 bindings for libaudit -License: LGPLv2+ -BuildRequires: python2-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: audit-libs-python = %{version}-%{release} -Provides: audit-libs-python%{?_isa} = %{version}-%{release} -Obsoletes: audit-libs-python < %{version}-%{release} -Provides: audit-libs-python2 = %{version}-%{release} -Provides: audit-libs-python2%{?_isa} = %{version}-%{release} -Obsoletes: audit-libs-python2 < %{version}-%{release} +Summary: Python2 bindings for libaudit +License: LGPLv2+ +BuildRequires: python2-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: audit-libs-python = %{version}-%{release} +Provides: audit-libs-python%{?_isa} = %{version}-%{release} +Obsoletes: audit-libs-python < %{version}-%{release} +Provides: audit-libs-python2 = %{version}-%{release} +Provides: audit-libs-python2%{?_isa} = %{version}-%{release} +Obsoletes: audit-libs-python2 < %{version}-%{release} %description -n python2-audit -The python2-audit package contains the bindings so that libaudit -and libauparse can be used by python2. +The python2-audit package contains the bindings so that libaudit and +libauparse can be used by python2. %package -n python3-audit -Summary: Python3 bindings for libaudit -License: LGPLv2+ -BuildRequires: python3-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: audit-libs-python3 = %{version}-%{release} -Provides: audit-libs-python3%{?_isa} = %{version}-%{release} -Obsoletes: audit-libs-python3 < %{version}-%{release} +Summary: Python3 bindings for libaudit +License: LGPLv2+ +BuildRequires: python3-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: audit-libs-python3 = %{version}-%{release} +Provides: audit-libs-python3%{?_isa} = %{version}-%{release} +Obsoletes: audit-libs-python3 < %{version}-%{release} %description -n python3-audit -The python3-audit package contains the bindings so that libaudit -and libauparse can be used by python3. +The python3-audit package contains the bindings so that libaudit and +libauparse can be used by python3. -%package help -Summary: Documents for %{name} -Buildarch: noarch -Requires: man info - -%description help -Man pages and other related documents for %{name}. +%package_help %prep %autosetup -n %{name}-%{version} -p1 @@ -105,7 +98,7 @@ autoreconf -f -i %build %configure --sbindir=/sbin --libdir=/%{_lib} --with-python=yes \ --with-python3=yes \ - --enable-gssapi-krb5=yes --with-arm --with-aarch64 \ + --enable-gssapi-krb5=yes --with-arm --with-aarch64 \ --with-libcap-ng=yes --enable-zos-remote \ %ifarch %{golang_arches} --with-golang \ @@ -136,7 +129,6 @@ cd $curdir rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.so rm -f $RPM_BUILD_ROOT/%{_lib}/libauparse.so -find $RPM_BUILD_ROOT -name '*.la' -delete find $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages -name '*.a' -delete mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir} @@ -144,6 +136,8 @@ mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir} touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf touch -r ./audit.spec $RPM_BUILD_ROOT/usr/share/man/man5/libaudit.conf.5.gz +%delete_la + %check %ifarch %{golang_arches} make check @@ -174,7 +168,7 @@ fi %files -%doc README ChangeLog rules init.d/auditd.cron +%doc README %{!?_licensedir:%global license %%doc} %license COPYING lgpl-2.1.txt %attr(755,root,root) /sbin/auditctl @@ -183,12 +177,13 @@ fi %attr(755,root,root) /sbin/aureport %attr(750,root,root) /sbin/autrace %attr(755,root,root) /sbin/augenrules +%attr(750,root,root) /sbin/audispd-zos-remote %attr(755,root,root) %{_bindir}/aulast %attr(755,root,root) %{_bindir}/aulastlog %attr(755,root,root) %{_bindir}/ausyscall %attr(755,root,root) %{_bindir}/auvirt -/%{_lib}/libaudit.so.1* -/%{_lib}/libauparse.* +%attr(755,root,root) /%{_lib}/libaudit.so.1* +%attr(755,root,root) /%{_lib}/libauparse.* %attr(644,root,root) %{_unitdir}/auditd.service %attr(750,root,root) %dir %{_libexecdir}/initscripts/legacy-actions/auditd %attr(750,root,root) %{_libexecdir}/initscripts/legacy-actions/auditd/condrestart @@ -212,13 +207,11 @@ fi %config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/au-remote.conf %config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/syslog.conf %config(noreplace) %attr(640,root,root) /etc/libaudit.conf +%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/audispd-zos-remote.conf +%config(noreplace) %attr(640,root,root) /etc/audit/zos-remote.conf %attr(750,root,root) /sbin/audisp-remote %attr(750,root,root) /sbin/audisp-syslog %attr(700,root,root) %dir %{_var}/spool/audit -%config(noreplace) %attr(640,root,root) /etc/audit/plugins.d/audispd-zos-remote.conf -%config(noreplace) %attr(640,root,root) /etc/audit/zos-remote.conf -%attr(750,root,root) /sbin/audispd-zos-remote - %files devel %defattr(-,root,root) @@ -240,7 +233,6 @@ fi %{_libdir}/libaudit.a %{_libdir}/libauparse.a - %files -n python2-audit %attr(755,root,root) %{python_sitearch}/_audit.so %attr(755,root,root) %{python_sitearch}/auparse.so @@ -249,16 +241,18 @@ fi %files -n python3-audit %attr(755,root,root) %{python3_sitearch}/* - %files help %defattr(-,root,root) -%attr(644,root,root) %{_mandir}/man8/*.8.gz -%attr(644,root,root) %{_mandir}/man7/*.7.gz +%doc ChangeLog rules init.d/auditd.cron +%attr(644,root,root) %{_mandir}/man3/*.3.gz %attr(644,root,root) %{_mandir}/man5/*.5.gz -%attr(644,root,root) %{_mandir}/man3/* - +%attr(644,root,root) %{_mandir}/man7/*.7.gz +%attr(644,root,root) %{_mandir}/man8/*.8.gz %changelog +* Wed Oct 9 2019 openEuler Buildteam - 3.0-3 +- Adjust requires + * Sun Sep 29 2019 openEuler Buildteam - 3.0-2 - Fix the auditctl error