- up to 2.3.2

- updated systemd-notonly patch

diff --git a/audit-systemd-notonly.patch b/audit-systemd-notonly.patch
index dbc6d9408d9ad1db868f179da83d93d109ecf45f..52694079d864e391b6e9fcbcfde35b6229ce154e 100644 (file)
--- a/audit-systemd-notonly.patch
+++ b/audit-systemd-notonly.patch
@@ -1,5 +1,5 @@
---- audit-2.3.1/init.d/Makefile.am.orig        2013-06-08 22:26:09.755754441 +0200
-+++ audit-2.3.1/init.d/Makefile.am     2013-06-08 22:28:05.405752030 +0200
+--- audit-2.3.2/init.d/Makefile.am.orig        2013-08-24 21:51:07.859509228 +0200
++++ audit-2.3.2/init.d/Makefile.am     2013-08-24 21:52:55.076171394 +0200
 @@ -28,12 +28,11 @@
  dispconfig = audispd.conf
  dispconfigdir = $(sysconfdir)/audisp
@@ -15,7 +15,7 @@
  
  auditdir = $(sysconfdir)/audit
  auditrdir = $(auditdir)/rules.d
-@@ -44,22 +43,18 @@
+@@ -44,24 +43,20 @@
  install-data-hook:
        $(INSTALL_DATA) -D -m 640 ${srcdir}/${dispconfig} ${DESTDIR}${dispconfigdir}/${dispconfig}
        $(INSTALL_DATA) -D -m 640 ${srcdir}/${libconfig} ${DESTDIR}${sysconfdir}/${libconfig}
@@ -33,6 +33,8 @@
        $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.rotate ${DESTDIR}${legacydir}/rotate
        $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.resume ${DESTDIR}${legacydir}/resume
        $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.stop ${DESTDIR}${legacydir}/stop
+       $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.restart ${DESTDIR}${legacydir}/restart
+       $(INSTALL_SCRIPT) -D -m 750 ${srcdir}/auditd.condrestart ${DESTDIR}${legacydir}/condrestart
 -else
 -      $(INSTALL_SCRIPT) -D ${srcdir}/auditd.init ${DESTDIR}${initdir}/auditd
  endif
@@ -40,13 +42,18 @@
        chmod 0750 $(DESTDIR)$(sbindir)/augenrules
  
  
-@@ -67,9 +62,8 @@
+@@ -69,14 +64,13 @@
        rm ${DESTDIR}${dispconfigdir}/${dispconfig}
        rm ${DESTDIR}${sysconfdir}/${libconfig}
  if ENABLE_SYSTEMD
 -      rm ${DESTDIR}${initdir}/auditd.service
--else
 +      rm ${DESTDIR}${systemdunitdir}/auditd.service
+       rm ${DESTDIR}${legacydir}/rotate
+       rm ${DESTDIR}${legacydir}/resume
+       rm ${DESTDIR}${legacydir}/stop
+       rm ${DESTDIR}${legacydir}/restart
+       rm ${DESTDIR}${legacydir}/condrestart
+-else
 +endif
        rm ${DESTDIR}${sysconfigdir}/auditd
        rm ${DESTDIR}${initdir}/auditd

diff --git a/audit.spec b/audit.spec
index 3656b1871769684de88e30dc932166d1cad582da..0d45412609da5fa2f2081e69f757f59105bea7fd 100644 (file)
--- a/audit.spec
+++ b/audit.spec
@@ -1,10 +1,6 @@
 # TODO: - revise our auditd.service vs upstream version
 #      - add triggers for existing rules
 #      look at https://www.redhat.com/archives/linux-audit/2013-May/msg00000.html
-#      - files:
-#      warning: Installed (but unpackaged) file(s) found:
-#      /usr/lib/initscripts/legacy-actions/auditd/resume
-#      /usr/lib/initscripts/legacy-actions/auditd/rotate
 #
 # Conditional build:
 %bcond_without kerberos5       # do not build with heimdal
@@ -16,12 +12,12 @@
 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.1
+Version:       2.3.2
 Release:       0.1
 License:       GPL v2+
 Group:         Daemons
 Source0:       http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-# Source0-md5: 82c2c4b1052d7c1e948deafa0d5077fe
+# Source0-md5: 4e8d065b5cc16b77b9b61e93a9ed160e
 Source2:       %{name}d.init
 Source3:       %{name}d.sysconfig
 Source4:       %{name}d.service
@@ -207,6 +203,9 @@ 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}
 
+# seems RH initscripts-specific
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/initscripts
+
 %if %{with python}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}