Index: Makefile =================================================================== RCS file: /cvs/ports/security/aide/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 2005/08/17 16:10:04 1.11 +++ Makefile 2006/05/17 15:27:31 @@ -2,7 +2,7 @@ COMMENT= "Advanced Intrusion Detection Environment" -V= 0.10 +V= 0.11 DISTNAME= aide-${V} PKGNAME= ${DISTNAME}p0 CATEGORIES= security Index: distinfo =================================================================== RCS file: /cvs/ports/security/aide/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 2005/01/05 17:26:34 1.3 +++ distinfo 2006/05/17 15:27:31 @@ -1,4 +1,4 @@ -MD5 (aide-0.10.tar.gz) = 39eb7d21064cac7b409c45d038b86cd8 -RMD160 (aide-0.10.tar.gz) = b3b63b018f3358f1d03cbc76270e5ea6ff9df943 -SHA1 (aide-0.10.tar.gz) = e1a65a96ea66742290b3e445d98c543008057938 -SIZE (aide-0.10.tar.gz) = 234184 +MD5 (aide-0.11.tar.gz) = 9a44e5386b0355ef57c60f627ff4d085 +RMD160 (aide-0.11.tar.gz) = 0e68f5eba65547dbf6d59995364939473fa49a08 +SHA1 (aide-0.11.tar.gz) = b66f0eff5126745547a2b28cc0142d41e8c2db87 +SIZE (aide-0.11.tar.gz) = 266978 Index: patches/patch-config_h_in =================================================================== RCS file: /cvs/ports/security/aide/patches/patch-config_h_in,v retrieving revision 1.1 diff -u -r1.1 patch-config_h_in --- patches/patch-config_h_in 2003/12/04 15:29:31 1.1 +++ patches/patch-config_h_in 2006/05/17 15:27:31 @@ -2,7 +2,7 @@ --- 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 automatically from configure.in by autoheader 2.13. */ + /* config.h.in. Generated from configure.in by autoheader. */ +#ifndef _OPENBSD_BLKCNT_ +#define _OPENBSD_BLKCNT_ @@ -12,6 +12,6 @@ +#endif +#endif + - /* Define if you have the ANSI C header files. */ - #undef STDC_HEADERS + /* Compile-time options displayed in -v output */ + #undef AIDECOMPILEOPTIONS Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/security/aide/patches/patch-configure,v retrieving revision 1.2 diff -u -r1.2 patch-configure --- patches/patch-configure 2003/12/04 15:29:31 1.2 +++ patches/patch-configure 2006/05/17 15:27:31 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.2 2003/12/04 15:29:31 lebel Exp $ ---- configure.orig Tue Jun 4 04:31:27 2002 -+++ configure Mon Aug 5 08:56:10 2002 -@@ -96,7 +96,7 @@ libexecdir='${exec_prefix}/libexec' +--- configure.orig Sat Feb 18 12:49:06 2006 ++++ configure Wed May 10 20:41:59 2006 +@@ -343,7 +343,7 @@ libexecdir='${exec_prefix}/libexec' datadir='${prefix}/share' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' Index: patches/patch-doc_aide_1 =================================================================== RCS file: patch-doc_aide_1 diff -N patch-doc_aide_1 --- /tmp/cvsEAAa002FQ Wed May 17 15:27:31 2006 +++ /dev/null Sat Aug 30 18:16:59 1997 @@ -1,18 +0,0 @@ -$OpenBSD: patch-doc_aide_1,v 1.2 2003/12/04 15:29:31 lebel Exp $ ---- doc/aide.1.orig Sun Mar 17 15:06:07 2002 -+++ doc/aide.1 Mon Aug 5 08:56:10 2002 -@@ -48,11 +48,11 @@ output. See aide.conf (5) section URLS f - Prints out the standard help message. - .PP - .SH FILES --.B /etc/aide.conf -+.B /etc/aide.conf - Default aide configuration file. --.B /etc/aide.db -+.B /var/db/aide.db - Default aide database. --.B /etc/aide.db.new -+.B /var/db/aide.db.new - Default aide output database. - .SH SEE ALSO - .BR aide.conf (5) Index: patches/patch-doc_aide_1_in =================================================================== RCS file: patch-doc_aide_1_in diff -N patch-doc_aide_1_in --- /dev/null Sat Aug 30 18:16:59 1997 +++ patch-doc_aide_1_in Wed May 17 15:27:31 2006 @@ -0,0 +1,17 @@ +--- doc/aide.1.in.orig Fri Jul 1 23:10:41 2005 ++++ doc/aide.1.in Wed May 10 20:41:59 2006 +@@ -48,11 +48,11 @@ output. See aide.conf (5) section URLS f + Prints out the standard help message. + .PP + .SH FILES +-.B @prefix@/etc/aide.conf ++.B /etc/aide.conf + Default aide configuration file. +-.B @prefix@/etc/aide.db ++.B /var/db/aide.db + Default aide database. +-.B @prefix@/etc/aide.db.new ++.B /var/db/aide.db.new + Default aide output database. + .SH SEE ALSO + .BR aide.conf (5) Index: patches/patch-doc_aide_conf_in =================================================================== RCS file: /cvs/ports/security/aide/patches/patch-doc_aide_conf_in,v retrieving revision 1.2 diff -u -r1.2 patch-doc_aide_conf_in --- patches/patch-doc_aide_conf_in 2003/12/04 15:29:31 1.2 +++ patches/patch-doc_aide_conf_in 2006/05/17 15:27:31 @@ -1,6 +1,6 @@ $OpenBSD: patch-doc_aide_conf_in,v 1.2 2003/12/04 15:29:31 lebel Exp $ ---- doc/aide.conf.in.orig Sun Feb 24 08:42:43 2002 -+++ doc/aide.conf.in Mon Aug 5 09:01:09 2002 +--- doc/aide.conf.in.orig Sun Jan 22 12:05:56 2006 ++++ doc/aide.conf.in Wed May 10 20:41:59 2006 @@ -19,8 +19,6 @@ # corresponding line. # @@ -26,7 +26,7 @@ # Whether to gzip the output to database # gzip_dbout=no @@ -64,8 +61,6 @@ verbose=20 - #NOT IMPLEMENTED report_url=syslog:LOG_AUTH + #report_url=syslog:LOG_AUTH report_url=stdout -# @@{TOPDIR} is replaced with @top_srcdir@ when @@ -34,15 +34,27 @@ #p: permissions #i: inode #n: number of links -@@ -100,22 +95,37 @@ All=R+a+sha1+rmd160 +@@ -101,22 +96,37 @@ All=R+a+sha1+rmd160 # Attributes that can be used to verify that aide in intact # by people that have downloaded it from the web. # Let's be paranoid -Norm=s+n+b+md5+sha1+rmd160 -- ++#Norm=s+n+b+md5+sha1+rmd160+tiger ++ ++=/$ R ++/bsd$ L+s+sha1 ++/etc$ L+s+sha1 + -# The commented rules are just examples the rest are used by -# make check -- ++# my passwd database should be static at time of system build. yours may ++# not be, if not, uncomment the lines below. ++ ++#/etc/passwd L ++#/etc/master.passwd L ++#/etc/pwd.db L ++#/etc/spwd.db L + -#Selection regexp rule -@@{TOPDIR}/.* Norm -#Equals selection only the directory doc is checked and not it's children @@ -56,24 +68,9 @@ -!@@{TOPDIR}/.*aide\.db.* -!@@{TOPDIR}/.*\.cvsignore.* -# @@{TOPDIR}/doc/.* All -- -+#Norm=s+n+b+md5+sha1+rmd160+tiger -+ -+=/$ R -+/bsd$ L+s+sha1 -+/etc$ L+s+sha1 -+ -+# my passwd database should be static at time of system build. yours may -+# not be, if not, uncomment the lines below. -+ -+#/etc/passwd L -+#/etc/master.passwd L -+#/etc/pwd.db L -+#/etc/spwd.db L -+ +# /home +=/home$ R -+ + +# /usr +# /usr/bin +/usr/bin R Index: patches/patch-include_util.h =================================================================== RCS file: patch-include_util.h diff -N patch-include_util.h --- /dev/null Sat Aug 30 18:16:59 1997 +++ patch-include_util.h Wed May 17 15:27:31 2006 @@ -0,0 +1,11 @@ +--- include/util.h.orig Sun Jan 22 12:00:55 2006 ++++ include/util.h Wed May 10 20:41:59 2006 +@@ -57,8 +57,6 @@ void sig_handler(int signal); + + void init_sighandler(void); + +-char* strnstr(char* haystack,char* needle,int n); +- + int syslog_facility_lookup(char *); + + #endif Index: patches/patch-src_aide_c =================================================================== RCS file: /cvs/ports/security/aide/patches/patch-src_aide_c,v retrieving revision 1.1 diff -u -r1.1 patch-src_aide_c --- patches/patch-src_aide_c 2004/06/07 04:13:36 1.1 +++ patches/patch-src_aide_c 2006/05/17 15:27:31 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_aide_c,v 1.1 2004/06/07 04:13:36 david Exp $ ---- src/aide.c.orig 2003-11-28 09:03:58.000000000 -0600 -+++ src/aide.c 2004-06-06 20:02:46.000000000 -0500 -@@ -266,6 +266,7 @@ void setdefaults_before_config() +--- src/aide.c.orig Sun Jan 29 20:31:08 2006 ++++ src/aide.c Wed May 10 20:41:59 2006 +@@ -276,6 +276,7 @@ void setdefaults_before_config() error_init(u,1); conf->config_file=CONFIG_FILE; Index: patches/patch-src_gen_list_c =================================================================== RCS file: patch-src_gen_list_c diff -N patch-src_gen_list_c --- /dev/null Sat Aug 30 18:16:59 1997 +++ patch-src_gen_list_c Wed May 17 15:27:31 2006 @@ -0,0 +1,31 @@ +--- src/gen_list.c.orig Mon Dec 19 10:54:59 2005 ++++ src/gen_list.c Wed May 17 08:40:31 2006 +@@ -1118,8 +1118,8 @@ + * old and new data are NULL only if file present in both DBs + * and has not been changed. + */ +- if((file->attr & DB_CHECKINODE) && +- (node->old_data!=NULL || node->new_data!=NULL)) { ++ if( (node->old_data!=NULL || node->new_data!=NULL) && ++ (file->attr & DB_CHECKINODE)) { + /* Check if file was moved (same inode, different name in the other DB)*/ + db_line *oldData; + db_line *newData; +@@ -1155,13 +1155,13 @@ + } + } + if( (db == DB_NEW) && +- (file->attr & DB_NEWFILE) && +- (node->new_data!=NULL) ){ ++ (node->new_data!=NULL) && ++ (file->attr & DB_NEWFILE) ){ + node->checked|=NODE_ALLOW_NEW; + } + if( (db == DB_OLD) && +- (file->attr & DB_RMFILE) && +- (node->old_data!=NULL) ){ ++ (node->old_data!=NULL) && ++ (file->attr & DB_RMFILE) ){ + node->checked|=NODE_ALLOW_RM; + } + } Index: patches/patch-src_util_c =================================================================== RCS file: /cvs/ports/security/aide/patches/patch-src_util_c,v retrieving revision 1.1 diff -u -r1.1 patch-src_util_c --- patches/patch-src_util_c 2003/12/04 15:29:31 1.1 +++ patches/patch-src_util_c 2006/05/17 15:27:31 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_util_c,v 1.1 2003/12/04 15:29:31 lebel Exp $ ---- src/util.c.orig Wed May 29 04:04:27 2002 -+++ src/util.c Mon Apr 14 10:30:09 2003 -@@ -356,7 +356,6 @@ void sig_handler(int signal) +--- 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) return; } @@ -9,7 +9,7 @@ /* 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. -@@ -396,7 +395,7 @@ char* strnstr(char* haystack,char* needl +@@ -479,7 +478,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 @@ { return NULL; } -@@ -415,6 +414,7 @@ const char* dlerror(void) +@@ -498,6 +497,7 @@ const char* dlerror(void) { return NULL; } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/security/aide/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- pkg/PLIST 2004/09/23 06:58:55 1.4 +++ pkg/PLIST 2006/05/17 15:27:31 @@ -1,7 +1,5 @@ @comment $OpenBSD: PLIST,v 1.4 2004/09/23 06:58:55 espie Exp $ bin/aide -lib/locale/ -lib/locale/LC_MESSAGES/ @man man/man1/aide.1 @man man/man5/aide.conf.5 share/examples/aide/