rpms/aide/F-13 aide-0.14-abort.patch, NONE, 1.1 aide-0.14-other-fixes.patch, NONE, 1.1 aide-0.14-perms.patch, NONE, 1.1 aide-0.14-selinux.patch, NONE, 1.1 aide.spec, 1.41, 1.42
Steve Grubb
sgrubb at fedoraproject.org
Tue May 18 17:01:15 UTC 2010
Author: sgrubb
Update of /cvs/pkgs/rpms/aide/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31889
Modified Files:
aide.spec
Added Files:
aide-0.14-abort.patch aide-0.14-other-fixes.patch
aide-0.14-perms.patch aide-0.14-selinux.patch
Log Message:
* Tue May 18 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-5
- Apply 2 upstream bug fixes
aide-0.14-abort.patch:
commandconf.c | 6 +++---
compare_db.c | 2 +-
db.c | 2 +-
list.c | 6 +++---
util.c | 3 +--
5 files changed, 9 insertions(+), 10 deletions(-)
--- NEW FILE aide-0.14-abort.patch ---
diff -urp aide.orig/src/commandconf.c aide/src/commandconf.c
--- aide.orig/src/commandconf.c 2010-04-28 11:17:07.000000000 -0400
+++ aide/src/commandconf.c 2010-04-28 11:19:12.000000000 -0400
@@ -216,7 +216,7 @@ int conf_input_wrapper(char* buf, int ma
MHASH_FAILED){
error(0, "mhash_hmac_init() failed for %i for config check. Aborting\n",
conf->confhmactype);
- abort();
+ exit(EXIT_FAILURE);
}
} else {
conf->do_configmd=0;
@@ -341,7 +341,7 @@ int db_input_wrapper(char* buf, int max_
if(c==-1) {
int xx;
error(0,"Error reading gzipped file: %s\n",gzerror(*db_gzp,&xx));
- abort();
+ exit(EXIT_FAILURE);
}
}else {
/* False alarm */
@@ -377,7 +377,7 @@ int db_input_wrapper(char* buf, int max_
mhash_get_hash_pblock(conf->dbhmactype)))==
MHASH_FAILED){
error(0, "mhash_hmac_init() failed for db check. Aborting\n");
- abort();
+ exit(EXIT_FAILURE);
}
} else {
*domd=0;
diff -urp aide.orig/src/compare_db.c aide/src/compare_db.c
--- aide.orig/src/compare_db.c 2010-04-28 11:17:07.000000000 -0400
+++ aide/src/compare_db.c 2010-04-28 11:20:15.000000000 -0400
@@ -1025,7 +1025,7 @@ void init_rxlst(list* rxlst)
if (data==NULL){
error(0,_("Not enough memory for regexpr compile... exiting..\n"));
- abort();
+ exit(EXIT_FAILURE);
}
strcpy(data+1,((rx_rule*)r->data)->rx);
diff -urp aide.orig/src/db.c aide/src/db.c
--- aide.orig/src/db.c 2010-04-28 11:17:07.000000000 -0400
+++ aide/src/db.c 2010-04-28 11:21:02.000000000 -0400
@@ -382,7 +382,7 @@ db_line* db_char2line(char** ss,int db){
line->filename=strdup(ss[(*db_order)[i]]);
} else {
error(0,"db_char2line():Error while reading database\n");
- abort();
+ exit(EXIT_FAILURE);
}
break;
}
diff -urp aide.orig/src/list.c aide/src/list.c
--- aide.orig/src/list.c 2010-04-28 11:17:07.000000000 -0400
+++ aide/src/list.c 2010-04-28 11:22:45.000000000 -0400
@@ -47,7 +47,7 @@
/*
- * Some way to handle mallocs failure would be nice. Now it say abort().
+ * Some way to handle mallocs failure would be nice.
*/
list* list_append(list* listp,void*data)
@@ -57,7 +57,7 @@ list* list_append(list* listp,void*data)
if (newitem==NULL) {
error(0,"Not enough memory to add a new item to list.\n");
- abort();
+ exit(EXIT_FAILURE);
}
if(listp==NULL){
@@ -65,7 +65,7 @@ list* list_append(list* listp,void*data)
if (header==NULL){
error(0,"Not enough memory for list header allocation\n");
- abort();
+ exit(EXIT_FAILURE);
}
newitem->data=data;
diff -urp aide.orig/src/util.c aide/src/util.c
--- aide.orig/src/util.c 2010-04-28 11:17:07.000000000 -0400
+++ aide/src/util.c 2010-04-28 11:21:49.000000000 -0400
@@ -332,8 +332,7 @@ void sig_handler(int signum)
conf->catch_mmap=0;
} else {
error(0,"Caught SIGBUS/SEGV. Exiting\n");
- abort();
- exit(1);
+ exit(EXIT_FAILURE);
}
break;
}
aide-0.14-other-fixes.patch:
be.c | 2 +-
commandconf.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE aide-0.14-other-fixes.patch ---
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);
aide-0.14-perms.patch:
compare_db.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE aide-0.14-perms.patch ---
diff -urp aide-0.14.orig/src/compare_db.c aide-0.14/src/compare_db.c
--- aide-0.14.orig/src/compare_db.c 2010-05-15 10:32:49.000000000 -0400
+++ aide-0.14/src/compare_db.c 2010-05-18 10:47:46.000000000 -0400
@@ -317,7 +317,7 @@ DB_ATTR_TYPE compare_dbline(db_line* l1,
easy_compare(DB_BCOUNT,bcount);
if (!(DB_PERM&ignorelist)) {
- if(l1->perm!=l2->perm){
+ if (DB_PERM&l1->attr && DB_PERM&l2->attr && l1->perm!=l2->perm) {
ret|=DB_PERM;
}
} else {
aide-0.14-selinux.patch:
include/compare_db.h | 2 +-
src/aide.c | 2 +-
src/compare_db.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE aide-0.14-selinux.patch ---
diff -urp aide-0.14.orig/include/compare_db.h aide-0.14/include/compare_db.h
--- aide-0.14.orig/include/compare_db.h 2010-05-15 10:15:23.000000000 -0400
+++ aide-0.14/include/compare_db.h 2010-05-15 10:16:05.000000000 -0400
@@ -48,6 +48,6 @@ void init_rxlst(list* rxlst);
* compare_dbline()
* Return RETOK if same RETFAIL if not
*/
-int compare_dbline(db_line* old,db_line* new,DB_ATTR_TYPE ignorelist);
+DB_ATTR_TYPE compare_dbline(db_line* old,db_line* new,DB_ATTR_TYPE ignorelist);
#endif
diff -urp aide-0.14.orig/src/aide.c aide-0.14/src/aide.c
--- aide-0.14.orig/src/aide.c 2010-05-15 10:15:23.000000000 -0400
+++ aide-0.14/src/aide.c 2010-05-15 10:17:32.000000000 -0400
@@ -246,7 +246,7 @@ void setdefaults_before_config()
char* urlstr=INITIALERRORSTO;
url_t* u=NULL;
char* s=(char*)malloc(sizeof(char)*MAXHOSTNAMELEN+1);
- unsigned long long p;
+ DB_ATTR_TYPE p;
/*
Set up the hostname
diff -urp aide-0.14.orig/src/compare_db.c aide-0.14/src/compare_db.c
--- aide-0.14.orig/src/compare_db.c 2010-05-15 10:15:23.000000000 -0400
+++ aide-0.14/src/compare_db.c 2010-05-15 10:16:42.000000000 -0400
@@ -275,7 +275,7 @@ static int compare_str(const char *s1, c
- ignorelist kertoo mitä ei saa vertailla
*/
-int compare_dbline(db_line* l1,db_line* l2,DB_ATTR_TYPE ignorelist)
+DB_ATTR_TYPE compare_dbline(db_line* l1,db_line* l2,DB_ATTR_TYPE ignorelist)
{
#define easy_compare(a,b) \
Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/F-13/aide.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- aide.spec 16 Mar 2010 20:23:08 -0000 1.41
+++ aide.spec 18 May 2010 17:01:14 -0000 1.42
@@ -4,7 +4,7 @@
Summary: Intrusion detection environment
Name: aide
Version: 0.14
-Release: 1%{?dist}
+Release: 5%{?dist}
URL: http://sourceforge.net/projects/aide
License: GPLv2+
Group: Applications/System
@@ -14,6 +14,11 @@ Source2: README.quickstart
Source3: aide.logrotate
# Customize the database file location in the man page.
Patch1: aide-0.14-man.patch
+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
@@ -36,6 +41,11 @@ checker and intrusion detection program.
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
%configure --with-config_file=%{_sysconfdir}/aide.conf \
@@ -81,6 +91,20 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue May 18 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-5
+- Apply 2 upstream bug fixes
+
+* Tue May 18 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-4
+- Use upstream's patch to fix bz 590566
+
+* Sat May 15 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-3
+- Fix bz 590561 aide does not detect the change of SElinux context
+- Fix bz 590566 aide reports a changed file when it has not been changed
+
+* Wed Apr 28 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-2
+- Fix bz 574764 by replacing abort calls with exit
+- Apply libgcrypt init patch
+
* Tue Mar 16 2010 Steve Grubb <sgrubb at redhat.com> - 0.14-1
- New upstream release final 0.14
More information about the scm-commits
mailing list