strnstr exists on DragonFly, use the system version instead of the

conflicting local version.

2 files changed, 33 insertions, 0 deletions

diff --git a/security/aide/patches/patch-ac b/security/aide/patches/patch-ac
new file mode 100644
index 00000000000..a58955b9244
--- /dev/null
+++ b/security/aide/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/01/02 22:40:19 joerg Exp $
+
+--- include/util.h.orig	2006-01-02 22:36:41.000000000 +0000
++++ include/util.h
+@@ -57,6 +57,8 @@ void sig_handler(int signal);
+ 
+ void init_sighandler(void);
+ 
++#if !defined(__DragonFly__)
+ char* strnstr(char* haystack,char* needle,int n);
++#endif
+ 
+ #endif
diff --git a/security/aide/patches/patch-ad b/security/aide/patches/patch-ad
new file mode 100644
index 00000000000..d0fb56e6e94
--- /dev/null
+++ b/security/aide/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2006/01/02 22:40:19 joerg Exp $
+
+--- src/util.c.orig	2006-01-02 22:37:37.000000000 +0000
++++ src/util.c
+@@ -357,6 +357,7 @@ void sig_handler(int signal)
+ }
+ 
+ 
++#if !defined(__DragonFly__)
+ /* Like strstr but only do search for maximum of n chars.
+    haystack does not have to be NULL terminated
+    needle has to be NULL terminated. NULL in needle is not used in compare.
+@@ -392,6 +393,7 @@ char* strnstr(char* haystack,char* needl
+   /* If we get this far no match was found so we return NULL */
+   return NULL;
+ }
++#endif
+ 
+ /* We need these dummy stubs to fool the linker into believing that
+    we do not need them at link time */