From a68689b9d2ec54d815658c25db74a10701d901d2 Mon Sep 17 00:00:00 2001
From: sgrubb <sgrubb@redhat.com>
Date: Jul 08 2016 16:02:31 +0000
Subject: New upstream bugfix release


---

diff --git a/.gitignore b/.gitignore
index 213e51e..0e1c879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,4 @@ audit-2.0.4.tar.gz
 /audit-2.6.1.tar.gz
 /audit-2.6.2.tar.gz
 /audit-2.6.3.tar.gz
+/audit-2.6.4.tar.gz
diff --git a/audit-2.6.4-sockaddr.patch b/audit-2.6.4-sockaddr.patch
deleted file mode 100644
index 8b8a87c..0000000
--- a/audit-2.6.4-sockaddr.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -urp audit-2.6.4.orig/auparse/interpret.c audit-2.6.4/auparse/interpret.c
---- audit-2.6.4.orig/auparse/interpret.c	2016-07-05 16:14:50.000000000 -0400
-+++ audit-2.6.4/auparse/interpret.c	2016-07-05 17:00:04.711844356 -0400
-@@ -342,32 +342,42 @@ void init_interpretation_list(void)
- int load_interpretation_list(const char *buffer)
- {
- 	char *saved = NULL, *ptr;
--	char *buf;
-+	char *buf, *val;
-+	nvnode n;
- 
- 	if (buffer == NULL)
- 		return 0;
- 
- 	buf = strdup(buffer);
--	ptr = audit_strsplit_r(buf, &saved);
--	if (ptr == NULL) {
-+	if (strncmp(buf, "SADDR=", 6) == 0) {
-+		// We have SOCKADDR record. It has no other values.
-+		// Handle it by itself.
-+		ptr = strchr(buf+6, '{');
-+		if (ptr) {
-+			val = ptr;
-+			ptr = strchr(val, '}');
-+			if (ptr) {
-+				n.name = strdup("saddr");
-+				n.val = strdup(val);
-+				nvlist_append(&il, &n);
-+				nvlist_interp_fixup(&il);
-+				free(buf);
-+				return 1;
-+			}
-+		}
- 		free(buf);
- 		return 0;
--	}
-+	} else {
-+		// We handle everything else in this branch
-+		ptr = audit_strsplit_r(buf, &saved);
-+		if (ptr == NULL) {
-+			free(buf);
-+			return 0;
-+		}
- 
--	do {
--		nvnode n;
--		char tmp, *val;
-+		do {
-+			char tmp;
- 
--		if (*ptr == '{') {
--			val = ptr+1;
--			ptr = strchr(val, '}');
--			if (ptr) {
--				tmp = *ptr;
--				*ptr = 0;
--			} else
--				continue;	// Malformed - skip
--			n.name = strdup("saddr");
--		} else {
- 			val = strchr(ptr, '=');
- 			if (val) {
- 				*val = 0;
-@@ -386,15 +396,14 @@ int load_interpretation_list(const char
- 				*ptr = 0;
- 			} else
- 				tmp = 0;
--		}
--
--		n.val = strdup(val);
--		nvlist_append(&il, &n);
--		nvlist_interp_fixup(&il);
--		if (ptr)
--			*ptr = tmp;
--	} while((ptr = audit_strsplit_r(NULL, &saved)));
- 
-+			n.val = strdup(val);
-+			nvlist_append(&il, &n);
-+			nvlist_interp_fixup(&il);
-+			if (ptr)
-+				*ptr = tmp;
-+		} while((ptr = audit_strsplit_r(NULL, &saved)));
-+	}
- 	free(buf);
- 	return 1;
- }
diff --git a/audit.spec b/audit.spec
index a83b070..95ac98d 100644
--- a/audit.spec
+++ b/audit.spec
@@ -2,14 +2,13 @@
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: 2.6.3
-Release: 2%{?dist}
+Version: 2.6.4
+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
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
-Patch1: audit-2.6.4-sockaddr.patch
 BuildRequires: openldap-devel
 BuildRequires: swig
 BuildRequires: python-devel
@@ -114,7 +113,6 @@ Management Facility) database, through an IBM Tivoli Directory Server
 %prep
 %setup -q
 cp %{SOURCE1} .
-%patch1 -p1
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib} --with-python=yes \
@@ -310,6 +308,9 @@ fi
 %attr(750,root,root) /sbin/audispd-zos-remote
 
 %changelog
+* Fri Jul 08 2016 Steve Grubb <sgrubb@redhat.com> 2.6.4-1
+- New upstream bugfix release
+
 * Tue Jul 05 2016 Steve Grubb <sgrubb@redhat.com> 2.6.3-2
 - Fix sockaddr event interpretation
 
diff --git a/sources b/sources
index ad6f0a2..67b177e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67915d38c8a7f70c499d46777611e84e  audit-2.6.3.tar.gz
+366710a166462ee654a59cb657c94b5e  audit-2.6.4.tar.gz