diff --git a/security/aide/patches/patch-config_h_in b/security/aide/patches/patch-config_h_in index a30630f2bb3..545b60d5da1 100644 --- a/security/aide/patches/patch-config_h_in +++ b/security/aide/patches/patch-config_h_in @@ -1,8 +1,9 @@ -$OpenBSD: patch-config_h_in,v 1.2 2009/05/21 21:53:27 benoit Exp $ ---- config.h.in.orig 2003-11-28 10:14:07.000000000 -0500 -+++ config.h.in 2003-12-04 10:18:39.000000000 -0500 -@@ -1,5 +1,13 @@ - /* config.h.in. Generated from configure.in by autoheader. */ +$OpenBSD: patch-config_h_in,v 1.3 2010/05/04 14:42:28 ajacoutot Exp $ +--- config.h.in.orig Tue Mar 16 19:47:49 2010 ++++ config.h.in Tue May 4 16:41:43 2010 +@@ -3,6 +3,14 @@ + /* Define if building universal (internal helper macro) */ + #undef AC_APPLE_UNIVERSAL_BUILD +#ifndef _OPENBSD_BLKCNT_ +#define _OPENBSD_BLKCNT_ diff --git a/security/aide/patches/patch-configure b/security/aide/patches/patch-configure index c5c34ad0a7b..eb9635cd5fa 100644 --- a/security/aide/patches/patch-configure +++ b/security/aide/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.4 2010/05/01 21:27:25 benoit Exp $ +$OpenBSD: patch-configure,v 1.5 2010/05/04 14:42:28 ajacoutot Exp $ --- configure.orig Tue Mar 16 19:47:47 2010 -+++ configure Sat Apr 10 07:21:44 2010 -@@ -790,7 +790,7 @@ ++++ configure Tue May 4 16:41:43 2010 +@@ -790,7 +790,7 @@ datarootdir='${prefix}/share' datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.4 2010/05/01 21:27:25 benoit Exp $ includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -6460,7 +6460,7 @@ +@@ -6460,7 +6460,7 @@ fi saved_CFLAGS="$CFLAGS" diff --git a/security/aide/patches/patch-doc_aide_1 b/security/aide/patches/patch-doc_aide_1 index b3d5daa8e53..67b254f3ce7 100644 --- a/security/aide/patches/patch-doc_aide_1 +++ b/security/aide/patches/patch-doc_aide_1 @@ -1,6 +1,6 @@ ---- doc/aide.1.orig Fri Dec 15 13:56:35 2006 -+++ doc/aide.1 Thu May 21 22:56:42 2009 -@@ -73,11 +73,11 @@ +--- doc/aide.1.orig Tue Mar 16 19:48:26 2010 ++++ doc/aide.1 Tue May 4 16:41:43 2010 +@@ -73,11 +73,11 @@ Please note that due to mmap issues, aide cannot be te SIGTERM. Use SIGKILL to terminate. .PP .SH FILES diff --git a/security/aide/patches/patch-doc_aide_conf_in b/security/aide/patches/patch-doc_aide_conf_in index 355a56db711..51551fcb3a3 100644 --- a/security/aide/patches/patch-doc_aide_conf_in +++ b/security/aide/patches/patch-doc_aide_conf_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_aide_conf_in,v 1.4 2010/05/01 21:27:25 benoit Exp $ +$OpenBSD: patch-doc_aide_conf_in,v 1.5 2010/05/04 14:42:28 ajacoutot Exp $ --- doc/aide.conf.in.orig Wed Feb 17 21:19:18 2010 -+++ doc/aide.conf.in Sat Apr 10 07:05:33 2010 ++++ doc/aide.conf.in Tue May 4 16:41:43 2010 @@ -19,7 +19,7 @@ # corresponding line. # @@ -25,7 +25,7 @@ $OpenBSD: patch-doc_aide_conf_in,v 1.4 2010/05/01 21:27:25 benoit Exp $ # Whether to gzip the output to database # gzip_dbout=no -@@ -115,22 +115,32 @@ +@@ -115,22 +115,32 @@ All=R+a+sha1+rmd160+sha256+sha512+tiger@aideextragroup # Attributes that can be used to verify that aide in intact # by people that have downloaded it from the web. # Let's be paranoid diff --git a/security/aide/patches/patch-src_util_c b/security/aide/patches/patch-src_util_c index 96d0d68350f..ccf58320063 100644 --- a/security/aide/patches/patch-src_util_c +++ b/security/aide/patches/patch-src_util_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_util_c,v 1.2 2009/05/21 21:53:27 benoit Exp $ ---- src/util.c.orig Thu Feb 9 11:45:43 2006 -+++ src/util.c Wed May 10 20:41:59 2006 -@@ -357,7 +357,6 @@ void sig_handler(int signal) +$OpenBSD: patch-src_util_c,v 1.3 2010/05/04 14:42:28 ajacoutot Exp $ +--- src/util.c.orig Wed Feb 17 21:06:57 2010 ++++ src/util.c Tue May 4 16:41:43 2010 +@@ -362,7 +362,6 @@ void sig_handler(int signum) return; } @@ -9,7 +9,7 @@ $OpenBSD: patch-src_util_c,v 1.2 2009/05/21 21:53:27 benoit Exp $ /* 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. -@@ -479,7 +478,7 @@ int syslog_facility_lookup(char *s) +@@ -497,7 +496,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 */ @@ -18,7 +18,7 @@ $OpenBSD: patch-src_util_c,v 1.2 2009/05/21 21:53:27 benoit Exp $ { return NULL; } -@@ -498,6 +497,7 @@ const char* dlerror(void) +@@ -516,6 +515,7 @@ const char* dlerror(void) { return NULL; }