diff --git a/.cvsignore b/.cvsignore index 4022584..a93eaaf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -87,3 +87,4 @@ audit-1.6.7.tar.gz audit-1.6.8.tar.gz audit-1.6.9.tar.gz audit-1.7.tar.gz +audit-1.7.1.tar.gz diff --git a/audit-1.7.1-eoe-memleak.patch b/audit-1.7.1-eoe-memleak.patch deleted file mode 100644 index 67c33ba..0000000 --- a/audit-1.7.1-eoe-memleak.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urp audit-1.7/src/auditd.c audit-1.7.1/src/auditd.c ---- audit-1.7/src/auditd.c 2008-01-01 09:55:36.000000000 -0500 -+++ audit-1.7.1/src/auditd.c 2008-04-04 21:19:35.000000000 -0400 -@@ -150,7 +150,8 @@ static void distribute_event(struct audi - enqueue_event(rep); - if (yield) - pthread_yield(); /* Let other thread try to log it. */ -- } -+ } else -+ free(rep); // This function takes custody of the memory - - // FIXME: This is commented out since it fails to work. The - // problem is that the logger thread free's the buffer. Probably diff --git a/audit-1.7.1-lsb-headers.patch b/audit-1.7.1-lsb-headers.patch deleted file mode 100644 index 0ee012a..0000000 --- a/audit-1.7.1-lsb-headers.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur audit-1.6.10.orig/init.d/auditd.init audit-1.6.10/init.d/auditd.init ---- audit-1.6.10.orig/init.d/auditd.init 2008-03-27 10:53:28.000000000 -0400 -+++ audit-1.6.10/init.d/auditd.init 2008-03-27 14:17:10.000000000 -0400 -@@ -23,16 +23,6 @@ - # 6 - program is not configured - # 7 - program is not running - # --### BEGIN INIT INFO --# Provides: audit --# Required-Start: $syslog $local_fs --# Required-Stop: $syslog $local_fs --# Should-Start: $network --# Default-Start: 2 3 4 5 --# Default-Stop: 0 1 6 --# Short-Description: audit daemon --# Description: The audit daemon collects system security events --### END INIT INFO - - - PATH=/sbin:/bin:/usr/bin:/usr/sbin diff --git a/audit-1.7.1-overflow.patch b/audit-1.7.1-overflow.patch deleted file mode 100644 index 6fcb9ba..0000000 --- a/audit-1.7.1-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urp audit-1.7/lib/audit_logging.c audit-1.7.1/lib/audit_logging.c ---- audit-1.7/lib/audit_logging.c 2008-03-27 11:11:34.000000000 -0400 -+++ audit-1.7.1/lib/audit_logging.c 2008-04-01 11:55:41.000000000 -0400 -@@ -653,8 +653,10 @@ int audit_log_user_command(int audit_fd, - } - - p = cmd; -- strncpy(commname, cmd, PATH_MAX); -- commname[PATH_MAX] = 0; -+ if (len >= PATH_MAX) { -+ cmd[PATH_MAX] = 0; -+ len = PATH_MAX-1; -+ } - while (*p) { - if (*p == '"' || *p < 0x21 || (unsigned)*p > 0x7f) { - _audit_c2x(commname, cmd, len); diff --git a/audit.spec b/audit.spec index e0cc98a..755cf70 100644 --- a/audit.spec +++ b/audit.spec @@ -108,7 +108,7 @@ cp -p audisp/plugins/zos-remote/policy/audispd-zos-remote.* zos-remote-policy (cd system-config-audit; ./autogen.sh) aclocal && autoconf && autoheader && automake %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude -make +make %{?_smp_mflags} cd zos-remote-policy for selinuxvariant in %{selinux_variants} do @@ -125,7 +125,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/{man5,man8} mkdir -p $RPM_BUILD_ROOT/%{_lib} mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install make -C system-config-audit DESTDIR=$RPM_BUILD_ROOT install-fedora for selinuxvariant in %{selinux_variants} do diff --git a/sources b/sources index d4b944f..dda9fe4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cc813a11060e4576ef0bc1f10bac0c1 audit-1.7.tar.gz +c9d9fcfc19bdc131cc7bcf53b9b2dba4 audit-1.7.1.tar.gz