rpms/aide
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Revise patch for Initialize libgcrypt correctly (#530485)

Browse Source
This commit is contained in:
Steve Grubb 2009-12-09 18:10:04 +00:00
parent aa17b0d22d
commit 5e88799362
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
aide-0.13.1-libgrypt-init.patch
View File

@ -1,6 +1,28 @@
diff -up aide-0.13.1/src/md.c.gcryptinit aide-0.13.1/src/md.c diff -urp aide-0.13.1.orig/doc/aide.1.in aide-0.13.1/doc/aide.1.in
--- aide-0.13.1/src/md.c.gcryptinit 2009-10-23 04:48:19.000000000 +0200 --- aide-0.13.1.orig/doc/aide.1.in 2009-12-01 12:23:10.000000000 -0500
+++ aide-0.13.1/src/md.c 2009-10-23 04:53:09.000000000 +0200 +++ aide-0.13.1/doc/aide.1.in 2009-12-01 12:28:14.000000000 -0500
@@ -67,6 +67,7 @@ conditions:
.IP "16 Unimplemented function error"
.IP "17 Invalid configureline error"
.IP "18 IO error"
+.IP "19 Version mismatch error"
.PP
.SH NOTES
Please note that due to mmap issues, aide cannot be terminated with
diff -urp aide-0.13.1.orig/include/report.h aide-0.13.1/include/report.h
--- aide-0.13.1.orig/include/report.h 2009-12-01 12:23:10.000000000 -0500
+++ aide-0.13.1/include/report.h 2009-12-01 12:27:43.000000000 -0500
@@ -31,6 +31,7 @@
#define UNIMPLEMENTED_FUNCTION_ERROR 16
#define INVALID_CONFIGURELINE_ERROR 17
#define IO_ERROR 18
+#define VERSION_MISMATCH_ERROR 19
/* Errorcodes */
#define HASH_ALGO_ERROR 30
diff -urp aide-0.13.1.orig/src/md.c aide-0.13.1/src/md.c
--- aide-0.13.1.orig/src/md.c 2009-12-01 12:23:10.000000000 -0500
+++ aide-0.13.1/src/md.c 2009-12-01 12:27:04.000000000 -0500
@@ -201,6 +201,15 @@ int init_md(struct md_container* md) { @@ -201,6 +201,15 @@ int init_md(struct md_container* md) {
#endif #endif
#ifdef WITH_GCRYPT #ifdef WITH_GCRYPT
@ -11,7 +33,7 @@ diff -up aide-0.13.1/src/md.c.gcryptinit aide-0.13.1/src/md.c
+ */ + */
+ if(!gcry_check_version(GCRYPT_VERSION)) { + if(!gcry_check_version(GCRYPT_VERSION)) {
+ error(0,"libgcrypt version mismatch\n"); + error(0,"libgcrypt version mismatch\n");
+ exit(1); + exit(VERSION_MISMATCH_ERROR);
+ } + }
+ gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); + gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
if(gcry_md_open(&md->mdh,0,0)!=GPG_ERR_NO_ERROR){ if(gcry_md_open(&md->mdh,0,0)!=GPG_ERR_NO_ERROR){

5
aide.spec
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: 13%{?dist} Release: 14%{?dist}
URL: http://sourceforge.net/projects/aide URL: http://sourceforge.net/projects/aide
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Dec 09 2009 Steve Grubb <sgrubb@redhat.com> - 0.13.1-14
- Revise patch for Initialize libgcrypt correctly (#530485)
* Sat Nov 07 2009 Steve Grubb <sgrubb@redhat.com> - 0.13.1-13 * Sat Nov 07 2009 Steve Grubb <sgrubb@redhat.com> - 0.13.1-13
- Initialize libgcrypt correctly (#530485) - Initialize libgcrypt correctly (#530485)