update code

This commit is contained in:
zhuchunyi 2019-11-06 19:02:08 +08:00
parent 1e005e229a
commit 5e663c65e8

View File

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