From 26bdc0669a4b002f122765288bf7af4ced8c2556 Mon Sep 17 00:00:00 2001 From: Steve Grubb Date: Nov 05 2008 20:54:11 +0000 Subject: - New upstream release --- diff --git a/.cvsignore b/.cvsignore index b65c227..6449c6f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -94,3 +94,4 @@ audit-1.7.5.tar.gz audit-1.7.6.tar.gz audit-1.7.7.tar.gz audit-1.7.8.tar.gz +audit-1.7.9.tar.gz diff --git a/audit-1.7.9-bugs.patch b/audit-1.7.9-bugs.patch deleted file mode 100644 index 4b02a06..0000000 --- a/audit-1.7.9-bugs.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -urp audit-1.7.8/src/auditd-config.c audit-1.7.9/src/auditd-config.c ---- audit-1.7.8/src/auditd-config.c 2008-10-22 14:02:04.000000000 -0400 -+++ audit-1.7.9/src/auditd-config.c 2008-10-23 15:55:45.000000000 -0400 -@@ -1372,7 +1372,7 @@ static int enable_krb5_parser(struct nv_ - nv->value); - - #ifndef USE_GSSAPI -- audit_msg(LOG_NOTICE, -+ audit_msg(LOG_DEBUG, - "GSSAPI support is not enabled, ignoring value at line %d", - line); - return 0; -@@ -1395,7 +1395,7 @@ static int krb5_principal_parser(struct - - audit_msg(LOG_DEBUG,"krb5_principal_parser called with: %s",nv->value); - #ifndef USE_GSSAPI -- audit_msg(LOG_NOTICE, -+ audit_msg(LOG_DEBUG, - "GSSAPI support is not enabled, ignoring value at line %d", - line); - return 0; -@@ -1412,7 +1412,7 @@ static int krb5_key_file_parser(struct n - - audit_msg(LOG_DEBUG, "krb5_key_file_parser called with: %s", nv->value); - #ifndef USE_GSSAPI -- audit_msg(LOG_NOTICE, -+ audit_msg(LOG_DEBUG, - "GSSAPI support is not enabled, ignoring value at line %d", - line); - return 0; -diff -urp audit-1.7.8/src/aureport.c audit-1.7.9/src/aureport.c ---- audit-1.7.8/src/aureport.c 2008-10-22 14:02:04.000000000 -0400 -+++ audit-1.7.9/src/aureport.c 2008-10-23 15:55:45.000000000 -0400 -@@ -105,6 +105,8 @@ int main(int argc, char *argv[]) - config.admin_space_left_exe = NULL; - config.disk_full_exe = NULL; - config.disk_error_exe = NULL; -+ config.krb5_principal = NULL; -+ config.krb5_key_file = NULL; - } - - print_title(); diff --git a/audit-1.7.9-i386.patch b/audit-1.7.9-i386.patch deleted file mode 100644 index 9eef1a0..0000000 --- a/audit-1.7.9-i386.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urp audit-1.7.9.orig/src/ausearch-report.c audit-1.7.9/src/ausearch-report.c ---- audit-1.7.9.orig/src/ausearch-report.c 2008-10-24 13:49:39.000000000 -0400 -+++ audit-1.7.9/src/ausearch-report.c 2008-10-24 15:24:51.000000000 -0400 -@@ -63,7 +63,7 @@ static void output_interpreted_node(cons - static void interpret(char *name, char *val, int comma, int rtype); - - /* The machine based on elf type */ --static int machine = 0; -+static int machine = -1; - - /* The first syscall argument */ - static unsigned long long a0; -@@ -424,7 +424,7 @@ static void print_syscall(const char *va - const char *sys; - int ival; - -- if (machine <= 0) -+ if (machine < 0) - machine = audit_detect_machine(); - if (machine < 0) { - printf("%s ", val); diff --git a/audit-1.7.9-startup.patch b/audit-1.7.9-startup.patch deleted file mode 100644 index d64c295..0000000 --- a/audit-1.7.9-startup.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp audit-1.7.9.orig/src/auditd.c audit-1.7.9/src/auditd.c ---- audit-1.7.9.orig/src/auditd.c 2008-10-25 08:25:39.000000000 -0400 -+++ audit-1.7.9/src/auditd.c 2008-10-25 08:42:08.000000000 -0400 -@@ -664,7 +664,7 @@ int main(int argc, char *argv[]) - tell_parent(SUCCESS); - - /* Depending on value of opt_startup (-s) set initial audit state */ -- if (opt_startup != startup_nochange && -+ if ((audit_is_enabled(fd) < 2) && opt_startup != startup_nochange && - audit_set_enabled(fd, (int)opt_startup) < 0) { - char emsg[DEFAULT_BUF_SZ]; - if (*subj) diff --git a/audit-1.7.9-time.patch b/audit-1.7.9-time.patch deleted file mode 100644 index 3dc30d7..0000000 --- a/audit-1.7.9-time.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urp audit-1.7.9.orig/src/ausearch-time.c audit-1.7.9/src/ausearch-time.c ---- audit-1.7.9.orig/src/ausearch-time.c 2008-10-25 08:25:39.000000000 -0400 -+++ audit-1.7.9/src/ausearch-time.c 2008-10-27 08:11:49.000000000 -0400 -@@ -282,7 +282,7 @@ int ausearch_time_start(const char *da, - } else { - int keyword=lookup_time(da); - if (keyword == T_RECENT || keyword == T_NOW) { -- if (ti == NULL) -+ if (ti == NULL || strcmp(ti, "00:00:00") == 0) - goto set_it; - } - } -@@ -352,13 +352,13 @@ int ausearch_time_end(const char *da, co - } else { - int keyword=lookup_time(da); - if (keyword == T_RECENT || keyword == T_NOW) { -- if (ti == NULL) -+ if (ti == NULL || strcmp(ti, "00:00:00") == 0) - goto set_it; - } - // Special case today - if (keyword == T_TODAY) { - set_tm_now(&d); -- if (ti == NULL) -+ if (ti == NULL || strcmp(ti, "00:00:00") == 0) - goto set_it; - } - } diff --git a/audit.spec b/audit.spec index 7c0a75b..f126d1d 100644 --- a/audit.spec +++ b/audit.spec @@ -1,7 +1,7 @@ -%define audit_version 1.7.8 -%define audit_release 6%{?dist} +%define audit_version 1.7.9 +%define audit_release 1%{?dist} %define sca_version 0.4.8 -%define sca_release 10 +%define sca_release 11 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: User space tools for 2.6 kernel auditing @@ -12,10 +12,6 @@ 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-1.7.9-bugs.patch -Patch2: audit-1.7.9-i386.patch -Patch3: audit-1.7.9-startup.patch -Patch4: audit-1.7.9-time.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext-devel intltool libtool swig python-devel BuildRequires: tcp_wrappers-devel @@ -93,13 +89,8 @@ A graphical utility for editing audit configuration. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build -(cd system-config-audit; ./autogen.sh) %configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no make %{?_smp_mflags} @@ -206,6 +197,7 @@ fi %attr(644,root,root) %{_mandir}/man8/aureport.8.gz %attr(644,root,root) %{_mandir}/man8/ausearch.8.gz %attr(644,root,root) %{_mandir}/man8/autrace.8.gz +%attr(644,root,root) %{_mandir}/man8/aulast.8.gz %attr(644,root,root) %{_mandir}/man8/aulastlog.8.gz %attr(644,root,root) %{_mandir}/man8/ausyscall.8.gz %attr(644,root,root) %{_mandir}/man5/auditd.conf.5.gz @@ -217,6 +209,7 @@ fi %attr(755,root,root) /sbin/aureport %attr(750,root,root) /sbin/autrace %attr(750,root,root) /sbin/audispd +%attr(750,root,root) %{_bindir}/aulast %attr(750,root,root) %{_bindir}/aulastlog %attr(755,root,root) %{_bindir}/ausyscall %attr(755,root,root) /etc/rc.d/init.d/auditd @@ -266,6 +259,9 @@ fi %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server %changelog +* Wed Nov 05 2008 Steve Grubb 1.7.9-1 +- New upstream release + * Tue Oct 28 2008 Steve Grubb 1.7.8-6 - Update specfile requires to include dist diff --git a/sources b/sources index dd13575..99e79ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b2529433c2fcf4728b286f0d822d016 audit-1.7.8.tar.gz +d2d09d562f1def849938b3afc4050b37 audit-1.7.9.tar.gz