rpms/aide/devel aide-0.12-selcon.patch,1.1,1.2 aide.spec,1.22,1.23

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/aide/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31217

Modified Files:
	aide-0.12-selcon.patch aide.spec 
Log Message:
fix selcon patch to apply without fuzz

aide-0.12-selcon.patch:

Index: aide-0.12-selcon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide-0.12-selcon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aide-0.12-selcon.patch	22 Jul 2007 15:13:14 -0000	1.1
+++ aide-0.12-selcon.patch	26 Sep 2008 17:29:01 -0000	1.2
@@ -1,16 +1,17 @@
 From: Steve Conklin <sconklin at redhat.com>
 To: aide-devel at 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 @@
  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 @@
          ok = 1;
    }
     if(ok)
-
-


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- aide.spec	15 Feb 2008 15:08:29 -0000	1.22
+++ aide.spec	26 Sep 2008 17:29:01 -0000	1.23
@@ -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 @@
 
 
 %changelog
+* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.13.1-5
+- fix selcon patch to apply without fuzz
+
 * Fri Feb 15 2008 Steve Conklin <sconklin at redhat.com>
 - rebuild for gcc4.3