From 7d279b9716995498f02c111acc938b89428d63b6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 26 Sep 2008 17:29:01 +0000 Subject: [PATCH] fix selcon patch to apply without fuzz --- aide-0.12-selcon.patch | 19 +++++++++---------- aide.spec | 5 ++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/aide-0.12-selcon.patch b/aide-0.12-selcon.patch index 6c77abe..bfd5d25 100644 --- a/aide-0.12-selcon.patch +++ b/aide-0.12-selcon.patch @@ -1,16 +1,17 @@ From: Steve Conklin To: aide-devel@lists.sourceforge.net -Only the first 32 characters of the selinux context was displayed, which +Only the first 32 characters of the selinux context was displayed, which often isn't enough to see what changed. -This patch increases the displayed length to 128 characters for selinux +This patch increases the displayed length to 128 characters for selinux contexts and also for link names. ---- aide-0.12-orig/src/compare_db.c 2007-05-28 13:30:31.000000000 -0500 -+++ aide-0.12/src/compare_db.c 2007-05-28 13:31:09.000000000 -0500 -@@ -54,9 +54,10 @@ - const int old_col = 12; - const int new_col = 40; +diff -up aide-0.13.1/src/compare_db.c.selcon aide-0.13.1/src/compare_db.c +--- aide-0.13.1/src/compare_db.c.selcon 2006-11-30 14:06:56.000000000 -0500 ++++ aide-0.13.1/src/compare_db.c 2008-09-26 13:23:25.000000000 -0400 +@@ -53,9 +53,10 @@ + const int old_col = 12; + const int new_col = 40; -const int part_len = 33; /* usable length of line[] */ -char oline[33]; @@ -22,7 +23,7 @@ contexts and also for link names. const char* entry_format= " %-9s: %-33s, %s\n"; const char* entry_format_justnew=" %-9s: %-33c %s\n"; /*************/ -@@ -383,17 +384,17 @@ void print_str_changes(char*old,char*new +@@ -379,17 +380,17 @@ void print_str_changes(char*old,char*new if(old==NULL){ if(new!=NULL){ @@ -46,5 +47,3 @@ contexts and also for link names. ok = 1; } if(ok) - - diff --git a/aide.spec b/aide.spec index 4823994..cdbee51 100644 --- a/aide.spec +++ b/aide.spec @@ -7,7 +7,7 @@ Summary: Intrusion detection environment Name: aide Version: 0.13.1 -Release: 4 +Release: 5%{?dist} URL: http://sourceforge.net/projects/aide License: GPLv2+ Group: Applications/System @@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 26 2008 Tom "spot" Callaway - 0.13.1-5 +- fix selcon patch to apply without fuzz + * Fri Feb 15 2008 Steve Conklin - rebuild for gcc4.3