summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Smee <strerror@gentoo.org>2005-10-02 21:47:00 +0000
committerBenjamin Smee <strerror@gentoo.org>2005-10-02 21:47:00 +0000
commit9eb0fa846b2e5040f4f8dcad155bc323576df56f (patch)
tree008b8f4c95c2fbe6ad3a4a9c9b5818dc9e7e5674 /app-forensics/aide
parentInitial port. Ebuild contributed by Matthew Kennedy <mkennedy@gentoo.org>. (diff)
downloadhistorical-9eb0fa846b2e5040f4f8dcad155bc323576df56f.tar.gz
historical-9eb0fa846b2e5040f4f8dcad155bc323576df56f.tar.bz2
historical-9eb0fa846b2e5040f4f8dcad155bc323576df56f.zip
Added file for postgres fix re BUG 107927
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'app-forensics/aide')
-rw-r--r--app-forensics/aide/ChangeLog6
-rw-r--r--app-forensics/aide/Manifest3
-rw-r--r--app-forensics/aide/files/aide-0.10_p20040917-r1-fix-psql.diff137
3 files changed, 144 insertions, 2 deletions
diff --git a/app-forensics/aide/ChangeLog b/app-forensics/aide/ChangeLog
index 1027a863c828..b4b83b3d93b0 100644
--- a/app-forensics/aide/ChangeLog
+++ b/app-forensics/aide/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-forensics/aide
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.14 2005/09/30 15:19:38 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.15 2005/10/02 21:47:00 strerror Exp $
+
+ 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)
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index fa86ae6be098..1aabb494ffe2 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -2,10 +2,11 @@ MD5 4a0822e3949514e3f02289044fcb65f8 aide-0.9.ebuild 1390
MD5 91b1915d9d4ebc8ceb302db89bd31b77 aide-0.10.ebuild 1418
MD5 7281a76e068801286ae965927b25c83b aide-0.10_p20040917-r1.ebuild 3081
MD5 f963571827dc97f1cbb03143bfcdbbca aide-0.10_p20040917.ebuild 2595
-MD5 2e9a0c3e2235efa3a5e6f3cd43f3fc9e ChangeLog 4745
+MD5 0d5000bae612523d3dd5869de7bd14a6 ChangeLog 4888
MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
MD5 4f38a077259ca3be62ae6a55c82d5302 files/aide-0.10-gentoo.diff 2760
MD5 9fd564a250e289afba0bf43ef639eae3 files/aideinit 2948
+MD5 71915b04e537c8182a7cb3c7f560e04e files/aide-0.10_p20040917-r1-fix-psql.diff 4726
MD5 ff4b62bd8854921c76dd8a59552f3382 files/digest-aide-0.10_p20040917 71
MD5 b26d49d6bcafd39178a0da345cb2985d files/digest-aide-0.9 60
MD5 ff4b62bd8854921c76dd8a59552f3382 files/digest-aide-0.10_p20040917-r1 71
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
new file mode 100644
index 000000000000..fe6ac712115f
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.10_p20040917-r1-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