Version bump; fixes bugs 23764, 37007, and 62194. Thanks to Joshua Schmidlkofer for the postgresql patch.

5 files changed, 249 insertions, 12 deletions

diff --git a/app-forensics/aide/ChangeLog b/app-forensics/aide/ChangeLog
index 3464db85b9c9..094253a1cd6a 100644
--- a/app-forensics/aide/ChangeLog
+++ b/app-forensics/aide/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/aide
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.3 2004/09/17 15:06:20 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.4 2004/09/18 14:22:11 ka0ttic Exp $
+
+*aide-0.10_p20040917 (18 Sep 2004)
+
+  18 Sep 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/aide-0.10_p20040917-fix-psql.diff, +aide-0.10_p20040917.ebuild:
+  Version bump; fixes bugs 23764, 37007, and 62194. Thanks to Joshua
+  Schmidlkofer for the postgresql patch.
 
   17 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> aide-0.10.ebuild,
   aide-0.9.ebuild:
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 2fadf3c1855a..b15ee6880686 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 33f605559714e18bbf4bda29181dc086 aide-0.9.ebuild 1387
 MD5 51d173803eb6b8bd83264277fbe570b7 aide-0.10.ebuild 1416
-MD5 1f7fdfbd076982507b36f60a5e1e6e88 ChangeLog 3445
+MD5 c9bc7606bdddf76c8170f20ac0a00ebb aide-0.10_p20040917.ebuild 2597
+MD5 c905b4f5d2f4e7771cabe6153d777706 ChangeLog 3714
 MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
 MD5 4f38a077259ca3be62ae6a55c82d5302 files/aide-0.10-gentoo.diff 2760
+MD5 ff4b62bd8854921c76dd8a59552f3382 files/digest-aide-0.10_p20040917 71
 MD5 b26d49d6bcafd39178a0da345cb2985d files/digest-aide-0.9 60
 MD5 f07734c5b540f7a251d3d8139ef0f75f files/aide-0.9-gentoo.diff 2319
 MD5 8c599ad3440b5d4a3244875ff0655225 files/digest-aide-0.10 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBSv18EZCkKN40op4RAk68AKC8iKjy/7BDO0jyBAyGZg79iGpiiwCeJyWn
-sE387UEeXXWdbu+5KtuTfOU=
-=aKFP
------END PGP SIGNATURE-----
+MD5 71915b04e537c8182a7cb3c7f560e04e files/aide-0.10_p20040917-fix-psql.diff 4726
diff --git a/app-forensics/aide/aide-0.10_p20040917.ebuild b/app-forensics/aide/aide-0.10_p20040917.ebuild
new file mode 100644
index 000000000000..1b86b8958e40
--- /dev/null
+++ b/app-forensics/aide/aide-0.10_p20040917.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.10_p20040917.ebuild,v 1.1 2004/09/18 14:22:11 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
+HOMEPAGE="http://aide.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="nls postgres zlib crypt"
+
+DEPEND="app-arch/gzip
+	sys-devel/bison
+	sys-devel/flex
+	app-crypt/mhash
+	crypt? ( dev-libs/libgcrypt )
+	postgres? ( dev-db/postgresql )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+MY_PF=${PF%%_*}
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use postgres && epatch ${FILESDIR}/${PF}-fix-psql.diff
+	epatch ${FILESDIR}/${MY_PF}-gentoo.diff
+
+	export WANT_AUTOCONF='2.5'
+	export WANT_AUTOMAKE='1.7'
+	sh autogen.sh || die "autogen.sh failed"
+}
+
+src_compile() {
+	# passing --without-psql or --with-psql causes postgres to be enabled ...
+	# it's a broken configure.in file ... so lets just work around it
+	local myconf=""
+	use postgres && myconf="$myconf --with-psql"
+	use crypt    && myconf="$myconf --with-gcrypt"
+
+	econf \
+		`use_with zlib` \
+		`use_with nls locale` \
+		--with-mhash \
+		--sysconfdir=/etc/aide \
+		--with-extra-lib=/usr/lib \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_test() {
+	# aide abort()'s inside the sandbox for some reason
+	if ! hasq sandbox ${FEATURES};
+	then
+		src/aide --init -c doc/aide.conf -V20 \
+			|| die "failed to initialise database"
+		mv aide.db.new doc/aide.db
+		make check || die "failed self test"
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	use nls || rm -rf ${D}/usr/lib/locale
+
+	insinto /etc/aide
+	doins doc/aide.conf
+
+	dodoc ChangeLog AUTHORS NEWS README
+	dohtml doc/manual.html
+}
+
+pkg_postinst() {
+	echo
+	einfo "A sample configuration file has been installed as"
+	einfo "/etc/aide/aide.conf.  Please edit to meet your needs."
+	einfo "Read the aide.conf(5) manual page for more information."
+	echo
+
+	if useq postgres; then
+		einfo "Due to a bad assumption by aide, you must issue the following"
+		einfo "command after the database initialization (aide --init ...):"
+		einfo
+		einfo 'psql -c "update pg_index set indisunique=false from pg_class \\ '
+		einfo "  where pg_class.relname='TABLE_pkey' and \ "
+		einfo '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
+		einfo
+		einfo "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
+		einfo "your aide.conf."
+		echo
+	fi
+}
diff --git a/app-forensics/aide/files/aide-0.10_p20040917-fix-psql.diff b/app-forensics/aide/files/aide-0.10_p20040917-fix-psql.diff
new file mode 100644
index 000000000000..fe6ac712115f
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.10_p20040917-fix-psql.diff
@@ -0,0 +1,137 @@
+diff -urN aide.orig/src/db.c aide/src/db.c
+--- aide.orig/src/db.c	2004-09-17 22:37:09.110596472 -0400
++++ aide/src/db.c	2004-09-18 01:03:54.923909368 -0400
+@@ -175,7 +175,7 @@
+ #ifdef WITH_PSQL
+   case url_sql: {
+     error(255,"db_sql readline...");
+-    s=db_readline_sql(db);
++    s=db_readline_sql(db, conf);
+     
+     break;
+   }
+diff -urN aide.orig/src/db_sql.c aide/src/db_sql.c
+--- aide.orig/src/db_sql.c	2004-09-17 22:37:09.085600272 -0400
++++ aide/src/db_sql.c	2004-09-18 01:14:05.191134648 -0400
+@@ -156,7 +156,7 @@
+   return ret;
+ }
+ 
+-void db_readline_sql_int(int* d,int db,int i) 
++void db_readline_sql_int(int* d,int db,int i,db_config* conf) 
+ {
+   FILE** db_filep=NULL;
+ 
+@@ -182,7 +182,7 @@
+ 
+ }
+ 
+-void db_readline_sql_char(char** d,int db,const int i) 
++void db_readline_sql_char(char** d,int db,const int i,db_config* conf) 
+ {
+   
+   volatile int cr,des;
+@@ -221,27 +221,27 @@
+   
+ }
+ 
+-void db_readline_sql_byte(void** d,int db,int i) {
++void db_readline_sql_byte(void** d,int db,int i,db_config* conf) {
+   
+-  db_readline_sql_char(d,db,i);
++  db_readline_sql_char((char **)d,db,i,conf);
+   
+   if (*d!=NULL) {
+-    *d=base64tobyte(*d,strlen(*d));
++    *d=(void *)base64tobyte(*d,strlen(*d));
+   }
+   
+ }
+ 
+-void db_readline_sql_time(void** d,int db,int i) {
++void db_readline_sql_time(void** d,int db,int i,db_config* conf) {
+   
+-  db_readline_sql_char(d,db,i);
++  db_readline_sql_char((char **)d,db,i,conf);
+   
+   if (*d!=NULL) {
+-    *d=base64totime_t(*d);
++    *d=(void *)base64totime_t(*d);
+   }
+   
+ }
+ 
+-db_line* db_readline_sql(int db) {
++db_line* db_readline_sql(int db,db_config* conf) {
+   
+   volatile db_line* rline;
+   int i;
+@@ -275,33 +275,35 @@
+   }
+   rline=(db_line*)malloc(1*sizeof(db_line));
+   
+-  db_readline_sql_byte(&(rline->md5),db,(int)db_md5);
+-  db_readline_sql_byte(&(rline->sha1),db,db_sha1);
+-  db_readline_sql_byte(&(rline->rmd160),db,db_rmd160);
+-  db_readline_sql_byte(&(rline->tiger),db,db_tiger);
++  db_readline_sql_byte((void *)&(rline->md5),   db,(int)db_md5, conf);
++  db_readline_sql_byte((void *)&(rline->sha1),  db, db_sha1,    conf);
++  db_readline_sql_byte((void *)&(rline->rmd160),db, db_rmd160,  conf);
++  db_readline_sql_byte((void *)&(rline->tiger), db, db_tiger,   conf);
+ #ifdef WITH_MHASH
+-  db_readline_sql_byte(&(rline->crc32),db,db_crc32);
+-  db_readline_sql_byte(&(rline->haval),db,db_haval);
+-  db_readline_sql_byte(&(rline->gost),db,db_gost);
++  db_readline_sql_byte((void *)&(rline->crc32), db, db_crc32,   conf);
++  db_readline_sql_byte((void *)&(rline->haval), db, db_haval,   conf);
++  db_readline_sql_byte((void *)&(rline->gost),  db, db_gost,    conf);
+ #endif
+-  db_readline_sql_char(&(rline->filename),db,db_filename);
+-  db_readline_sql_char(&(rline->linkname),db,db_linkname);
++  db_readline_sql_char((char **)&(rline->filename),db,db_filename, conf);
++  db_readline_sql_char((char **)&(rline->linkname),db,db_linkname, conf);
+   
+-  db_readline_sql_int(&(rline->perm),db,db_perm);
+-  db_readline_sql_int(&(rline->uid),db,db_uid);
+-  db_readline_sql_int(&(rline->gid),db,db_gid);
+-  db_readline_sql_int(&(rline->inode),db,db_inode);
+-  db_readline_sql_int(&(rline->nlink),db,db_lnkcount);
+-  
+-  db_readline_sql_int(&(rline->size),db,db_osize);
+-  db_readline_sql_int(&(rline->bcount),db,db_bcount);
+-  db_readline_sql_int(&(rline->attr),db,db_attr);
+-  
+-  db_readline_sql_time(&(rline->atime),db,db_atime);
+-  db_readline_sql_time(&(rline->ctime),db,db_ctime);
+-  db_readline_sql_time(&(rline->mtime),db,db_mtime);
++  db_readline_sql_int((int *)&(rline->perm),  db,   db_perm,  conf);
++  db_readline_sql_int((int *)&(rline->uid),   db,   db_uid,   conf);
++  db_readline_sql_int((int *)&(rline->gid),   db,   db_gid,   conf);
++  db_readline_sql_int((int *)&(rline->inode), db,   db_inode, conf);
++  db_readline_sql_int((int *)&(rline->nlink), db,   db_lnkcount, conf);
++  
++  db_readline_sql_int((int *)&(rline->size),  db, (int)db_osize,  conf);
++  db_readline_sql_int((int *)&(rline->bcount),db, db_bcount, conf);
++  db_readline_sql_int((int *)&(rline->attr),  db, db_attr,   conf);
++  
++  db_readline_sql_time((void *)&(rline->atime),db, db_atime,  conf);
++  db_readline_sql_time((void *)&(rline->ctime),db, db_ctime,  conf);
++  db_readline_sql_time((void *)&(rline->mtime),db, db_mtime,  conf);
+ 
++#ifdef WITH_ACL
+   rline->acl=NULL;
++#endif
+   
+   ((psql_data*)(*db_filep))->curread++;
+   
+diff -urN aide.orig/include/db_sql.h aide/include/db_sql.h
+--- aide.orig/include/db_sql.h	2004-09-17 22:37:09.296568200 -0400
++++ aide/include/db_sql.h	2004-09-18 01:02:26.605335832 -0400
+@@ -50,6 +50,6 @@
+ };
+ 
+ int db_close_sql(void*);
+-db_line* db_readline_sql(int db);
++db_line* db_readline_sql(int db, db_config* conf);
+ 
+ #endif
diff --git a/app-forensics/aide/files/digest-aide-0.10_p20040917 b/app-forensics/aide/files/digest-aide-0.10_p20040917
new file mode 100644
index 000000000000..51418f8e2afb
--- /dev/null
+++ b/app-forensics/aide/files/digest-aide-0.10_p20040917
@@ -0,0 +1 @@
+MD5 bfea36bd2a4254e212dcc19df54667fb aide-0.10_p20040917.tar.gz 201023