fix selcon patch to apply without fuzz

This commit is contained in:
Tom Callaway 2008-09-26 17:29:01 +00:00
parent 21c6888842
commit 7d279b9716
2 changed files with 13 additions and 11 deletions

View File

@ -6,9 +6,10 @@ 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. contexts and also for link names.
--- aide-0.12-orig/src/compare_db.c 2007-05-28 13:30:31.000000000 -0500 diff -up aide-0.13.1/src/compare_db.c.selcon aide-0.13.1/src/compare_db.c
+++ aide-0.12/src/compare_db.c 2007-05-28 13:31:09.000000000 -0500 --- aide-0.13.1/src/compare_db.c.selcon 2006-11-30 14:06:56.000000000 -0500
@@ -54,9 +54,10 @@ +++ 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 old_col = 12;
const int new_col = 40; const int new_col = 40;
@ -22,7 +23,7 @@ contexts and also for link names.
const char* entry_format= " %-9s: %-33s, %s\n"; const char* entry_format= " %-9s: %-33s, %s\n";
const char* entry_format_justnew=" %-9s: %-33c %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(old==NULL){
if(new!=NULL){ if(new!=NULL){
@ -46,5 +47,3 @@ contexts and also for link names.
ok = 1; ok = 1;
} }
if(ok) if(ok)

View File

@ -7,7 +7,7 @@
Summary: Intrusion detection environment Summary: Intrusion detection environment
Name: aide Name: aide
Version: 0.13.1 Version: 0.13.1
Release: 4 Release: 5%{?dist}
URL: http://sourceforge.net/projects/aide URL: http://sourceforge.net/projects/aide
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
@ -82,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.13.1-5
- fix selcon patch to apply without fuzz
* Fri Feb 15 2008 Steve Conklin <sconklin@redhat.com> * Fri Feb 15 2008 Steve Conklin <sconklin@redhat.com>
- rebuild for gcc4.3 - rebuild for gcc4.3