From 5554c264b239307020fde20cb31f5edc9e629a8f Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@fedoraproject.org>
Date: May 18 2010 16:52:00 +0000
Subject: - Apply 2 upstream bug fixes


---

diff --git a/aide-0.14-other-fixes.patch b/aide-0.14-other-fixes.patch
new file mode 100644
index 0000000..230e419
--- /dev/null
+++ b/aide-0.14-other-fixes.patch
@@ -0,0 +1,24 @@
+diff -urp aide-0.14.orig/src/be.c aide-0.14/src/be.c
+--- aide-0.14.orig/src/be.c	2010-05-18 12:36:19.000000000 -0400
++++ aide-0.14/src/be.c	2010-05-18 12:39:53.000000000 -0400
+@@ -161,7 +161,7 @@ FILE* be_init(int inout,url_t* u,int isz
+ #endif
+ #ifdef WITH_ZLIB
+     if(iszipped && !inout){
+-      fh=gzdopen(fd,"wb9+");
++      fh=gzdopen(fd,"wb9");
+       if(fh==NULL){
+ 	error(0,_("Couldn't open file %s for %s"),u->value,
+ 	      inout?"reading\n":"writing\n");
+diff -urp aide-0.14.orig/src/commandconf.c aide-0.14/src/commandconf.c
+--- aide-0.14.orig/src/commandconf.c	2010-05-18 12:36:19.000000000 -0400
++++ aide-0.14/src/commandconf.c	2010-05-18 12:36:49.000000000 -0400
+@@ -84,7 +84,7 @@ int commandconf(const char mode,const ch
+     else {
+       tmp=(char*)malloc(sizeof(char)
+ 			*(strlen(after)+strlen(line)+2));
+-      strcat(tmp,after);
++      strcpy(tmp,after);
+       strcat(tmp,"\n");
+       strcat(tmp,line);
+       free(after);
diff --git a/aide.spec b/aide.spec
index 2b55376..2b76750 100644
--- a/aide.spec
+++ b/aide.spec
@@ -4,7 +4,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.14
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
@@ -18,6 +18,7 @@ Patch2: aide-0.13.1-libgrypt-init.patch
 Patch3: aide-0.14-abort.patch
 Patch4: aide-0.14-selinux.patch
 Patch5: aide-0.14-perms.patch
+Patch6: aide-0.14-other-fixes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires: mktemp 
 BuildRequires: prelink elfutils-libelf-devel
@@ -44,6 +45,7 @@ checker and intrusion detection program.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure --with-config_file=%{_sysconfdir}/aide.conf \
@@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 18 2010 Steve Grubb <sgrubb@redhat.com> - 0.14-5
+- Apply 2 upstream bug fixes
+
 * Tue May 18 2010 Steve Grubb <sgrubb@redhat.com> - 0.14-4
 - Use upstream's patch to fix bz 590566