rpms/audit/devel audit-1.7.9-i386.patch, NONE, 1.1 audit.spec, 1.189, 1.190

[Steve Grubb]

Author: sgrubb

Update of /cvs/pkgs/rpms/audit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12010

Modified Files:
	audit.spec 
Added Files:
	audit-1.7.9-i386.patch 
Log Message:
* Thu Oct 23 2008 Steve Grubb <sgrubb at redhat.com> 1.7.8-3
- Fix ausearch interpretting i386 syscalls on x86_64 machine


audit-1.7.9-i386.patch:

--- NEW FILE audit-1.7.9-i386.patch ---
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);


Index: audit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audit/devel/audit.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- audit.spec	23 Oct 2008 20:07:02 -0000	1.189
+++ audit.spec	24 Oct 2008 19:29:23 -0000	1.190
@@ -1,16 +1,17 @@
 %define sca_version 0.4.8
-%define sca_release 6
+%define sca_release 7
 %{!?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
 Name: audit
 Version: 1.7.8
-Release: 2%{?dist}
+Release: 3%{?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-1.7.9-bugs.patch
+Patch2: audit-1.7.9-i386.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel intltool libtool swig python-devel
 BuildRequires: tcp_wrappers-devel 
@@ -88,6 +89,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 (cd system-config-audit; ./autogen.sh)
@@ -276,6 +278,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
 
 %changelog
+* Thu Oct 23 2008 Steve Grubb <sgrubb at redhat.com> 1.7.8-3
+- Fix ausearch interpretting i386 syscalls on x86_64 machine
+
 * Thu Oct 23 2008 Steve Grubb <sgrubb at redhat.com> 1.7.8-2
 - Fix segfault when using file input to aureport
 - Quieten down messages about missing gssapi support