rpms/aide/devel aide-0.13.1-libgrypt-init.patch, NONE, 1.1 aide.spec, 1.33, 1.34

[Steve Grubb]

Author: sgrubb

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

Modified Files:
	aide.spec 
Added Files:
	aide-0.13.1-libgrypt-init.patch 
Log Message:
* Sat Nov 07 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-13
- Initialize libgcrypt correctly (#530485)


aide-0.13.1-libgrypt-init.patch:
 md.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE aide-0.13.1-libgrypt-init.patch ---
diff -up aide-0.13.1/src/md.c.gcryptinit aide-0.13.1/src/md.c
--- aide-0.13.1/src/md.c.gcryptinit	2009-10-23 04:48:19.000000000 +0200
+++ aide-0.13.1/src/md.c	2009-10-23 04:53:09.000000000 +0200
@@ -201,6 +201,15 @@ int init_md(struct md_container* md) {
 #endif 
 #ifdef WITH_GCRYPT
   error(255,"Gcrypt library initialization\n");
+  	/* 
+  	  Initialize libgcrypt as per
+  	  http://www.gnupg.org/documentation/manuals/gcrypt/Initializing-the-library.html
+  	 */
+  	if(!gcry_check_version(GCRYPT_VERSION)) {
+		error(0,"libgcrypt version mismatch\n");
+		exit(1);
+	}
+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 	if(gcry_md_open(&md->mdh,0,0)!=GPG_ERR_NO_ERROR){
 		error(0,"gcrypt_md_open failed\n");
 		exit(IO_ERROR);


Index: aide.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aide/devel/aide.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- aide.spec	21 Aug 2009 10:19:21 -0000	1.33
+++ aide.spec	7 Nov 2009 14:22:40 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.13.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPLv2+
 Group: Applications/System
@@ -18,6 +18,7 @@ Patch1: aide-0.13.1-contextsize.patch
 Patch2: aide-0.12-dedosify.patch
 Patch3: aide-0.13.1-manuals.patch
 Patch4: aide-0.13.1-prelink2.patch
+Patch5: aide-0.13.1-libgrypt-init.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildRequires: mktemp 
 BuildRequires: prelink autoconf automake elfutils-libelf-devel
@@ -43,6 +44,7 @@ checker and intrusion detection program.
 %patch2 -p1 -b .dedosify
 %patch3 -p1 -b .manpages
 %patch4 -p1 -b .prelink
+%patch5 -p1 -b .libgcrypt
 autoreconf
 
 %build
@@ -85,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 07 2009 Steve Grubb <sgrubb at redhat.com> - 0.13.1-13
+- Initialize libgcrypt correctly (#530485)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.13.1-12
 - rebuilt with new audit