From 77168172bdf251ede520a59bcb5f48191a737996 Mon Sep 17 00:00:00 2001
From: sgrubb <sgrubb@redhat.com>
Date: Jun 29 2016 01:10:40 +0000
Subject: New upstream bugfix release


---

diff --git a/.gitignore b/.gitignore
index 3704db4..48a0b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,4 @@ audit-2.0.4.tar.gz
 /audit-2.5.1.tar.gz
 /audit-2.5.2.tar.gz
 /audit-2.6.tar.gz
+/audit-2.6.1.tar.gz
diff --git a/audit-2.6-man.patch b/audit-2.6-man.patch
deleted file mode 100644
index 27aa90c..0000000
--- a/audit-2.6-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur audit-2.6.orig/docs/auditd.conf.5 audit-2.6/docs/auditd.conf.5
---- audit-2.6.orig/docs/auditd.conf.5	2016-06-22 14:42:34.000000000 -0400
-+++ audit-2.6/docs/auditd.conf.5	2016-06-22 15:56:24.511250872 -0400
-@@ -24,10 +24,11 @@
- Normally you want this so the default is yes.
- .TP
- .I log_format
--The log format describes how the information should be stored on disk. There are 2 options: raw and nolog.
--If set to
-+The log format describes how the information should be stored on disk. There are 2 options: raw and enriched. The nolog option is deprecated. If set to
- .IR RAW ,
--the audit records will be stored in a format exactly as the kernel sends it. 
-+the audit records will be stored in a format exactly as the kernel sends it. The
-+.IR ENRICHED
-+option will resolve all uid, gid, syscall, architecture, and socket address information before writing the event to disk. This aids in making sense of events created on one system but reported/analized on another system.
- The 
- .I NOLOG
- option is now deprecated. If you were setting this format, now you should set
diff --git a/audit.spec b/audit.spec
index 4281d39..29fa18d 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
-Release: 3%{?dist}
+Version: 2.6.1
+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-man.patch
 BuildRequires: openldap-devel
 BuildRequires: swig
 BuildRequires: python-devel
@@ -285,6 +284,7 @@ fi
 %config(noreplace) %attr(640,root,root) /etc/audit/auditd.conf
 %ghost %config(noreplace) %attr(640,root,root) /etc/audit/rules.d/audit.rules
 %ghost %config(noreplace) %attr(640,root,root) /etc/audit/audit.rules
+%config(noreplace) %attr(640,root,root) /etc/audit/audit-stop.rules
 %config(noreplace) %attr(640,root,root) /etc/audisp/audispd.conf
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/af_unix.conf
 %config(noreplace) %attr(640,root,root) /etc/audisp/plugins.d/syslog.conf
@@ -307,6 +307,9 @@ fi
 %attr(750,root,root) /sbin/audispd-zos-remote
 
 %changelog
+* Wed Jun 28 2016 Steve Grubb <sgrubb@redhat.com> 2.6.1-1
+- New upstream bugfix release
+
 * Wed Jun 22 2016 Steve Grubb <sgrubb@redhat.com> 2.6-3
 - New upstream release
 
diff --git a/sources b/sources
index 280c74c..3af6f66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d767541930004049d453bcecd1b90c45  audit-2.6.tar.gz
+07b6f6bf9ecde2366fa9133b8125e178  audit-2.6.1.tar.gz