diff --git a/.gitignore b/.gitignore index b69362a..daeb713 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ audit-2.0.4.tar.gz /audit-2.2.2.tar.gz /audit-2.3.tar.gz /audit-2.3.1.tar.gz +/audit-2.3.2.tar.gz diff --git a/audit-2.3.2-restart.patch b/audit-2.3.2-restart.patch deleted file mode 100644 index 9bef6d7..0000000 --- a/audit-2.3.2-restart.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -urN audit-2.3.1/init.d/auditd.condrestart audit-2.3.2/init.d/auditd.condrestart ---- audit-2.3.1/init.d/auditd.condrestart 1969-12-31 19:00:00.000000000 -0500 -+++ audit-2.3.2/init.d/auditd.condrestart 2013-05-31 11:03:00.000000000 -0400 -@@ -0,0 +1,7 @@ -+#!/bin/sh -+# Helper script to provide legacy auditd service options not -+# directly supported by systemd. -+ -+/usr/libexec/initscripts/legacy-actions/auditd/restart -+RETVAL="$?" -+exit $RETVAL -diff -urN audit-2.3.1/init.d/auditd.restart audit-2.3.2/init.d/auditd.restart ---- audit-2.3.1/init.d/auditd.restart 1969-12-31 19:00:00.000000000 -0500 -+++ audit-2.3.2/init.d/auditd.restart 2013-05-31 11:03:00.000000000 -0400 -@@ -0,0 +1,13 @@ -+#!/bin/sh -+# Helper script to provide legacy auditd service options not -+# directly supported by systemd. -+ -+test -f /etc/audit/auditd.conf || exit 6 -+ -+/usr/libexec/initscripts/legacy-actions/auditd/stop -+ -+echo "Redirecting start to /bin/systemctl start auditd.service" -+/bin/systemctl start auditd.service -+RETVAL="$?" -+ -+exit $RETVAL -diff -urN audit-2.3.1/init.d/auditd.service audit-2.3.2/init.d/auditd.service ---- audit-2.3.1/init.d/auditd.service 2013-05-16 07:00:00.000000000 -0400 -+++ audit-2.3.2/init.d/auditd.service 2013-05-31 11:03:00.000000000 -0400 -@@ -4,6 +4,7 @@ - After=local-fs.target - Conflicts=shutdown.target - Before=sysinit.target shutdown.target -+RefuseManualStop=yes - - [Service] - ExecStart=/sbin/auditd -n -@@ -14,7 +15,6 @@ - #ExecStartPost=-/sbin/augenrules --load - ExecStartPost=-/sbin/auditctl -R /etc/audit/audit.rules - ExecReload=/bin/kill -HUP $MAINPID --RefuseManualStop=yes - - [Install] - WantedBy=multi-user.target -diff -urN audit-2.3.1/init.d/Makefile.am audit-2.3.2/init.d/Makefile.am ---- audit-2.3.1/init.d/Makefile.am 2013-05-16 07:00:00.000000000 -0400 -+++ audit-2.3.2/init.d/Makefile.am 2013-05-31 11:03:00.000000000 -0400 -@@ -22,8 +22,8 @@ - - CONFIG_CLEAN_FILES = *.rej *.orig - EXTRA_DIST = auditd.init auditd.service auditd.sysconfig auditd.conf \ -- audit.rules auditd.cron libaudit.conf audispd.conf \ -- auditd.resume auditd.rotate auditd.stop augenrules -+ audit.rules auditd.cron libaudit.conf audispd.conf auditd.condrestart \ -+ auditd.restart auditd.resume auditd.rotate auditd.stop augenrules - libconfig = libaudit.conf - dispconfig = audispd.conf - dispconfigdir = $(sysconfdir)/audisp -@@ -57,6 +57,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 -@@ -68,6 +70,11 @@ - rm ${DESTDIR}${sysconfdir}/${libconfig} - if ENABLE_SYSTEMD - rm ${DESTDIR}${initdir}/auditd.service -+ rm ${DESTDIR}${legacydir}/rotate -+ rm ${DESTDIR}${legacydir}/resume -+ rm ${DESTDIR}${legacydir}/stop -+ rm ${DESTDIR}${legacydir}/restart -+ rm ${DESTDIR}${legacydir}/condrestart - else - rm ${DESTDIR}${sysconfigdir}/auditd - rm ${DESTDIR}${initdir}/auditd diff --git a/audit.spec b/audit.spec index 4759163..ed52175 100644 --- a/audit.spec +++ b/audit.spec @@ -5,13 +5,12 @@ Summary: User space tools for 2.6 kernel auditing Name: audit -Version: 2.3.1 -Release: 3%{?dist} +Version: 2.3.2 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz -Patch1: audit-2.3.2-restart.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: swig python-devel BuildRequires: tcp_wrappers-devel krb5-devel libcap-ng-devel @@ -90,11 +89,9 @@ behavior. %prep %setup -q -%patch1 -p1 -autoreconf -fv --install %build -%configure --sbindir=/sbin --libdir=/%{_lib} --with-python=yes --with-libwrap --enable-gssapi-krb5=yes --with-libcap-ng=yes --with-armeb \ +%configure --sbindir=/sbin --libdir=/%{_lib} --with-python=yes --with-libwrap --enable-gssapi-krb5=yes --with-libcap-ng=yes --with-armeb --with-aarch64 \ %if %{WITH_SYSTEMD} --enable-systemd %endif @@ -275,6 +272,9 @@ fi %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz %changelog +* Mon Jul 29 2013 Steve Grubb 2.3.2-1 +- New upstream bugfix/enhancement release + * Fri Jun 21 2013 Steve Grubb 2.3.1-3 - Drop prelude support diff --git a/sources b/sources index 0860e8e..6bf08c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82c2c4b1052d7c1e948deafa0d5077fe audit-2.3.1.tar.gz +4e8d065b5cc16b77b9b61e93a9ed160e audit-2.3.2.tar.gz