Removed audit USE flag, bug #191597.

Added -j1.
Removed old versions.
(Portage version: 2.1.3.9)

10 files changed, 15 insertions, 623 deletions

diff --git a/app-forensics/aide/ChangeLog b/app-forensics/aide/ChangeLog
index d2716b51a2f4..35c36d3ae930 100644
--- a/app-forensics/aide/ChangeLog
+++ b/app-forensics/aide/ChangeLog
@@ -1,187 +1,12 @@
 # ChangeLog for app-forensics/aide
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.26 2007/09/26 19:25:05 armin76 Exp $
-
-  26 Sep 2007; Raúl Porcel <armin76@gentoo.org> aide-0.13.1.ebuild:
-  alpha stable wrt security #191597
-
-  26 Sep 2007; Raúl Porcel <armin76@gentoo.org>
-  aide-0.10_p20040917-r1.ebuild:
-  sparc stable wrt #151271
-
-*aide-0.13.1 (26 Sep 2007)
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.27 2007/09/26 23:51:05 matsuu Exp $
 
   26 Sep 2007; MATSUU Takuto <matsuu@gentoo.org>
-  +files/aide-0.13.1-gentoo.patch, metadata.xml, +aide-0.13.1.ebuild:
-  Version bumped, bug #126694, #191597.
-  Added static USE flag, bug #92250.
-  Added mail-client/mailx to DEPEND, bug #153952.
-  Fixed dependency, bug #163687.
-  Clean up ebuild.
-  Added myself to metadata.xml as maintainer.
-
-  04 Sep 2007; Raúl Porcel <armin76@gentoo.org>
-  aide-0.10_p20040917-r1.ebuild:
-  alpha/x86 stable wrt #151271
-
-  04 Sep 2007; Christoph Mende <angelos@gentoo.org>
-  aide-0.10_p20040917-r1.ebuild:
-  Stable on amd64 wrt bug #151271
-
-  31 Aug 2007; Matti Bickel <mabi@gentoo.org> aide-0.10_p20040917-r1.ebuild:
-  ppc stable (bug #151271)
-
-  24 Jan 2007; Marius Mauch <genone@gentoo.org> aide-0.10_p20040917.ebuild,
-  aide-0.10_p20040917-r1.ebuild:
-  Replacing einfo with elog
-
-  16 Nov 2006; Markus Ullmann <jokey@gentoo.org>
-  aide-0.10_p20040917-r1.ebuild:
-  Fix autotools, bug #151271
-
-  16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
-  aide-0.10_p20040917-r1.ebuild:
-  Replace root:root in root:0. Bug #103563.
-
-  02 Oct 2005; Benjamin Smee <strerror@gentoo.org>
-  +files/aide-0.10_p20040917-r1-fix-psql.diff:
-  Added file for postgres fix re BUG 107927
-
-*aide-0.10_p20040917-r1 (30 Sep 2005)
-
-  30 Sep 2005; Benjamin Smee <strerror@gentoo.org> +files/aide.conf,
-  +files/aide.cron, +files/aideinit, +aide-0.10_p20040917-r1.ebuild:
-  Added helper script and changed default config
-
-  21 Apr 2005; Simon Stelling <blubb@gentoo.org> aide-0.10_p20040917.ebuild:
-  stable on amd64
-
-  27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
-  aide-0.10_p20040917.ebuild:
-  Stable on ppc.
-
-  06 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
-  aide-0.10_p20040917.ebuild:
-  Stable on alpha.
-
-  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  aide-0.10_p20040917.ebuild:
-  Stable on sparc
-
-  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> aide-0.10_p20040917.ebuild:
-  Marked stable on x86.
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  18 Sep 2004; Sven Wegener <swegener@gentoo.org> :
-  Fixed ChangeLog header.
-
-  18 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> aide-0.10_p20040917.ebuild:
-  Fixed hasq/useq invocation
-
-*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:
-  Fixed deps (bug #44445)
-
-  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml:
-  metadata.xml update
-
-*aide-0.10 (12 Sep 2004)
-
-  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
-  +files/aide-0.10-gentoo.diff, +files/aide-0.9-gentoo.diff,
-  +aide-0.10.ebuild, +aide-0.9.ebuild:
-  Moved from app-admin/aide to app-forensics/aide.
-
-  11 Sep 2004; Jon Hood <squinky86@gentoo.org> files/aide-0.10-gentoo.diff,
-  -aide-0.8.ebuild:
-  Fix mhash segfault irt #62194, thanks Gianluca <g.insolvibile@cpr.it>.
-
-  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> aide-0.10.ebuild:
-  Stable on alpha.
-
-  06 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
-  aide-0.10.ebuild:
-  x86 stable
-
-  13 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> aide-0.10.ebuild:
-  marked ~amd64
-
-  30 Mar 2004; Chuck Short <zul@gentoo.org> files/aide-0.10-gentoo.diff:
-  Added missing patch.
-
-  29 Mar 2004; Chuck Short <zul@gentoo.org> aide-0.8.ebuild, aide-0.9.ebuild:
-  Header updates.
-
-*aide-0.10 (29 Mar 2004)
-
-  29 Mar 2004; Chuck Short <zul@gentoo.org> aide-0.10.ebuild:
-  Version bump, closes #46031.
-
-  14 Dec 2003; Martin Holzer <mholzer@gentoo.org> aide-0.9.ebuild:
-  more configure options with IUSE. closes #35700
-
-  16 Oct 2003; Aron Griffis <agriffis@gentoo.org> aide-0.9.ebuild:
-  Stable on alpha
-
-  12 Aug 2003; Martin Holzer <mholzer@gentoo.org> aide-0.9.ebuild:
-  Updated Homepage.
-
-  13 May 2003; Tavis Ormandy <taviso@gentoo.org> aide-0.9.ebuild:
-  marking ~alpha.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*aide-0.9 (21 Oct 2002)
-
-  28 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> aide-0.9.ebuild :
-  Moved to stable
-
-  15 Jan 2003; Jason Wever <weeve@gentoo.org> aide-0.9.ebuild :
-  Changed ~sparc keyword to sparc as it fixes bug #12828
-
-  29 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> aide-0.9.ebuild :
-  Added patch to fix compilation. Found by Janos Milus <j.milus@chello.hu> in #9750.
-
-  21 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
-  Version bump. Found by Joshua Brindle <jbrindle@snu.edu> in #5372.
-  Also contains updates from Paul Belt <gaarde@yahoo.com> in #5372.
-
-*aide-0.8 (15 Mar 2002)
-
-  15 Jan 2003; Jason Wever <weeve@gentoo.org> aide-0.8 :
-
-  Changed sparc keyword to -sparc as aide --init is broken on sparc.
-
-  13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> aide-0.8 :
-
-  Added ppc keyword
-
-  15 Mar 2002; Seemant Kulleen <seemant@gentoo.org> aide-0.8 :
-
-  Upgraded the package.
-
-*aide-0.7-r1 (15 Mar 2002)
-
-  12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> aide-0.7-r1 :
-
-  Fixed the conf file going into a weird directory.  It now gets placed into
-  /etc/aide/aide.conf.
-
-*aide-0.7 (1 Feb 2002)
+  -files/aide-0.9-gentoo.diff, -files/aide-0.10_p20040917-fix-psql.diff,
+  -aide-0.9.ebuild, -aide-0.10.ebuild, -aide-0.10_p20040917.ebuild,
+  aide-0.13.1.ebuild:
+  Removed audit USE flag, bug #191597.
+  Added -j1.
+  Removed old versions.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/app-forensics/aide/aide-0.10.ebuild b/app-forensics/aide/aide-0.10.ebuild
deleted file mode 100644
index 48ded544d61f..000000000000
--- a/app-forensics/aide/aide-0.10.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.10.ebuild,v 1.4 2005/01/01 14:21:52 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${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
-	sys-devel/gettext
-	crypt? ( dev-libs/libgcrypt )
-	postgres? ( dev-db/postgresql )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-}
-
-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_install() {
-	einstall || die
-	use nls || rm -rf ${D}/usr/lib/locale
-
-	insinto /etc/aide
-	doins doc/aide.conf
-
-	dodoc AUTHORS NEWS README
-	dohtml doc/manual.html
-}
diff --git a/app-forensics/aide/aide-0.10_p20040917.ebuild b/app-forensics/aide/aide-0.10_p20040917.ebuild
deleted file mode 100644
index 2c17a2d34eb3..000000000000
--- a/app-forensics/aide/aide-0.10_p20040917.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 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.9 2007/01/24 03:12:05 genone 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 ! has 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() {
-	elog
-	elog "A sample configuration file has been installed as"
-	elog "/etc/aide/aide.conf.  Please edit to meet your needs."
-	elog "Read the aide.conf(5) manual page for more information."
-	elog
-
-	if use postgres; then
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "your aide.conf."
-		elog
-	fi
-}
diff --git a/app-forensics/aide/aide-0.13.1.ebuild b/app-forensics/aide/aide-0.13.1.ebuild
index 27fa34e944a6..d874fb97034d 100644
--- a/app-forensics/aide/aide-0.13.1.ebuild
+++ b/app-forensics/aide/aide-0.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.13.1.ebuild,v 1.2 2007/09/26 19:25:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.13.1.ebuild,v 1.3 2007/09/26 23:51:05 matsuu Exp $
 WANT_AUTOCONF='latest'
 WANT_AUTOMAKE='latest'
 inherit eutils autotools
@@ -12,10 +12,10 @@ SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
+IUSE="acl curl mhash nls postgres selinux static xattr zlib"
+#IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
 
 DEPEND="acl? ( sys-apps/acl )
-	audit? ( sys-process/audit )
 	curl? ( net-misc/curl )
 	mhash? ( >=app-crypt/mhash-0.9.2 )
 	!mhash? ( dev-libs/libgcrypt )
@@ -24,6 +24,7 @@ DEPEND="acl? ( sys-apps/acl )
 	selinux? ( sys-libs/libselinux )
 	xattr? ( sys-apps/attr )
 	zlib? ( sys-libs/zlib )"
+#	audit? ( sys-process/audit )
 
 RDEPEND="!static? ( ${DEPEND} )
 	virtual/mailx"
@@ -67,7 +68,7 @@ src_compile() {
 	use selinux && myconf="${myconf} --with-selinux"
 	use acl && myconf="${myconf} --with-posix-acl"
 	use xattr && myconf="${myconf} --with-xattr"
-	use audit && myconf="${myconf} --with-audit"
+#	use audit && myconf="${myconf} --with-audit"
 
 	# curl doesn't work with static
 	use curl && ! use static && myconf="${myconf} --with-curl"
@@ -78,7 +79,8 @@ src_compile() {
 		|| myconf="${myconf} --with-gcrypt --without-mhash"
 
 	econf ${myconf} || die
-	emake || die
+	# parallel make borked
+	emake -j1 || die
 }
 
 src_install() {
diff --git a/app-forensics/aide/aide-0.9.ebuild b/app-forensics/aide/aide-0.9.ebuild
deleted file mode 100644
index 87e5f28035fb..000000000000
--- a/app-forensics/aide/aide-0.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.9.ebuild,v 1.3 2005/01/01 14:21:52 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-}
-
-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_install() {
-	einstall || die
-	use nls || rm -rf ${D}/usr/lib/locale
-
-	insinto /etc/aide
-	doins doc/aide.conf
-
-	dodoc AUTHORS NEWS README
-	dohtml doc/manual.html
-}
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
deleted file mode 100644
index fe6ac712115f..000000000000
--- a/app-forensics/aide/files/aide-0.10_p20040917-fix-psql.diff
+++ /dev/null
@@ -1,137 +0,0 @@
-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/aide-0.9-gentoo.diff b/app-forensics/aide/files/aide-0.9-gentoo.diff
deleted file mode 100644
index d423819abad9..000000000000
--- a/app-forensics/aide/files/aide-0.9-gentoo.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ru ./src/commandconf.c /var/tmp/portage/aide-0.9/work/aide-0.9/src/commandconf.c
---- src/commandconf.c 2002-05-29 08:04:27.000000000 +0000
-+++ src/commandconf.c   2002-10-29 13:44:29.000000000 +0000
-@@ -29,7 +29,7 @@
- #include "aide.h"
- #include "conf_lex.h"
- #include "conf_yacc.h"
--#include "db.h"
-+#include "../include/db.h"
- #include "db_config.h"
- #include "gen_list.h"
- #include "symboltable.h"
-diff -ru ./src/compare_db.c /var/tmp/portage/aide-0.9/work/aide-0.9/src/compare_db.c
---- src/compare_db.c  2002-05-30 09:42:46.000000000 +0000
-+++ src/compare_db.c    2002-10-29 13:44:29.000000000 +0000
-@@ -30,7 +30,7 @@
- #include "gnu_regex.h"
- #include "gen_list.h"
- #include "list.h"
--#include "db.h"
-+#include "../include/db.h"
- #include "util.h"
- #include "commandconf.h"
- #include "gen_list.h"
-diff -ru ./src/conf_yacc.y /var/tmp/portage/aide-0.9/work/aide-0.9/src/conf_yacc.y
---- src/conf_yacc.y   2002-05-29 08:04:27.000000000 +0000
-+++ src/conf_yacc.y     2002-10-29 13:46:11.000000000 +0000
-@@ -25,7 +25,7 @@
- #include <string.h>
- #include "list.h"
- #include "gen_list.h"
--#include "db.h"
-+#include "../include/db.h"
- #include "db_config.h"
- #include "symboltable.h"
- #include "commandconf.h"
-diff -ru ./src/db.c /var/tmp/portage/aide-0.9/work/aide-0.9/src/db.c
---- src/db.c  2002-05-29 08:04:27.000000000 +0000
-+++ src/db.c    2002-10-29 13:45:01.000000000 +0000
-@@ -22,7 +22,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <errno.h>
--#include "db.h"
-+#include "../include/db.h"
- #include "db_file.h"
- #include "db_disk.h"
-
-diff -ru ./src/db_sql.c /var/tmp/portage/aide-0.9/work/aide-0.9/src/db_sql.c
---- src/db_sql.c      2002-05-29 08:04:27.000000000 +0000
-+++ src/db_sql.c        2002-10-29 13:45:52.000000000 +0000
-@@ -31,7 +31,7 @@
- #include <string.h>
- #include <gcrypt.h>
- #include "base64.h"
--#include "db.h"
-+#include "../include/db.h"
-
- #include "db_sql.h"
- #include "db_config.h"
-diff -ru ./src/gen_list.c /var/tmp/portage/aide-0.9/work/aide-0.9/src/gen_list.c
---- src/gen_list.c    2002-05-30 09:53:52.000000000 +0000
-+++ src/gen_list.c      2002-10-29 13:44:29.000000000 +0000
-@@ -38,7 +38,7 @@
- #include "list.h"
- #include "gen_list.h"
- #include "seltree.h"
--#include "db.h"
-+#include "../include/db.h"
- #include "db_config.h"
- #include "compare_db.h"
- #include "commandconf.h"
-
diff --git a/app-forensics/aide/files/digest-aide-0.10 b/app-forensics/aide/files/digest-aide-0.10
deleted file mode 100644
index 2f4ac7a56012..000000000000
--- a/app-forensics/aide/files/digest-aide-0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39eb7d21064cac7b409c45d038b86cd8 aide-0.10.tar.gz 234184
-RMD160 b3b63b018f3358f1d03cbc76270e5ea6ff9df943 aide-0.10.tar.gz 234184
-SHA256 4819b9b46acaedb5293c87fc7c742a89dcb6f63b71b1fcdeb81349fb41f2935c aide-0.10.tar.gz 234184
diff --git a/app-forensics/aide/files/digest-aide-0.10_p20040917 b/app-forensics/aide/files/digest-aide-0.10_p20040917
deleted file mode 100644
index 11ca8cc0d84d..000000000000
--- a/app-forensics/aide/files/digest-aide-0.10_p20040917
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bfea36bd2a4254e212dcc19df54667fb aide-0.10_p20040917.tar.gz 201023
-RMD160 4390149398890f1d1fcea56d2d419968c65147a3 aide-0.10_p20040917.tar.gz 201023
-SHA256 684d64e830810f93f4ed63d251df74fa3036cc64d6d0a1e8236a994159c1560d aide-0.10_p20040917.tar.gz 201023
diff --git a/app-forensics/aide/files/digest-aide-0.9 b/app-forensics/aide/files/digest-aide-0.9
deleted file mode 100644
index e4d09ffab48b..000000000000
--- a/app-forensics/aide/files/digest-aide-0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 877b1f515a9e25afda75e06805d687fb aide-0.9.tar.gz 216096
-RMD160 aeb3a2ff2c3f4cbbec84a582ebad9389d5032adb aide-0.9.tar.gz 216096
-SHA256 aabed3de2a3807a7b12c382f92c15faf97b2032a6e4c2def2d72b40cca9567ea aide-0.9.tar.gz 216096