- update to aide 0.13.1

- regen PLIST and patches

ok ajacoutot@
This commit is contained in:
benoit 2009-05-21 21:53:24 +00:00
parent 570f6d1704
commit 7f64dcd160
9 changed files with 86 additions and 115 deletions

View File

@ -1,20 +1,15 @@
# $OpenBSD: Makefile,v 1.12 2007/09/15 23:29:57 merdely Exp $
# $OpenBSD: Makefile,v 1.13 2009/05/21 21:53:24 benoit Exp $
COMMENT= Advanced Intrusion Detection Environment
V= 0.10
DISTNAME= aide-${V}
PKGNAME= ${DISTNAME}p0
DISTNAME= aide-0.13.1
CATEGORIES= security
BUILD_DEPENDS= ::devel/bison \
::security/mhash
HOMEPAGE= http://sourceforge.net/projects/aide
HOMEPAGE= http://www.cs.tut.fi/~rammer/aide.html
MAINTAINER= Benoit Lecocq <benoit@openbsd.org>
MAINTAINER= Benoit LECOCQ <blq@arcane-labs.net>
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -22,13 +17,19 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aide/}
BUILD_DEPENDS= ::devel/bison \
::security/mhash
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-mhash
CONFIGURE_ENV+= YACC="bison -y" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
NO_REGRESS= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/aide
${INSTALL_DATA} ${WRKSRC}/doc/aide.conf ${PREFIX}/share/examples/aide

View File

@ -1,5 +1,5 @@
MD5 (aide-0.10.tar.gz) = Oet9IQZMrHtAnEXQOLhs2A==
RMD160 (aide-0.10.tar.gz) = s7Y7AY8zWPHQPLx2Jw5epv+d+UM=
SHA1 (aide-0.10.tar.gz) = 4aZalupmdCKQs+RF2YxUMAgFeTg=
SHA256 (aide-0.10.tar.gz) = SBm5tGrK7bUpPIf8fHQqidy29jtxsfzeuBNJ+0Hyk1w=
SIZE (aide-0.10.tar.gz) = 234184
MD5 (aide-0.13.1.tar.gz) = J5eMxryk8Pvz9vWhszBmHA==
RMD160 (aide-0.13.1.tar.gz) = gCrFvYFwMr86aW239Ue+8yKySHo=
SHA1 (aide-0.13.1.tar.gz) = ARLuCpdAILmfCdHyqfsFQzp7loE=
SHA256 (aide-0.13.1.tar.gz) = tVBlQTutPCSvUaVR5qt81Kns2fRJkpJhpF/C9T4EACE=
SIZE (aide-0.13.1.tar.gz) = 285400

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-config_h_in,v 1.1 2003/12/04 15:29:31 lebel Exp $
$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 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 @@ $OpenBSD: patch-config_h_in,v 1.1 2003/12/04 15:29:31 lebel Exp $
+#endif
+#endif
+
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Compile-time options displayed in -v output */
#undef AIDECOMPILEOPTIONS

View File

@ -1,12 +1,11 @@
$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'
datadir='${prefix}/share'
--- configure.ori Tue Feb 13 23:15:36 2007
+++ configure Tue Feb 13 23:17:02 2007
@@ -755,7 +755,7 @@
datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
+localstatedir='/var'
libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'

View File

@ -1,17 +1,16 @@
$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.
--- 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 @@
SIGTERM. Use SIGKILL to terminate.
.PP
.SH FILES
-.B <prefix>/etc/aide.conf
-.B ${prefix}/etc/aide.conf
+.B /etc/aide.conf
Default aide configuration file.
-.B <prefix>/etc/aide.db
-.B ${prefix}/etc/aide.db
+.B /var/db/aide.db
Default aide database.
-.B <prefix>/etc/aide.db.new
-.B ${prefix}/etc/aide.db.new
+.B /var/db/aide.db.new
Default aide output database.
.SH SEE ALSO

View File

@ -1,16 +1,14 @@
$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
@@ -19,8 +19,6 @@
--- doc/aide.conf.in.ori Tue Feb 13 23:20:16 2007
+++ doc/aide.conf.in Tue Feb 13 23:50:41 2007
@@ -19,7 +19,6 @@
# corresponding line.
#
-@@define TOPDIR @top_srcdir@
-
@@ifndef TOPDIR
@@define TOPDIR /
@@endif
@@ -43,12 +41,11 @@
@@ -43,12 +42,12 @@
# The location of the database to be read.
#database=file:aide.db
@ -19,35 +17,47 @@ $OpenBSD: patch-doc_aide_conf_in,v 1.2 2003/12/04 15:29:31 lebel Exp $
# The location of the database to be written.
#database_out=sql:host:port:database:login_name:passwd:table
-#database_out=file:aide.db.new
#database_out=file:aide.db.new
-database_out=file:aide.db.new
+database_out=file:/var/db/aide.db.new
# 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=stdout
@@ -100,7 +99,7 @@
#xattr: extended file attributes
-# @@{TOPDIR} is replaced with @top_srcdir@ when
-# read by aide.
#p: permissions
#i: inode
#n: number of links
@@ -100,22 +95,37 @@ All=R+a+sha1+rmd160
# Rule definition
-All=R+a+sha1+rmd160+sha256+sha512+whirlpool
+All=R+a+sha1+rmd160+sha256+sha512
# report_attributes is a special rule definition
# the attributes listed in it are alway displayed for changed files
@@ -115,22 +114,34 @@
# 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
-
-# The commented rules are just examples the rest are used by
-# make check
-
-#Selection regexp rule
-Norm=l+s+n+b+selinux+xattrs+md5+sha1+rmd160+sha256+sha512+whirlpool
+#Norm=l+s+n+b+selinux+xattrs+md5+sha1+rmd160+sha256+sha512+whirlpool
+=/$ R
+/bsd$ L+s+sha256
+/etc$ L+s+sha256
# The commented rules are just examples the rest are used by
# make check
+# my password 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
-#=@@{TOPDIR}/doc L
-#Negative selection no rule is necessary but ignored if there
+#@@{TOPDIR}/.* Norm
#Equals selection only the directory doc is checked and not it's children
#=@@{TOPDIR}/doc L
#Negative selection no rule is necessary but ignored if there
-!@@{TOPDIR}/.*~
-!@@{TOPDIR}/src/.*\.o
-!@@{TOPDIR}/src/(aide|core)$ L
@ -55,39 +65,14 @@ $OpenBSD: patch-doc_aide_conf_in,v 1.2 2003/12/04 15:29:31 lebel Exp $
-!@@{TOPDIR}/.*CVS
-!@@{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
+
+#!@@{TOPDIR}/.*~
+#!@@{TOPDIR}/src/.*\.o
+#!@@{TOPDIR}/src/(aide|core)$ L
+#!@@{TOPDIR}/.*RCS
+#!@@{TOPDIR}/.*CVS
+#!@@{TOPDIR}/.*aide\.db.*
+#!@@{TOPDIR}/.*\.cvsignore.*
# @@{TOPDIR}/doc/.* All
+# /home
+=/home$ R
+
+# /usr
+# /usr/bin
+/usr/bin R
+/usr/include R
+/usr/lib R
+/usr/libdata R
+/usr/libexec R
+/usr/local/bin R
+/usr/local/etc L+s+sha1
+/usr/local/lib R
+/usr/local/libexec R
+/usr/local/sbin R
+/usr/local/share R
+/usr/sbin R
+/usr/share R
+
+=/tmp$ L

View File

@ -1,11 +0,0 @@
$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()
error_init(u,1);
conf->config_file=CONFIG_FILE;
+ conf->config_version=NULL;
#ifdef WITH_MHASH
conf->do_configmd=0;
conf->confmd=NULL;

View File

@ -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)
$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)
return;
}
@ -9,7 +9,7 @@ $OpenBSD: patch-src_util_c,v 1.1 2003/12/04 15:29:31 lebel 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.
@@ -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 @@ $OpenBSD: patch-src_util_c,v 1.1 2003/12/04 15:29:31 lebel Exp $
{
return NULL;
}
@@ -415,6 +414,7 @@ const char* dlerror(void)
@@ -498,6 +497,7 @@ const char* dlerror(void)
{
return NULL;
}

View File

@ -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/
@comment $OpenBSD: PLIST,v 1.5 2009/05/21 21:53:29 benoit Exp $
@bin bin/aide
@man man/man1/aide.1
@man man/man5/aide.conf.5
share/examples/aide/