diff options
| -rw-r--r-- | app-forensics/aide/ChangeLog | 9 | ||||
| -rw-r--r-- | app-forensics/aide/Manifest | 32 | ||||
| -rw-r--r-- | app-forensics/aide/aide-0.10_p20040917-r1.ebuild | 114 | ||||
| -rw-r--r-- | app-forensics/aide/aide-0.13.1.ebuild | 12 | ||||
| -rw-r--r-- | app-forensics/aide/files/aide-0.10-gentoo.diff | 81 | ||||
| -rw-r--r-- | app-forensics/aide/files/aide-0.10_p20040917-r1-fix-psql.diff | 137 | ||||
| -rw-r--r-- | app-forensics/aide/files/digest-aide-0.10_p20040917-r1 | 3 |
7 files changed, 26 insertions, 362 deletions
diff --git a/app-forensics/aide/ChangeLog b/app-forensics/aide/ChangeLog index dd079520d9d5..b5e790177153 100644 --- a/app-forensics/aide/ChangeLog +++ b/app-forensics/aide/ChangeLog @@ -1,6 +1,13 @@ # 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.32 2007/10/09 02:14:26 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.33 2007/11/01 16:23:26 matsuu Exp $ + + 01 Nov 2007; <matsuu@gentoo.org> -files/aide-0.10-gentoo.diff, + -files/aide-0.10_p20040917-r1-fix-psql.diff, + -aide-0.10_p20040917-r1.ebuild, aide-0.13.1.ebuild: + Added pkg_config, bug #197538. + Removed old versions. + Fixed dependency. 09 Oct 2007; Steve Dibb <beandog@gentoo.org> aide-0.13.1.ebuild: amd64 stable, security bug 191597 diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest index 329a5eda8b0d..5db5db4ac1fa 100644 --- a/app-forensics/aide/Manifest +++ b/app-forensics/aide/Manifest @@ -1,11 +1,3 @@ -AUX aide-0.10-gentoo.diff 2760 RMD160 ae41d81c6012d3cb8d08f269eb13a6b55a6412a9 SHA1 bafe661bbdc6a11046a014e79fdf64c56fee1b27 SHA256 8d7005dcdf086d002e7a75f1e18f357abbbd843d803dea7f4a85c818401d7357 -MD5 4f38a077259ca3be62ae6a55c82d5302 files/aide-0.10-gentoo.diff 2760 -RMD160 ae41d81c6012d3cb8d08f269eb13a6b55a6412a9 files/aide-0.10-gentoo.diff 2760 -SHA256 8d7005dcdf086d002e7a75f1e18f357abbbd843d803dea7f4a85c818401d7357 files/aide-0.10-gentoo.diff 2760 -AUX aide-0.10_p20040917-r1-fix-psql.diff 4726 RMD160 33a45a2d283d9e3f3c553fe08d428336be5fe036 SHA1 6cce09826634dd6ea59da35aafc2fd241efda07a SHA256 9e8eab95389aaf09a2d81f5ed76391751961eb9677d0bc292cd9a90ffac0e6fc -MD5 71915b04e537c8182a7cb3c7f560e04e files/aide-0.10_p20040917-r1-fix-psql.diff 4726 -RMD160 33a45a2d283d9e3f3c553fe08d428336be5fe036 files/aide-0.10_p20040917-r1-fix-psql.diff 4726 -SHA256 9e8eab95389aaf09a2d81f5ed76391751961eb9677d0bc292cd9a90ffac0e6fc files/aide-0.10_p20040917-r1-fix-psql.diff 4726 AUX aide-0.13.1-gentoo.patch 1218 RMD160 a696dfa3819a9be30e34de1d87dcd218283bfd44 SHA1 44085e22669cc2a616979d559afccd3deff37724 SHA256 c78aed624a51f683b83f2cc45239748861e14fe9e3a94277b0e1040b9a87eb00 MD5 4f0ca93d2b08f6bdf71a7b91aab6f24a files/aide-0.13.1-gentoo.patch 1218 RMD160 a696dfa3819a9be30e34de1d87dcd218283bfd44 files/aide-0.13.1-gentoo.patch 1218 @@ -22,27 +14,19 @@ AUX aideinit 2948 RMD160 c5a3f7dd8de191b26f32830ff003d4488452e01e SHA1 cd3f73f33 MD5 9fd564a250e289afba0bf43ef639eae3 files/aideinit 2948 RMD160 c5a3f7dd8de191b26f32830ff003d4488452e01e files/aideinit 2948 SHA256 a7d82272bb381f08d7efcb4fdb9a1eace8c113b3fa2052cc23a2d2871381bba2 files/aideinit 2948 -DIST aide-0.10_p20040917.tar.gz 201023 RMD160 4390149398890f1d1fcea56d2d419968c65147a3 SHA1 599a1c12148fa9b7d4f59cbb8733ee4ab32ef6d8 SHA256 684d64e830810f93f4ed63d251df74fa3036cc64d6d0a1e8236a994159c1560d DIST aide-0.13.1.tar.gz 285400 RMD160 802ac5bd817032bf3a696db7f547bef322b2487a SHA1 0112ee0a974020b99f09d1f2a9fb05433a7b9681 SHA256 b55065413bad3c24af51a551e6ab7cd4a9ecd9f449929261a45fc2f53e040021 -EBUILD aide-0.10_p20040917-r1.ebuild 3020 RMD160 07c2426153f087d7a6f20c302d6fb890b35f1b44 SHA1 58c0c23e4c6cc2227f5a6aad5cc23f990dff9fbc SHA256 9bb5d146cbda043bf23f0be49740d4d3100fdec51c934b81287a56d10dbd6a9b -MD5 266b3ec7a74484d632ea2f76886ad048 aide-0.10_p20040917-r1.ebuild 3020 -RMD160 07c2426153f087d7a6f20c302d6fb890b35f1b44 aide-0.10_p20040917-r1.ebuild 3020 -SHA256 9bb5d146cbda043bf23f0be49740d4d3100fdec51c934b81287a56d10dbd6a9b aide-0.10_p20040917-r1.ebuild 3020 -EBUILD aide-0.13.1.ebuild 3647 RMD160 1933d9d6244358f32a8424e697f64552a21acb11 SHA1 9fe36060b03c7d85b4f4d016608b2da14f9fa78a SHA256 b6edc7300a6f51fd26a8eada03aab91b1f278feda082dc0345f0f9e562004a5c -MD5 c9425555c33080df574df107672b886a aide-0.13.1.ebuild 3647 -RMD160 1933d9d6244358f32a8424e697f64552a21acb11 aide-0.13.1.ebuild 3647 -SHA256 b6edc7300a6f51fd26a8eada03aab91b1f278feda082dc0345f0f9e562004a5c aide-0.13.1.ebuild 3647 -MISC ChangeLog 6962 RMD160 c3f8a18f84545c43b02f605f9ab2c220f72abc10 SHA1 e5cc40c946fd0b6a31160516fef8ed0f180e6b48 SHA256 d3b6ec0e8eb695a4a9097fbd8dae73bdacc72ddc12226a54206a573765c16dbd -MD5 3e3a4feae8661c7db53d83d58c00fa28 ChangeLog 6962 -RMD160 c3f8a18f84545c43b02f605f9ab2c220f72abc10 ChangeLog 6962 -SHA256 d3b6ec0e8eb695a4a9097fbd8dae73bdacc72ddc12226a54206a573765c16dbd ChangeLog 6962 +EBUILD aide-0.13.1.ebuild 3896 RMD160 e3418084039af555caead6680317d151720cf40b SHA1 f0e7f49e5701a0d15cd1cc260db7ef3283b69c4a SHA256 74c3752afd53ab2a668cc3d8e966990545bce272ed07189e07d03777ccc5dfdf +MD5 4ee9d375eae1c30b6140ab0b00bdc3ad aide-0.13.1.ebuild 3896 +RMD160 e3418084039af555caead6680317d151720cf40b aide-0.13.1.ebuild 3896 +SHA256 74c3752afd53ab2a668cc3d8e966990545bce272ed07189e07d03777ccc5dfdf aide-0.13.1.ebuild 3896 +MISC ChangeLog 7205 RMD160 d89b6ea273fac90d3ee362d5e0d2893935cfe341 SHA1 d8fd3ede35eed4f730c3a3165c028ed368fbeda9 SHA256 8b697829fd29a4a22664ba596de1a4a7b4cf0991600c75c0fb7d7250209b47ed +MD5 4b822374bc04234da79f3b5a684e4520 ChangeLog 7205 +RMD160 d89b6ea273fac90d3ee362d5e0d2893935cfe341 ChangeLog 7205 +SHA256 8b697829fd29a4a22664ba596de1a4a7b4cf0991600c75c0fb7d7250209b47ed ChangeLog 7205 MISC metadata.xml 227 RMD160 8fd92f1523d63aec4ec954abee49accf1064c6e6 SHA1 d1d36ec61b481027477edfb7a93cb1c42fb83ff6 SHA256 bb6f7d60ac5d9f18aaea588265033a77bfdeb50676739866d80241cfb869c77c MD5 8a0253acb1f25a07dd94d59edd17a795 metadata.xml 227 RMD160 8fd92f1523d63aec4ec954abee49accf1064c6e6 metadata.xml 227 SHA256 bb6f7d60ac5d9f18aaea588265033a77bfdeb50676739866d80241cfb869c77c metadata.xml 227 -MD5 419e97a0fdbe7eac0f9cafe516306696 files/digest-aide-0.10_p20040917-r1 259 -RMD160 81a9da02b2811a4fbcae647afd3359b4b6ea21d2 files/digest-aide-0.10_p20040917-r1 259 -SHA256 4b227ef6d016d87d6c00c9447959353755ee365eef2a1bfefe4bcc09a99b86f1 files/digest-aide-0.10_p20040917-r1 259 MD5 7d87bbc160a87891252aa1c8f31bdab3 files/digest-aide-0.13.1 235 RMD160 90411420e3bf2644d9fae1895c4a4ca4f34de42f files/digest-aide-0.13.1 235 SHA256 75240c00325c79f1915aac80b659a54147734de893869d412155af0daeeaec9b files/digest-aide-0.13.1 235 diff --git a/app-forensics/aide/aide-0.10_p20040917-r1.ebuild b/app-forensics/aide/aide-0.10_p20040917-r1.ebuild deleted file mode 100644 index d8b2869d0a88..000000000000 --- a/app-forensics/aide/aide-0.10_p20040917-r1.ebuild +++ /dev/null @@ -1,114 +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-r1.ebuild,v 1.8 2007/09/26 19:06:52 armin76 Exp $ -WANT_AUTOCONF='2.5' -WANT_AUTOMAKE='1.7' -inherit eutils autotools - -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="alpha amd64 ppc sparc x86" -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 - - eautoreconf -} - -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 - - keepdir /var/lib/aide - keepdir /var/log/aide - - insinto /etc/aide - doins ${FILESDIR}/aide.conf - - exeinto /usr/sbin - newexe ${FILESDIR}/aideinit aideinit - - exeinto /etc/cron.daily - newexe ${FILESDIR}/aide.cron aide.cron - - dodoc ChangeLog AUTHORS NEWS README - dohtml doc/manual.html -} - -pkg_postinst() { - chown root:0 /var/lib/aide - chmod 0755 /var/lib/aide - - 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 "A cron file has been installed in /etc/cron.daily/aide.cron" - elog "A helper script, aideinit, has been installed and can" - elog "be used to make AIDE management easier. Please run" - elog "aideinit --help 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 55c0415e88ff..24ffeb64c4d3 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.7 2007/10/09 02:14:26 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.13.1.ebuild,v 1.8 2007/11/01 16:23:26 matsuu Exp $ WANT_AUTOCONF='latest' WANT_AUTOMAKE='latest' inherit eutils autotools @@ -20,7 +20,7 @@ DEPEND="acl? ( sys-apps/acl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) - postgres? ( dev-db/postgresql ) + postgres? ( dev-db/libpq ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )" @@ -34,6 +34,14 @@ DEPEND="${DEPEND} sys-devel/bison sys-devel/flex" +pkg_config() { + if use mhash && use postgres ; then + eerror "We cannot emerge aide with mhash and postgres USE flags at the same time." + eerror "Please remove mhash OR postgres USE flags." + die "Please remove either mhash or postgres USE flag." + fi +} + src_unpack() { unpack ${A} cd "${S}" diff --git a/app-forensics/aide/files/aide-0.10-gentoo.diff b/app-forensics/aide/files/aide-0.10-gentoo.diff deleted file mode 100644 index 4664df190c86..000000000000 --- a/app-forensics/aide/files/aide-0.10-gentoo.diff +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur aide-0.10/src/commandconf.c aide-0.10.fixed/src/commandconf.c ---- aide-0.10/src/commandconf.c 2003-11-04 09:39:48.000000000 -0600 -+++ aide-0.10.fixed/src/commandconf.c 2004-09-11 09:37:44.143790160 -0500 -@@ -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" -@@ -224,7 +224,7 @@ - } - /* FIXME This does not handle the case that @@end_config is on - buffer boundary. */ -- if((tmp=strnstr(buf,"@@end_config",retval))!=NULL){ -+ if((conf->confmd != MHASH_FAILED) && ((tmp=strnstr(buf,"@@end_config",retval))!=NULL)){ - /* We have end of config don't feed the last line to mhash */ - mhash(conf->confmd,(void*)buf,tmp-buf); - } else { -diff -Naur aide-0.10/src/compare_db.c aide-0.10.fixed/src/compare_db.c ---- aide-0.10/src/compare_db.c 2003-11-04 09:39:48.000000000 -0600 -+++ aide-0.10.fixed/src/compare_db.c 2004-09-11 09:31:44.222506512 -0500 -@@ -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 -Naur aide-0.10/src/conf_yacc.y aide-0.10.fixed/src/conf_yacc.y ---- aide-0.10/src/conf_yacc.y 2003-08-18 08:03:22.000000000 -0500 -+++ aide-0.10.fixed/src/conf_yacc.y 2004-09-11 09:31:44.223506360 -0500 -@@ -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 -Naur aide-0.10/src/db.c aide-0.10.fixed/src/db.c ---- aide-0.10/src/db.c 2003-11-04 09:13:06.000000000 -0600 -+++ aide-0.10.fixed/src/db.c 2004-09-11 09:31:44.224506208 -0500 -@@ -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 -Naur aide-0.10/src/db_sql.c aide-0.10.fixed/src/db_sql.c ---- aide-0.10/src/db_sql.c 2003-01-16 04:37:34.000000000 -0600 -+++ aide-0.10.fixed/src/db_sql.c 2004-09-11 09:31:44.225506056 -0500 -@@ -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 -Naur aide-0.10/src/gen_list.c aide-0.10.fixed/src/gen_list.c ---- aide-0.10/src/gen_list.c 2003-11-04 09:39:48.000000000 -0600 -+++ aide-0.10.fixed/src/gen_list.c 2004-09-11 09:31:44.226505904 -0500 -@@ -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/aide-0.10_p20040917-r1-fix-psql.diff b/app-forensics/aide/files/aide-0.10_p20040917-r1-fix-psql.diff deleted file mode 100644 index fe6ac712115f..000000000000 --- a/app-forensics/aide/files/aide-0.10_p20040917-r1-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/digest-aide-0.10_p20040917-r1 b/app-forensics/aide/files/digest-aide-0.10_p20040917-r1 deleted file mode 100644 index 11ca8cc0d84d..000000000000 --- a/app-forensics/aide/files/digest-aide-0.10_p20040917-r1 +++ /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 |