- updated to 2.4

- updated no-refusemanualstop patch
- updated .init script tags from upstream script

diff --git a/audit-no-refusemanualstop.patch b/audit-no-refusemanualstop.patch
index 47b843a03adaa5b007d88baa67f0ef865940fe4a..b1fb583f59c06c9d5946ede38e0cdaedb4c4430b 100644 (file)
--- a/audit-no-refusemanualstop.patch
+++ b/audit-no-refusemanualstop.patch
@@ -1,10 +1,10 @@
---- a/init.d/auditd.service
-+++ b/init.d/auditd.service
-@@ -4,7 +4,6 @@ DefaultDependencies=no
- After=local-fs.target
+--- audit-2.4/init.d/auditd.service.orig       2014-08-31 14:15:27.383690633 +0200
++++ audit-2.4/init.d/auditd.service    2014-08-31 14:16:15.263688624 +0200
+@@ -4,7 +4,6 @@
+ After=local-fs.target systemd-tmpfiles-setup.service
  Conflicts=shutdown.target
  Before=sysinit.target shutdown.target
 -RefuseManualStop=yes
+ ConditionKernelCommandLine=!audit=0
  
  [Service]
- ExecStart=/sbin/auditd -n

diff --git a/audit.spec b/audit.spec
index 683d965e98d6fc1f57eb54bcaa9a989b8117f639..098f0ee340654589cd91b173476d2abae95e02e0 100644 (file)
--- a/audit.spec
+++ b/audit.spec
@@ -1,19 +1,20 @@
 #
 # Conditional build:
-%bcond_without kerberos5       # do not build with heimdal
+%bcond_without kerberos5       # Kerberos V support via heimdal
 %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)
+%bcond_without golang          # Go language bindings
+%bcond_without python          # Python bindings
+%bcond_without zos_remote      # zos-remote audisp plugin (LDAP dep)
 #
 Summary:       User space tools for 2.6 kernel auditing
 Summary(pl.UTF-8):     Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:          audit
-Version:       2.3.7
+Version:       2.4
 Release:       1
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-# Source0-md5: 42813b6c202f5922ac904c059ac17ee6
+# Source0-md5: 7d35d9db17c2c5e155bc1fe42b55ec48
 Source2:       %{name}d.init
 Source3:       %{name}d.sysconfig
 Patch0:                %{name}-install.patch
@@ -28,6 +29,7 @@ URL:          http://people.redhat.com/sgrubb/audit/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
 BuildRequires: glibc-headers >= 6:2.3.6
+%{?with_golang:BuildRequires:  golang}
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 BuildRequires: libcap-ng-devel
 %{?with_prelude:BuildRequires: libprelude-devel}
@@ -126,6 +128,20 @@ 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 golang-audit
+Summary:       Go language interface to libaudit library
+Summary(pl.UTF-8):     Interfejs języka Go do biblioteki libaudit
+License:       LGPL v2.1+
+Group:         Development/Languages
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      golang
+
+%description -n golang-audit
+Go language interface to libaudit library.
+
+%description -n golang-audit -l pl.UTF-8
+Interfejs języka Go do biblioteki libaudit.
+
 %package -n python-audit
 Summary:       Python interface to libaudit library
 Summary(pl.UTF-8):     Pythonowy interfejs do biblioteki libaudit
@@ -304,6 +320,7 @@ fi
 %{_libdir}/libauparse.la
 %{_includedir}/auparse*.h
 %{_includedir}/libaudit.h
+%{_pkgconfigdir}/audit.pc
 %{_mandir}/man3/audit_*.3*
 %{_mandir}/man3/auparse_*.3*
 %{_mandir}/man3/ausearch_*.3*
@@ -325,6 +342,13 @@ fi
 %{_mandir}/man8/audisp-prelude.8*
 %endif
 
+%if %{with golang}
+%files -n golang-audit
+%defattr(644,root,root,755)
+%dir %{_libdir}/golang/src/pkg/redhat.com
+%{_libdir}/golang/src/pkg/redhat.com/audit
+%endif
+
 %if %{with python}
 %files -n python-audit
 %defattr(644,root,root,755)

diff --git a/auditd.init b/auditd.init
index d3c279e167a3a52697c9b639804ef92e887d576d..445342631ecbd0c7aaf1fb18c6d326f0ddff295e 100755 (executable)
--- a/auditd.init
+++ b/auditd.init
@@ -3,11 +3,14 @@
 # auditd       This starts and stops auditd
 #
 # chkconfig: 2345 18 82
-# description: This starts the Linux Auditing System Daemon
+# description: This starts the Linux Auditing System Daemon, \
+#              which collects security related events in a dedicated \
+#              audit log. If this daemon is turned off, audit events \
+#              will be sent to syslog.
 #
 # processname: auditd
 # config: /etc/sysconfig/auditd
-# config: /etc/auditd.conf
+# config: /etc/audit/auditd.conf
 # pidfile: /var/run/auditd.pid
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin