From e8486e1e339130501d73bf432df57add388e7c05 Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@fedoraproject.org>
Date: Dec 29 2007 15:51:09 +0000
Subject: - fchmod of log file was on wrong variable (#426934)

- Allow use of errno strings for exit codes in audit rules

---

diff --git a/.cvsignore b/.cvsignore
index a7c80ae..e7049a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -80,3 +80,4 @@ audit-1.5.6.tar.gz
 audit-1.6.tar.gz
 audit-1.6.1.tar.gz
 audit-1.6.2.tar.gz
+audit-1.6.4.tar.gz
diff --git a/audit-1.6.3-no-chmod.patch b/audit-1.6.3-no-chmod.patch
deleted file mode 100644
index a2ccc1f..0000000
--- a/audit-1.6.3-no-chmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN audit/src/auditd-event.c audit-1.6.3/src/auditd-event.c
---- audit/src/auditd-event.c	2007-12-26 21:13:24.000000000 +0100
-+++ audit-1.6.3/src/auditd-event.c	2007-12-29 01:13:31.000000000 +0100
-@@ -742,8 +742,6 @@
- 			return 1;
- 		}
- 	}
--	fchmod(data->log_fd, 
--			data->config->log_group ? S_IRUSR|S_IRGRP : S_IRUSR);
- 	fchown(lfd, 0, data->config->log_group);
- 
- 	data->log_fd = lfd;
diff --git a/audit.spec b/audit.spec
index 48c500f..7f81874 100644
--- a/audit.spec
+++ b/audit.spec
@@ -1,17 +1,16 @@
 %define sca_version 0.4.5
-%define sca_release 2
+%define sca_release 3
 %define selinux_variants mls strict targeted
 %define selinux_policyver %(rpm -q selinux-policy | sed -e 's,^selinux-policy-\\([^/]*\\)$,\\1,')
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 1.6.3
-Release: 2%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-Patch0: audit-1.6.3-no-chmod.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.18
@@ -91,7 +90,6 @@ A graphical utility for editing audit configuration.
 
 %prep
 %setup -q
-%patch0 -p1 -b .no-chmod
 mkdir zos-remote-policy
 cp -p audisp/plugins/zos-remote/policy/audispd-zos-remote.* zos-remote-policy
 
@@ -290,6 +288,10 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Sat Dec 29 2007 Steve Grubb <sgrubb@redhat.com> 1.6.4-1
+- fchmod of log file was on wrong variable (#426934)
+- Allow use of errno strings for exit codes in audit rules
+
 * Sat Dec 29 2007 Miloslav Trmač <mitr@redhat.com> - 1.6.3-2
 - Don't fchmod() /dev/null to mode 0400 (#426934)
 
diff --git a/sources b/sources
index cea29a2..e3e4ece 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11f7c682093cea6aa6b2e6be93f9d0e3  audit-1.6.3.tar.gz
+3845dc6b8fbca062984b4968a15c208f  audit-1.6.4.tar.gz