diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-02 22:40:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-02 22:40:19 +0000 |
| commit | d60fb3ae7a81204e6179d90c113f2b6ac995d78c (patch) | |
| tree | c9131c43bd90f23d9dccaea890e2621203fc0f21 | |
| parent | 15f733d9cd8b1ac53f08154d54aac12bb29d9632 (diff) | |
| download | pkgsrc-d60fb3ae7a81204e6179d90c113f2b6ac995d78c.tar.gz | |
strnstr exists on DragonFly, use the system version instead of the
conflicting local version.
| -rw-r--r-- | security/aide/distinfo | 4 | ||||
| -rw-r--r-- | security/aide/patches/patch-ac | 13 | ||||
| -rw-r--r-- | security/aide/patches/patch-ad | 20 |
3 files changed, 36 insertions, 1 deletions
diff --git a/security/aide/distinfo b/security/aide/distinfo index b28d99a5f23..bd1e860352d 100644 --- a/security/aide/distinfo +++ b/security/aide/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.6 2005/05/23 21:24:17 jlam Exp $ +$NetBSD: distinfo,v 1.7 2006/01/02 22:40:19 joerg Exp $ SHA1 (aide-0.10.tar.gz) = e1a65a96ea66742290b3e445d98c543008057938 RMD160 (aide-0.10.tar.gz) = b3b63b018f3358f1d03cbc76270e5ea6ff9df943 Size (aide-0.10.tar.gz) = 234184 bytes SHA1 (patch-aa) = 22f4be852c82a9252b29150cf73ce3b938d2f982 SHA1 (patch-ab) = 67ae8c17e8ca99ddade99dc6099499f0b15bcc36 +SHA1 (patch-ac) = 092baef366a51f99dba4ef241077b381e7b33a3d +SHA1 (patch-ad) = 54e5e12dcb63cd58b90f0a496a704c8a7de5819c 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 */ |