Accepting request 319601 from home:msmeissn:branches:security

- aide-dynamic.patch: avoid overwriting dl* functions, as we might
  load libcrypto.so dynamically in FIPS mode.

OBS-URL: https://build.opensuse.org/request/show/319601
OBS-URL: https://build.opensuse.org/package/show/security/aide?expand=0&rev=28

aide-dynamic.patch

@@ -0,0 +1,20 @@
+Index: aide-0.15.1/src/util.c
+===================================================================
+--- aide-0.15.1.orig/src/util.c
++++ aide-0.15.1/src/util.c
+@@ -497,6 +497,7 @@ int syslog_facility_lookup(char *s)
+ /* We need these dummy stubs to fool the linker into believing that
+    we do not need them at link time */
+ 
++#if 0
+ void* dlopen(char*filename,int flag)
+ {
+   return NULL;
+@@ -516,6 +517,7 @@ const char* dlerror(void)
+ {
+   return NULL;
+ }
++#endif
+ 
+ const char* aide_key_2=CONFHMACKEY_02;
+ const char* db_key_2=DBHMACKEY_02;

aide.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul  2 08:07:07 UTC 2015 - meissner@suse.com
+
+- aide-dynamic.patch: avoid overwriting dl* functions, as we might
+  load libcrypto.so dynamically in FIPS mode.
+
 -------------------------------------------------------------------
 Wed May 28 21:51:58 UTC 2014 - crrodriguez@opensuse.org
 

aide.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package aide
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,6 +38,7 @@ Source3:        aide-test.sh
 Patch1:         aide-%{version}-as-needed.patch
 Patch2:         aide-no_m4_dir.patch
 Patch3:         aide-xattr-in-libc.patch
+Patch4:         aide-dynamic.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://sourceforge.net/projects/aide/
 
@@ -56,6 +57,8 @@ Simple AIDE test script for externalized testing.
 %patch1 -p1
 %patch2
 %patch3 -p1
+%patch4 -p1
+
 %build
 autoreconf -fiv
 %configure 					\