From 6279709cc97368d032ce778dcd6f5419a7762483aa2b44bcecae617ed1b6bd56 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 11 Jul 2019 13:39:02 +0000
Subject: [PATCH] Accepting request 714652 from
 home:abergmann:branches:security

Remove not available gcrypt algorithm 7 DB_HAVAL (bsc#1098360).

OBS-URL: https://build.opensuse.org/request/show/714652
OBS-URL: https://build.opensuse.org/package/show/security/aide?expand=0&rev=34
---
 aide-define_hash_use_gcrypt.patch | 37 +++++++++++++++++++++++++++++++
 aide.changes                      |  6 +++++
 aide.spec                         |  2 ++
 3 files changed, 45 insertions(+)
 create mode 100644 aide-define_hash_use_gcrypt.patch

diff --git a/aide-define_hash_use_gcrypt.patch b/aide-define_hash_use_gcrypt.patch
new file mode 100644
index 0000000..b7faf2c
--- /dev/null
+++ b/aide-define_hash_use_gcrypt.patch
@@ -0,0 +1,37 @@
+diff -Nur aide-0.16/include/md.h aide-0.16.new/include/md.h
+--- aide-0.16/include/md.h	2016-07-25 22:56:55.000000000 +0200
++++ aide-0.16.new/include/md.h	2018-11-21 14:07:01.347479021 +0100
+@@ -48,7 +48,7 @@
+ #define HASH_GCRYPT_COUNT GCRY_MD_CRC32
+ #ifndef WITH_MHASH
+ #define HASH_USE_GCRYPT (DB_MD5|DB_SHA1|DB_RMD160|DB_TIGER|DB_CRC32|\
+-                         DB_HAVAL|DB_CRC32|DB_SHA256|DB_SHA512)
++                         DB_CRC32B|DB_SHA256|DB_SHA512)
+ #endif
+ #endif
+ 
+diff -Nur aide-0.16/src/md.c aide-0.16.new/src/md.c
+--- aide-0.16/src/md.c	2016-07-25 22:56:55.000000000 +0200
++++ aide-0.16.new/src/md.c	2018-11-21 14:06:05.602295496 +0100
+@@ -55,10 +55,12 @@
+     r=DB_TIGER;
+     break;
+   }
++/* until libgcrypt-1.8.4 not implemented yet, see doc/gcrypt.info-1
+   case GCRY_MD_HAVAL: {
+     r=DB_HAVAL;
+     break;
+   }
++*/
+   case GCRY_MD_SHA256: {
+     r=DB_SHA256;
+     break;
+@@ -219,7 +221,7 @@
+ 			if(gcry_md_enable(md->mdh,i)==GPG_ERR_NO_ERROR){
+ 				md->calc_attr|=h;
+ 			} else {
+-				error(0,"gcry_md_enable %i failed",i);
++				error(0,"gcry_md_enable %i failed, see /usr/include/gcrypt.h enum gcry_md_algos",i);
+ 				md->todo_attr&=~h;
+ 			}
+ 		}
diff --git a/aide.changes b/aide.changes
index 792090e..b7da28b 100644
--- a/aide.changes
+++ b/aide.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 11 13:03:25 UTC 2019 -  <abergmann@suse.com>
+
+- Remove not available gcrypt algorithm 7 DB_HAVAL (bsc#1098360).
+  Add aide-define_hash_use_gcrypt.patch
+
 -------------------------------------------------------------------
 Sun Mar 17 21:20:12 UTC 2019 - Matthias Eliasson <elimat@opensuse.org>
 
diff --git a/aide.spec b/aide.spec
index 3561cce..87ac54d 100644
--- a/aide.spec
+++ b/aide.spec
@@ -32,6 +32,7 @@ Source43:       aide.keyring
 Patch1:         aide-0.16.1-as-needed.patch
 Patch3:         aide-xattr-in-libc.patch
 Patch4:         aide-dynamic.patch
+Patch5:         aide-define_hash_use_gcrypt.patch
 BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  curl-devel
@@ -57,6 +58,7 @@ Simple AIDE test script for externalized testing.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 autoreconf -fiv