diff --git a/audit-445353-1.patch b/audit-445353-1.patch index 45e1145..5ac5421 100644 --- a/audit-445353-1.patch +++ b/audit-445353-1.patch @@ -1,15 +1,12 @@ ---- docs/ausearch.8 | 3 +++ - src/ausearch-options.c | 10 +++++++++- + src/ausearch-options.c | 9 ++++++++- src/ausearch-options.h | 1 + - src/ausearch.c | 5 ++--- - 4 files changed, 15 insertions(+), 4 deletions(-) + src/ausearch.c | 10 ++++++---- + 4 files changed, 18 insertions(+), 5 deletions(-) -Index: trunk/docs/ausearch.8 -=================================================================== ---- trunk.orig/docs/ausearch.8 -+++ trunk/docs/ausearch.8 -@@ -57,6 +57,9 @@ Stop after emitting the first event that +--- audit-1.7.7/docs/ausearch.8 ++++ audit-1.7.7/docs/ausearch.8 +@@ -54,6 +54,9 @@ .BR \-k ,\ \-\-key \ \fIkey-string\fP Search for an event based on the given \fIkey string\fP. .TP @@ -19,18 +16,17 @@ Index: trunk/docs/ausearch.8 .BR \-m ,\ \-\-message \ \fImessage-type\fP\ |\ \fIcomma-sep-message-type-list\fP Search for an event matching the given \fImessage type\fP. You may also enter a \fIcomma separated list of message types\fP. There is an \fBALL\fP message type that doesn't exist in the actual logs. It allows you to get all messages in the system. The list of valid messages types is long. The program will display the list whenever no message type is passed with this parameter. The message type can be either text or numeric. If you enter a list, there can be only commas and no spaces separating the list. .TP -Index: trunk/src/ausearch-options.c -=================================================================== ---- trunk.orig/src/ausearch-options.c -+++ trunk/src/ausearch-options.c -@@ -51,5 +51,6 @@ int event_ua = 0, event_ga = 0, event_se +--- audit-1.7.7/src/ausearch-options.c ++++ audit-1.7.7/src/ausearch-options.c +@@ -50,6 +50,7 @@ + int event_ua = 0, event_ga = 0, event_se = 0; int just_one = 0; int event_session_id = -1; +int line_buffered = 0; const char *event_key = NULL; const char *event_node = NULL; const char *event_filename = NULL; -@@ -72,7 +73,7 @@ enum { S_EVENT, S_COMM, S_FILENAME, S_AL +@@ -71,7 +72,7 @@ S_HOSTNAME, S_INTERP, S_INFILE, S_MESSAGE_TYPE, S_PID, S_SYSCALL, S_OSUCCESS, S_TIME_END, S_TIME_START, S_TERMINAL, S_ALL_UID, S_EFF_UID, S_UID, S_LOGINID, S_VERSION, S_EXACT_MATCH, S_EXECUTABLE, S_CONTEXT, S_SUBJECT, S_OBJECT, @@ -39,7 +35,7 @@ Index: trunk/src/ausearch-options.c static struct nv_pair optiontab[] = { { S_EVENT, "-a" }, -@@ -101,6 +103,8 @@ static struct nv_pair optiontab[] = { +@@ -98,6 +99,8 @@ { S_JUST_ONE, "--just-one" }, { S_KEY, "-k" }, { S_KEY, "--key" }, @@ -48,7 +44,7 @@ Index: trunk/src/ausearch-options.c { S_MESSAGE_TYPE, "-m" }, { S_MESSAGE_TYPE, "--message" }, { S_NODE, "-n" }, -@@ -173,6 +177,7 @@ static void usage(void) +@@ -169,6 +172,7 @@ "\t--input-logs\t\t\tUse the logs even if stdin is a pipe\n" "\t--just-one\t\t\tEmit just one event\n" "\t-k,--key \t\tsearch based on key field\n" @@ -56,7 +52,7 @@ Index: trunk/src/ausearch-options.c "\t-m,--message \tsearch based on message type\n" "\t-n,--node \t\tsearch based on machine's name\n" "\t-o,--object search based on context of object\n" -@@ -1003,6 +1008,9 @@ int check_params(int count, char *vars[] +@@ -954,6 +958,9 @@ c++; } break; @@ -66,11 +62,9 @@ Index: trunk/src/ausearch-options.c default: fprintf(stderr, "%s is an unsupported option\n", vars[c]); -Index: trunk/src/ausearch-options.h -=================================================================== ---- trunk.orig/src/ausearch-options.h -+++ trunk/src/ausearch-options.h -@@ -36,6 +36,7 @@ extern const char *event_subject; +--- audit-1.7.7/src/ausearch-options.h ++++ audit-1.7.7/src/ausearch-options.h +@@ -36,6 +36,7 @@ extern const char *event_object; extern int event_se; extern int just_one; @@ -78,11 +72,8 @@ Index: trunk/src/ausearch-options.h extern pid_t event_ppid; extern int event_session_id; -Index: trunk/src/ausearch.c -=================================================================== - ---- audit-1.7.7/src/ausearch.c.orig 2008-11-27 02:09:24.438158000 +0100 -+++ audit-1.7.7/src/ausearch.c 2008-11-27 02:12:45.548843000 +0100 +--- audit-1.7.7/src/ausearch.c ++++ audit-1.7.7/src/ausearch.c @@ -43,7 +43,6 @@ static FILE *log_fd = NULL; diff --git a/audit-secondary.spec b/audit-secondary.spec index ec12280..30d86d3 100644 --- a/audit-secondary.spec +++ b/audit-secondary.spec @@ -1,7 +1,7 @@ # # spec file for package audit-secondary (Version 1.7.7) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Summary: Python Bindings for libaudit License: GPL v2 or later Group: System/Monitoring Version: 1.7.7 -Release: 5 +Release: 6 Url: http://people.redhat.com/sgrubb/audit/ Source0: audit-%{version}.tar.bz2 Patch0: audit-no_sca.patch diff --git a/audit.changes b/audit.changes index 0736ce1..028520e 100644 --- a/audit.changes +++ b/audit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 14 14:52:39 CEST 2009 - dmueller@suse.de + +- refresh patches + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/audit.spec b/audit.spec index 763f3db..340a3f0 100644 --- a/audit.spec +++ b/audit.spec @@ -1,7 +1,7 @@ # # spec file for package audit (Version 1.7.7) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: audit BuildRequires: gcc-c++ tcpd-devel Summary: User Space Tools for 2.6 Kernel Auditing Version: 1.7.7 -Release: 5 +Release: 6 License: GPL v2 or later Group: System/Monitoring Url: http://people.redhat.com/sgrubb/audit/ @@ -223,6 +223,8 @@ fi %attr(755,root,root) /usr/bin/ausyscall %changelog +* Tue Apr 14 2009 dmueller@suse.de +- refresh patches * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293)