X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=audit.spec;h=bf2c9fbef885d88ee3ad7b00554e7c839e3903a7;hb=ffa3946950716a3217bdac50be405bf793472cdb;hp=979f30ed4000b52b578c80e582ef2dce1bc80cb9;hpb=cc094a3e611bd83e1788eb14744c1976f097a080;p=packages%2Faudit.git

diff --git a/audit.spec b/audit.spec
index 979f30e..bf2c9fb 100644
--- a/audit.spec
+++ b/audit.spec
@@ -1,89 +1,105 @@
+# TODO: revise our auditd.service vs upstream version
 #
 # Conditional build:
-%bcond_without	pie	# auditd as PIE binary
-%bcond_without	python	# don't build python bindings
+%bcond_without	kerberos5	# do not build with heimdal
+%bcond_without	pie		# auditd as PIE binary
+%bcond_without	prelude		# prelude audisp plugin
+%bcond_without	python		# don't build python bindings
+%bcond_without	zos_remote	# do not build zos-remote audisp plugin (LDAP dep)
 #
 Summary:	User space tools for 2.6 kernel auditing
-Summary(pl):	Narzêdzia przestrzeni u¿ytkownika do audytu j±der 2.6
+Summary(pl.UTF-8):	Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:		audit
-Version:	1.3.1
-Release:	2
-License:	GPL
+Version:	2.2.2
+Release:	1
+License:	GPL v2+
 Group:		Daemons
 Source0:	http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-# Source0-md5:	a23590084cea1b8b73c50830abc56b22
-# formerly http://people.redhat.com/sgrubb/audit/audit.h
-Source1:	%{name}.h
+# Source0-md5:	6641fde111cf5dfda6d4282ab8410df5
 Source2:	%{name}d.init
 Source3:	%{name}d.sysconfig
-Patch0:		%{name}-swig-fix.patch
-Patch1:		%{name}-install.patch
+Source4:	%{name}d.service
+Patch0:		%{name}-install.patch
+Patch1:		%{name}-m4.patch
+Patch2:		%{name}-nolibs.patch
+Patch3:		%{name}-no_zos_remote.patch
+Patch4:		%{name}-systemd-notonly.patch
 URL:		http://people.redhat.com/sgrubb/audit/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 %{?with_pie:BuildRequires:	gcc >= 5:3.4}
 BuildRequires:	glibc-headers >= 6:2.3.6
-BuildRequires:	libstdc++-devel
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
+BuildRequires:	libcap-ng-devel
+%{?with_prelude:BuildRequires:	libprelude-devel}
 BuildRequires:	libtool
-BuildRequires:	linux-libc-headers >= 2.6.11
+BuildRequires:	libwrap-devel
+BuildRequires:	linux-libc-headers >= 7:2.6.30
+%{?with_zos_remote:BuildRequires:	openldap-devel}
 %if %{with python}
+BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	rpm-pythonprov
 BuildRequires:	swig-python
-%else
-BuildRequires:	sed >= 4.0
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.623
+BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-scripts
+Requires:	systemd-units >= 38
+Obsoletes:	audit-audispd-plugins
+Obsoletes:	audit-systemd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
+# use /lib, because this path is put in /usr/share/.../settings.py
+%define		_libexecdir	%{_prefix}/lib
 
 %description
 The audit package contains the user space utilities for storing and
 processing the audit records generate by the audit subsystem in the
 Linux 2.6 kernel.
 
-%description -l pl
-Ten pakiet zawiera narzêdzia przestrzeni u¿ytkownika do przechowywania
-i przetwarzania rekordów audytu generowanych przez podsystem audytu w
-j±drach Linuksa 2.6.
+%description -l pl.UTF-8
+Ten pakiet zawiera narzędzia przestrzeni użytkownika do przechowywania
+i przetwarzania rekordów audytu generowanych przez podsystem audytu w
+jądrach Linuksa 2.6.
 
 %package libs
 Summary:	Dynamic audit libraries
-Summary(pl):	Biblioteki dynamiczne audit
-License:	LGPL
+Summary(pl.UTF-8):	Biblioteki dynamiczne audit
+License:	LGPL v2.1+
 Group:		Libraries
 
 %description libs
 The audit-libs package contains the dynamic libraries needed for
 applications to use the audit framework.
 
-%description libs -l pl
+%description libs -l pl.UTF-8
 Ten pakiet zawiera biblioteki dynamiczne potrzebne dla aplikacji
-u¿ywaj±cych ¶rodowiska audytu.
+używających środowiska audytu.
 
 %package libs-devel
 Summary:	Header files for audit libraries
-Summary(pl):	Pliki nag³ówkowe bibliotek audit
-License:	LGPL
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek audit
+License:	LGPL v2.1+
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	linux-libc-headers >= 7:2.6.12.0-4
+Requires:	linux-libc-headers >= 7:2.6.30
 
 %description libs-devel
 The audit-libs-devel package contains the header files needed for
 developing applications that need to use the audit framework library.
 
-%description libs-devel -l pl
-Ten pakiet zawiera pliki nag³ówkowe potrzebne do tworzenia aplikacji
-u¿ywaj±cych biblioteki ¶rodowiska audytu.
+%description libs-devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe potrzebne do tworzenia aplikacji
+używających biblioteki środowiska audytu.
 
 %package libs-static
 Summary:	Static audit libraries
-Summary(pl):	Statyczne biblioteki audit
-License:	LGPL
+Summary(pl.UTF-8):	Statyczne biblioteki audit
+License:	LGPL v2.1+
 Group:		Development/Libraries
 Requires:	%{name}-libs-devel = %{version}-%{release}
 
@@ -91,33 +107,49 @@ Requires:	%{name}-libs-devel = %{version}-%{release}
 The audit-libs-static package contains the static libraries for
 developing applications that need to use the audit framework.
 
-%description libs-static -l pl
+%description libs-static -l pl.UTF-8
 Ten pakiet zawiera statyczne biblioteki do tworzenia aplikacji
-u¿ywaj±cych ¶rodowiska audytu.
+używających środowiska audytu.
+
+%package plugin-prelude
+Summary:	prelude plugin for audispd
+Summary(pl.UTF-8):	Wtyczka prelude dla audispd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-prelude
+audisp-prelude is a plugin for the audit event dispatcher daemon,
+audispd, that uses libprelude to send IDMEF alerts for possible
+Intrusion Detection events.
+
+%description plugin-prelude -l pl.UTF-8
+audisp-prelude to wtyczka demona audispd przekazującego zdarzenia
+audytowe wykorzystująca libprelude do wysyłania alarmów IDMEF o
+prawdopodobnych zdarzeniach IDS.
 
 %package -n python-audit
 Summary:	Python interface to libaudit library
-Summary(pl):	Pythonowy interfejs do biblioteki libaudit
-License:	LGPL
+Summary(pl.UTF-8):	Pythonowy interfejs do biblioteki libaudit
+License:	LGPL v2.1+
 Group:		Libraries/Python
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description -n python-audit
 Python interface to libaudit library.
 
-%description -n python-audit -l pl
+%description -n python-audit -l pl.UTF-8
 Pythonowy interfejs do biblioteki libaudit.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%{!?with_zos_remote:%patch3 -p1}
+%patch4 -p1
 
-install -D %{SOURCE1} lib/linux/audit.h
-install -D %{SOURCE1} src/mt/linux/audit.h
-
-%if !%{with python}
-sed '/PYTHON/d; s#swig/Makefile ##' -i configure.ac
+%if %{without python}
+sed 's#swig/Makefile ##' -i configure.ac
 sed 's/swig//' -i Makefile.am
 %endif
 
@@ -128,7 +160,11 @@ sed 's/swig//' -i Makefile.am
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-apparmor
+	%{?with_kerberos5:--enable-gssapi-krb5} \
+	--enable-systemd \
+	--with-apparmor \
+	--with-libwrap \
+	%{?with_prelude:--with-prelude}
 # override auditd_{C,LD}FLAGS to avoid -fPIE unsupported by gcc 3.3
 %{__make} \
 	%{!?with_pie:auditd_CFLAGS="-D_REENTRANT -D_GNU_SOURCE" auditd_LDFLAGS="-Wl,-z,relro"}
@@ -149,33 +185,25 @@ install -d $RPM_BUILD_ROOT%{_var}/log/audit
 
 install -d $RPM_BUILD_ROOT/%{_lib}
 mv -f $RPM_BUILD_ROOT%{_libdir}/libaudit.so.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libaudit.so.*.*.*) \
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libaudit.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libaudit.so
 mv -f $RPM_BUILD_ROOT%{_libdir}/libauparse.so.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} ; echo libauparse.so.*.*.*) \
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libauparse.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libauparse.so
 
 # We manually install this since Makefile doesn't
-install -d $RPM_BUILD_ROOT%{_includedir}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{systemdunitdir}}
 install lib/libaudit.h $RPM_BUILD_ROOT%{_includedir}
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/auditd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/auditd
+install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}
 
 %if %{with python}
-if [ "%{py_sitedir}" != "/usr/lib/python2.4/site-packages" ]; then
-install -d $RPM_BUILD_ROOT%{py_sitedir}
-mv $RPM_BUILD_ROOT/usr/lib/python2.4/site-packages/* $RPM_BUILD_ROOT%{py_sitedir}
-fi
-%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-rm -f $RPM_BUILD_ROOT%{py_sitescriptdir}/*.py
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.py
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
-%else
-rm -r $RPM_BUILD_ROOT/usr/lib/python2.4
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.py
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 %endif
 
 %clean
@@ -187,34 +215,79 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add auditd
 %service auditd restart "audit daemon"
+%systemd_post auditd.service
 
 %preun
 if [ "$1" = "0" ]; then
 	%service auditd stop
 	/sbin/chkconfig --del auditd
 fi
+%systemd_preun auditd.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- %{name} < 2.2-2
+%systemd_trigger auditd.service
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README THANKS TODO sample.rules
+%doc AUTHORS ChangeLog README THANKS TODO
+%attr(750,root,root) %{_bindir}/aulast
+%attr(750,root,root) %{_bindir}/aulastlog
+%attr(750,root,root) %{_bindir}/ausyscall
+%attr(750,root,root) %{_bindir}/auvirt
+%attr(750,root,root) %{_sbindir}/audispd
 %attr(750,root,root) %{_sbindir}/auditctl
 %attr(750,root,root) %{_sbindir}/auditd
 %attr(750,root,root) %{_sbindir}/aureport
 %attr(750,root,root) %{_sbindir}/ausearch
 %attr(750,root,root) %{_sbindir}/autrace
-%attr(754,root,root) /etc/rc.d/init.d/auditd
+%attr(755,root,root) %{_sbindir}/audisp-remote
+%{?with_zos_remote:%attr(755,root,root) %{_sbindir}/audispd-zos-remote}
+%dir %{_sysconfdir}/audisp
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/audispd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/audisp-remote.conf
+%{?with_zos_remote:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/zos-remote.conf}
+%dir %{_sysconfdir}/audisp/plugins.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/plugins.d/af_unix.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/plugins.d/au-remote.conf
+%{?with_zos_remote:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/plugins.d/audispd-zos-remote.conf}
+%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
+%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
 %attr(750,root,root) %dir %{_var}/log/audit
-%{_mandir}/man8/*
+%{_mandir}/man5/audispd.conf.5*
+%{_mandir}/man5/audisp-remote.conf.5*
+%{_mandir}/man5/auditd.conf.5*
+%{_mandir}/man5/ausearch-expression.5*
+%{?with_zos_remote:%{_mandir}/man5/zos-remote.conf.5*}
+%{_mandir}/man7/audit.rules.7*
+%{_mandir}/man8/audisp-remote.8*
+%{?with_zos_remote:%{_mandir}/man8/audispd-zos-remote.8*}
+%{_mandir}/man8/audispd.8*
+%{_mandir}/man8/auditctl.8*
+%{_mandir}/man8/auditd.8*
+%{_mandir}/man8/aulast.8*
+%{_mandir}/man8/aulastlog.8*
+%{_mandir}/man8/aureport.8*
+%{_mandir}/man8/ausearch.8*
+%{_mandir}/man8/ausyscall.8*
+%{_mandir}/man8/autrace.8*
+%{_mandir}/man8/auvirt.8*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libaudit.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libaudit.so.1
 %attr(755,root,root) /%{_lib}/libauparse.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libauparse.so.0
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libaudit.conf
+%{_mandir}/man5/libaudit.conf.5*
 
 %files libs-devel
 %defattr(644,root,root,755)
@@ -222,19 +295,33 @@ fi
 %attr(755,root,root) %{_libdir}/libauparse.so
 %{_libdir}/libaudit.la
 %{_libdir}/libauparse.la
+%{_includedir}/auparse*.h
 %{_includedir}/libaudit.h
-%{_mandir}/man3/*
+%{_mandir}/man3/audit_*.3*
+%{_mandir}/man3/auparse_*.3*
+%{_mandir}/man3/ausearch_*.3*
+%{_mandir}/man3/get_auditfail_action.3*
+%{_mandir}/man3/set_aumessage_mode.3*
 
 %files libs-static
 %defattr(644,root,root,755)
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
 
+%if %{with prelude}
+%files plugin-prelude
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/audisp-prelude
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/audisp-prelude.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/audisp/plugins.d/au-prelude.conf
+%{_mandir}/man5/audisp-prelude.conf.5*
+%{_mandir}/man8/audisp-prelude.8*
+%endif
+
 %if %{with python}
 %files -n python-audit
 %defattr(644,root,root,755)
-%attr(750,root,root) %{_sbindir}/audispd
 %attr(755,root,root) %{py_sitedir}/_audit.so
-%{py_sitescriptdir}/audit.py[co]
-%{py_sitedir}/AuditMsg.py[co]
+%attr(755,root,root) %{py_sitedir}/auparse.so
+%{py_sitedir}/audit.py[co]
 %endif